X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=ab0fd6af8663a6490e3df5dbc9c088e0894c1380;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=3e74cbbb82d8601541a9ef35d5f8712ea1cfb266;hpb=c6c3cd40f6304b49f5d4841e9999641a183e987b;p=quix0rs-gnu-social.git
diff --git a/lib/jabber.php b/lib/jabber.php
index 3e74cbbb82..ab0fd6af86 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -57,16 +57,21 @@ function jabber_connect($resource=NULL) {
common_config('xmpp', 'debug') ?
XMPPHP_Log::LEVEL_VERBOSE : NULL
);
- $conn->autoSubscribe();
- $conn->useEncryption(common_config('xmpp', 'encryption'));
if (!$conn) {
return false;
}
- $conn->connect(true); # true = persistent connection
- if ($conn->isDisconnected()) {
+
+ $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;
@@ -87,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;
}
@@ -117,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";
@@ -126,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) {
@@ -206,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();
@@ -223,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();
@@ -233,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)) {
@@ -241,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;
}
@@ -277,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;