X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=ab0fd6af8663a6490e3df5dbc9c088e0894c1380;hb=1636da829c9caa801f95dd9e8e658f938012a5fa;hp=79325eb1920e22f1d246938b965dd6d2dadfcf80;hpb=7ad21d3cc1e4761e385a24df73ac4943242ce4f0;p=quix0rs-gnu-social.git
diff --git a/lib/jabber.php b/lib/jabber.php
index 79325eb192..ab0fd6af86 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -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;
@@ -58,15 +57,21 @@ function jabber_connect($resource=NULL) {
common_config('xmpp', 'debug') ?
XMPPHP_Log::LEVEL_VERBOSE : NULL
);
- $conn->autoSubscribe();
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;
@@ -86,38 +91,24 @@ function jabber_send_notice($to, $notice) {
}
$msg = jabber_format_notice($profile, $notice);
$entry = jabber_format_entry($profile, $notice);
- $stanza = jabber_make_stanza($to, $msg, 'chat', NULL, $entry);
- common_log(LOG_DEBUG, 'full stanza = ' . $stanza, __FILE__);
- $conn->send($stanza);
+ $conn->message($to, $msg, 'chat', NULL, $entry);
+ $profile->free();
return true;
}
-function jabber_make_stanza($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 .= "";
-
- return $out;
-}
-
# 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\n";
$entry .= "\n";
-
- $event = "\n";
- $event .= "\n";
- $event .= " \n";
- $event .= "\n";
- $event .= "\n";
- # FIXME: include the pubsub event, too.
- return $entry;
-# return $entry . "\n" . $event;
+
+ $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";
+
+ $address = "\n";
+ $address .= "\n";
+ $address .= "\n";
+
+ # FIXME: include a pubsub event, too.
+
+ return $html . $entry . $address;
}
function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
@@ -150,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;
}
@@ -191,32 +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()) {
- while ($sub->fetch()) {
- $user = User::staticGet($sub->subscriber);
- if ($user && $user->jabber && $user->jabbernotify) {
- common_log(LOG_INFO,
- 'Sending notice ' . $notice->id . ' to ' . $user->jabber,
- __FILE__);
- $success = jabber_send_notice($user->jabber, $notice);
- if (!$success) {
- # XXX: Not sure, but I think that's the right thing to do
- return false;
- }
- }
+
+ $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 ' .
+ 'AND subscription.jabber = 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);
+ $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;
}