X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=a0f5080d0fb9faeb641010704a3949eee606d02f;hb=e59cfea9bc75a551dab0bc19fcab9a6a9e119b4e;hp=0b5aae4ea81871f59a3186ff5ec390305df0714e;hpb=e4a1b9cde9e975209c76e5e7322a14336b42f18f;p=quix0rs-gnu-social.git diff --git a/lib/jabber.php b/lib/jabber.php index 0b5aae4ea8..a0f5080d0f 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -21,6 +21,30 @@ if (!defined('LACONICA')) { exit(1); } require_once('XMPPHP/XMPP.php'); +# XXX: something of a hack to work around problems with the XMPPHP lib + +class Laconica_XMPP extends XMPPHP_XMPP { + + function messageplus($to, $body, $type = 'chat', $subject = null, $payload = null) { + $to = htmlspecialchars($to); + $body = htmlspecialchars($body); + $subject = htmlspecialchars($subject); + + $jid = jabber_daemon_address(); + + $out = ""; + if($subject) $out .= "$subject"; + $out .= "$body"; + if($payload) $out .= $payload; + $out .= ""; + + $cnt = strlen($out); + common_log(LOG_DEBUG, "Sending $cnt chars to $to"); + $this->send($out); + common_log(LOG_DEBUG, 'Done.'); + } +} + function jabber_valid_base_jid($jid) { # Cheap but effective return Validate::email($jid); @@ -44,15 +68,21 @@ function jabber_daemon_address() { function jabber_connect($resource=NULL) { static $conn = NULL; if (!$conn) { - $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')); + $conn = new Laconica_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 + ); + $conn->autoSubscribe(); if (!$conn) { return false; @@ -66,6 +96,65 @@ function jabber_connect($resource=NULL) { 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->messageplus($to, $msg, 'chat', NULL, $entry); + return true; +} + +# Extra stuff defined by Twitter, needed by twitter clients + +function jabber_format_entry($profile, $notice) { + + $noticeurl = common_local_url('shownotice', + array('notice' => $notice->id)); + $msg = jabber_format_notice($profile, $notice); + $entry = "\n\n"; + $entry .= "\n"; + $entry .= "" . $profile->nickname . " - " . common_config('site', 'name') . "\n"; + $entry .= "\n"; + $entry .= " $profile->nickname)) . "'/>\n"; + $entry .= "" . $profile->nickname . "\n"; + $entry .= "" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "\n"; + $entry .= "\n"; + $entry .= "" . htmlspecialchars($msg) . "\n"; + $entry .= "" . htmlspecialchars($msg) . "\n"; + $entry .= "\n"; + $entry .= "". $notice->uri . "\n"; + $entry .= "".common_date_w3dtf($notice->created)."\n"; + $entry .= "".common_date_w3dtf($notice->modified)."\n"; + $entry .= "\n"; + + $html = "\n\n"; + $html .= "\n"; + $html .= "".$profile->nickname.": "; + $html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice); + $html .= "\n\n"; + $html .= "\n\n"; + + $event = "\n"; + $event .= "\n"; + $event .= "\n"; + $event .= "\n"; + $event .= "\n"; + # FIXME: include the pubsub event, too. + return $html . $entry; +# return $entry . "\n" . $event; +} + function jabber_send_message($to, $body, $type='chat', $subject=NULL) { $conn = jabber_connect(); if (!$conn) { @@ -116,8 +205,6 @@ 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 $profile = Profile::staticGet($notice->profile_id); if (!$profile) { common_log(LOG_WARNING, 'Refusing to broadcast notice with ' . @@ -125,24 +212,72 @@ function jabber_broadcast_notice($notice) { __FILE__); return false; } + $sent_to = array(); + # First, get users who this is a direct reply to + $reply = new Reply(); + $reply->notice_id = $notice->id; + if ($reply->find()) { + while ($reply->fetch()) { + $user = User::staticGet($reply->profile_id); + if ($user && $user->jabber && $user->jabbernotify && $user->jabberreplies) { + common_log(LOG_INFO, + 'Sending reply notice ' . $notice->id . ' to ' . $user->jabber, + __FILE__); + $success = jabber_send_notice($user->jabber, $notice); + if ($success) { + # Remember so we don't send twice + $sent_to[$user->id] = true; + } else { + # XXX: Not sure, but I think that's the right thing to do + common_log(LOG_WARNING, + 'Sending reply notice ' . $notice->id . ' to ' . $user->jabber . ' FAILED, cancelling.', + __FILE__); + return false; + } + } + } + } + # Now, get users subscribed to this profile + # XXX: use a join here rather than looping through results $sub = new Subscription(); $sub->subscribed = $notice->profile_id; + if ($sub->find()) { - $msg = jabber_format_notice($profile, $notice); while ($sub->fetch()) { $user = User::staticGet($sub->subscriber); - if ($user && $user->jabber && $user->jabbernotify) { - common_log(LOG_INFO, + if ($user && $user->jabber && $user->jabbernotify && !$sent_to[$user->id]) { + common_log(LOG_INFO, 'Sending notice ' . $notice->id . ' to ' . $user->jabber, __FILE__); - $success = jabber_send_message($user->jabber, $msg); - if (!$success) { + $success = jabber_send_notice($user->jabber, $notice); + if ($success) { + $sent_to[$user->id] = true; + } else { # XXX: Not sure, but I think that's the right thing to do + common_log(LOG_WARNING, + 'Sending notice ' . $notice->id . ' to ' . $user->jabber . ' FAILED, cancelling.', + __FILE__); return false; } } } } + + # Now, users who want everything + + $public = common_config('xmpp', 'public'); + + # FIXME PRIV don't send out private messages here + + if ($public) { + foreach ($public as $address) { + common_log(LOG_INFO, + 'Sending notice ' . $notice->id . ' to public listener ' . $address, + __FILE__); + jabber_send_notice($address, $notice); + } + } + return true; }