X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=3d388bd01dbed13ca1fac68d03a484bb95b280d0;hb=3b624070678eac683a5df82ea94ae7f46666ce1e;hp=9bccc6fe4ef27cb2431b0d19ee3fde9b60b9bdf3;hpb=d437fcfac92d8c1170b926ed348fcdb5b59cce1e;p=quix0rs-gnu-social.git

diff --git a/lib/jabber.php b/lib/jabber.php
index 9bccc6fe4e..3d388bd01d 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once('xmpp.php');
+require_once('XMPPHP/XMPP.php');
 
 function jabber_valid_base_jid($jid) {
 	# Cheap but effective
@@ -30,7 +30,6 @@ function jabber_normalize_jid($jid) {
 	if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
 		$node = $matches[1];
 		$server = $matches[2];
-		$resource = $matches[3];
 		return strtolower($node.'@'.$server);
 	} else {
 		return NULL;
@@ -44,28 +43,100 @@ function jabber_daemon_address() {
 function jabber_connect($resource=NULL) {
 	static $conn = NULL;
 	if (!$conn) {
-		$conn = new XMPP(common_config('xmpp', 'host') ?
-				         common_config('xmpp', 'host') :
-				         common_config('xmpp', 'server'),
-				         common_config('xmpp', 'port'),
-					     common_config('xmpp', 'user'),
-					     common_config('xmpp', 'password'),
-				    	 ($resource) ? $resource :
-				        	common_config('xmpp', 'resource'),
-				         common_config('xmpp', 'server'));
+		$conn = new XMPPHP_XMPP(common_config('xmpp', 'host') ?
+								common_config('xmpp', 'host') :
+								common_config('xmpp', 'server'),
+								common_config('xmpp', 'port'),
+								common_config('xmpp', 'user'),
+								common_config('xmpp', 'password'),
+								($resource) ? $resource :
+								common_config('xmpp', 'resource'),
+								common_config('xmpp', 'server'),
+								common_config('xmpp', 'debug') ?
+								true : false,
+								common_config('xmpp', 'debug') ?
+								XMPPHP_Log::LEVEL_VERBOSE :  NULL
+								);
 
 		if (!$conn) {
 			return false;
 		}
-		$conn->connect(true); # true = persistent connection
-		if ($conn->disconnected) {
+
+		$conn->autoSubscribe();
+		$conn->useEncryption(common_config('xmpp', 'encryption'));
+
+		try {
+			$conn->connect(true); # true = persistent connection
+		} catch (XMPPHP_Exception $e) {
+			common_log(LOG_ERROR, $e->getMessage());
 			return false;
 		}
+
     	$conn->processUntil('session_start');
 	}
 	return $conn;
 }
 
+function jabber_send_notice($to, $notice) {
+	$conn = jabber_connect();
+	if (!$conn) {
+		return false;
+	}
+	$profile = Profile::staticGet($notice->profile_id);
+	if (!$profile) {
+		common_log(LOG_WARNING, 'Refusing to send notice with ' .
+		           'unknown profile ' . common_log_objstring($notice),
+		           __FILE__);
+		return false;
+	}
+	$msg = jabber_format_notice($profile, $notice);
+	$entry = jabber_format_entry($profile, $notice);
+	$conn->message($to, $msg, 'chat', NULL, $entry);
+	$profile->free();
+	return true;
+}
+
+# Extra stuff defined by Twitter, needed by twitter clients
+
+function jabber_format_entry($profile, $notice) {
+
+	# FIXME: notice url might be remote
+
+	$noticeurl = common_local_url('shownotice',
+								  array('notice' => $notice->id));
+	$msg = jabber_format_notice($profile, $notice);
+	$entry = "\n<entry xmlns='http://www.w3.org/2005/Atom'>\n";
+	$entry .= "<source>\n";
+	$entry .= "<title>" . $profile->nickname . " - " . common_config('site', 'name') . "</title>\n";
+	$entry .= "<link href='" . htmlspecialchars($profile->profileurl) . "'/>\n";
+	$entry .= "<link rel='self' type='application/rss+xml' href='" . common_local_url('userrss', array('nickname' => $profile->nickname)) . "'/>\n";
+	$entry .= "<author><name>" . $profile->nickname . "</name></author>\n";
+	$entry .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
+	$entry .= "</source>\n";
+	$entry .= "<title>" . htmlspecialchars($msg) . "</title>\n";
+	$entry .= "<summary>" . htmlspecialchars($msg) . "</summary>\n";
+	$entry .= "<link rel='alternate' href='" . $noticeurl . "' />\n";
+	$entry .= "<id>". $notice->uri . "</id>\n";
+	$entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
+	$entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
+	$entry .= "</entry>\n";
+
+	$html = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
+	$html .= "<body xmlns='http://www.w3.org/1999/xhtml'>\n";
+	$html .= "<a href='".htmlspecialchars($profile->profileurl)."'>".$profile->nickname."</a>: ";
+	$html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice);
+	$html .= "\n</body>\n";
+	$html .= "\n</html>\n";
+
+	$address = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
+	$address .= "<address type='replyto' jid='" . jabber_daemon_address() . "' />\n";
+	$address .= "</addresses>\n";
+
+	# FIXME: include a pubsub event, too.
+
+	return $html . $entry . $address;
+}
+
 function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
 	$conn = jabber_connect();
 	if (!$conn) {
@@ -75,12 +146,14 @@ function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
 	return true;
 }
 
-function jabber_send_presence($status, $show='available', $to=Null) {
+function jabber_send_presence($status, $show='available', $to=NULL,
+							  $type = 'available', $priority=NULL)
+{
 	$conn = jabber_connect();
 	if (!$conn) {
 		return false;
 	}
-	$conn->presence($status, $show, $to);
+	$conn->presence($status, $show, $to, $type, $priority);
 	return true;
 }
 
@@ -93,7 +166,7 @@ function jabber_confirm_address($code, $nickname, $address) {
         	'address bar of your browser). If that user isn\'t you, ' .
         	'or if you didn\'t request this confirmation, just ignore this message.';
 
-	jabber_send_message($address, $body);
+	return jabber_send_message($address, $body);
 }
 
 function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
@@ -116,26 +189,109 @@ function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
 }
 
 function jabber_broadcast_notice($notice) {
-	# First, get users subscribed to this profile
-	# XXX: use a join here rather than looping through results
+
+	if (!common_config('xmpp', 'enabled')) {
+		return true;
+	}
 	$profile = Profile::staticGet($notice->profile_id);
+
 	if (!$profile) {
 		common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
 		           'unknown profile ' . common_log_objstring($notice),
 		           __FILE__);
 		return false;
 	}
-	$sub = new Subscription();
-	$sub->subscribed = $notice->profile_id;
-	if ($sub->find()) {
+
+	$msg = jabber_format_notice($profile, $notice);
+	$entry = jabber_format_entry($profile, $notice);
+
+	$profile->free();
+	unset($profile);
+	
+	$sent_to = array();
+	$conn = jabber_connect();
+
+	# First, get users to whom this is a direct reply
+	$user = new User();
+	$user->query('SELECT user.id, user.jabber ' .
+				 'FROM user JOIN reply ON user.id = reply.profile_id ' .
+				 'WHERE reply.notice_id = ' . $notice->id . ' ' .
+				 'AND user.jabber is not null ' .
+				 'AND user.jabbernotify = 1 ' .
+				 'AND user.jabberreplies = 1 ');
+
+	while ($user->fetch()) {
+		common_log(LOG_INFO,
+				   'Sending reply notice ' . $notice->id . ' to ' . $user->jabber,
+				   __FILE__);
+		$conn->message($user->jabber, $msg, 'chat', NULL, $entry);
+		$conn->processTime(0);
+		$sent_to[$user->id] = 1;
+	}
+
+	$user->free();
+	
+    # Now, get users subscribed to this profile
+
+	$user = new User();
+	$user->query('SELECT user.id, user.jabber ' .
+				 'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
+				 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
+				 'AND user.jabber is not null ' .
+				 'AND user.jabbernotify = 1 ');
+
+	while ($user->fetch()) {
+		if (!array_key_exists($user->id, $sent_to)) {
+			common_log(LOG_INFO,
+					   'Sending notice ' . $notice->id . ' to ' . $user->jabber,
+					   __FILE__);
+			$conn->message($user->jabber, $msg, 'chat', NULL, $entry);
+			# To keep the incoming queue from filling up, we service it after each send.
+			$conn->processTime(0);
+		}
+	}
+
+	$user->free();
+	
+	return true;
+}
+
+function jabber_public_notice($notice) {
+
+	# Now, users who want everything
+
+	$public = common_config('xmpp', 'public');
+
+	# FIXME PRIV don't send out private messages here
+	# XXX: should we send out non-local messages if public,localonly
+	# = false? I think not
+
+	if ($public && $notice->is_local) {
+		$profile = Profile::staticGet($notice->profile_id);
+
+		if (!$profile) {
+			common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
+					   'unknown profile ' . common_log_objstring($notice),
+					   __FILE__);
+			return false;
+		}
+
 		$msg = jabber_format_notice($profile, $notice);
-		while ($sub->fetch()) {
-			$user = User::staticGet($sub->subscriber);
-			if ($user && $user->jabber && $user->jabbernotify) {
-				jabber_send_message($user->jabber, $msg);
-			}
+		$entry = jabber_format_entry($profile, $notice);
+
+		$conn = jabber_connect();
+
+		foreach ($public as $address) {
+			common_log(LOG_INFO,
+					   'Sending notice ' . $notice->id . ' to public listener ' . $address,
+					   __FILE__);
+			$conn->message($address, $msg, 'chat', NULL, $entry);
+			$conn->processTime(0);
 		}
+		$profile->free();
 	}
+
+	return true;
 }
 
 function jabber_format_notice(&$profile, &$notice) {