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 = "<message from='$jid' to='$to' type='$type'>";
+ if($subject) $out .= "<subject>$subject</subject>";
+ $out .= "<body>$body</body>";
+ if($payload) $out .= $payload;
+ $out .= "</message>";
+
+ $this->send($out);
+ }
+}
+
function jabber_valid_base_jid($jid) {
# Cheap but effective
return Validate::email($jid);
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) {
}
$msg = jabber_format_notice($profile, $notice);
$entry = jabber_format_entry($profile, $notice);
- $conn->message($to, $msg, 'chat', $entry);
+ $conn->messageplus($to, $msg, 'chat', NULL, $entry);
return true;
}
function jabber_format_entry($profile, $notice) {
$noticeurl = common_local_url('shownotice',
array('notice' => $notice->id));
- $entry = "<entry xmlns=\'http://www.w3.org/2005/Atom\'>\n";
+ $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='" . $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_STREAM_SIZE) . "</icon>\n";
+ $entry .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
$entry .= "</source>\n";
- $entry .= "<title>" . $msg . "</title>\n";
- $entry .= "<summary>" . $msg . "</summary>\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";
- $entry .= "<event xmlns='http://jabber.org/protocol/pubsub#event'>\n";
- $entry .= "<items xmlns='http://jabber.org/protocol/pubsub' ";
- $entry .= "node='" . common_local_url('public') . "'>\n";
- $entry .= "<item id='" . $notice->uri ."' />\n";
- $entry .= "</items>\n";
- $entry .= "</event>\n";
+
+ $event = "<event xmlns='http://jabber.org/protocol/pubsub#event'>\n";
+ $event .= "<items xmlns='http://jabber.org/protocol/pubsub' ";
+ $event .= "node='" . common_local_url('public') . "'>\n";
+ $event .= "<item id='" . $notice->uri ."' />\n";
+ $event .= "</items>\n";
+ $event .= "</event>\n";
+ # FIXME: include the pubsub event, too.
return $entry;
+# return $entry . "\n" . $event;
}
function jabber_send_message($to, $body, $type='chat', $subject=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 ' .
__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
+ 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) {
+ 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;
# XXX: Not sure, but I think that's the right thing to do
return false;
}
}
}
}
+
return true;
}
projects / quix0rs-gnu-social.git / blobdiff