X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=ab0fd6af8663a6490e3df5dbc9c088e0894c1380;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=68bd0d8d35a652fc08339838859b10aada55bae9;hpb=ab92ba78ba42397054254d785556df493067d962;p=quix0rs-gnu-social.git diff --git a/lib/jabber.php b/lib/jabber.php index 68bd0d8d35..ab0fd6af86 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -92,6 +92,7 @@ function jabber_send_notice($to, $notice) { $msg = jabber_format_notice($profile, $notice); $entry = jabber_format_entry($profile, $notice); $conn->message($to, $msg, 'chat', NULL, $entry); + $profile->free(); return true; } @@ -122,7 +123,7 @@ function jabber_format_entry($profile, $notice) { $html = "\n\n"; $html .= "\n"; - $html .= "".$profile->nickname.": "; + $html .= "".$profile->nickname.": "; $html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice); $html .= "\n\n"; $html .= "\n\n"; @@ -131,16 +132,9 @@ function jabber_format_entry($profile, $notice) { $address .= "

\n"; $address .= "\n"; - $event = "\n"; - $event .= "\n"; - $event .= "\n"; - $event .= "\n"; - $event .= "\n"; - # FIXME: include the pubsub event, too. -# return $html . $entry . $address; - return $entry . $address; -# return $entry . "\n" . $event; + # FIXME: include a pubsub event, too. + + return $html . $entry . $address; } function jabber_send_message($to, $body, $type='chat', $subject=NULL) { @@ -211,6 +205,9 @@ function jabber_broadcast_notice($notice) { $msg = jabber_format_notice($profile, $notice); $entry = jabber_format_entry($profile, $notice); + $profile->free(); + unset($profile); + $sent_to = array(); $conn = jabber_connect(); @@ -228,9 +225,12 @@ function jabber_broadcast_notice($notice) { '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(); @@ -238,7 +238,8 @@ function jabber_broadcast_notice($notice) { '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 '); + 'AND user.jabbernotify = 1 ' . + 'AND subscription.jabber = 1 '); while ($user->fetch()) { if (!array_key_exists($user->id, $sent_to)) { @@ -246,9 +247,13 @@ function jabber_broadcast_notice($notice) { '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; } @@ -282,7 +287,9 @@ function jabber_public_notice($notice) { 'Sending notice ' . $notice->id . ' to public listener ' . $address, __FILE__); $conn->message($address, $msg, 'chat', NULL, $entry); + $conn->processTime(0); } + $profile->free(); } return true;