X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=a0f5080d0fb9faeb641010704a3949eee606d02f;hb=e59cfea9bc75a551dab0bc19fcab9a6a9e119b4e;hp=2e6770651525d5bff90a102163b0da2da0f2e23e;hpb=69107377605f64537dd6021c9256500982cafb9c;p=quix0rs-gnu-social.git
diff --git a/lib/jabber.php b/lib/jabber.php
index 2e67706515..a0f5080d0f 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -19,7 +19,31 @@
if (!defined('LACONICA')) { exit(1); }
-require_once('xmpp.php');
+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
@@ -37,34 +61,100 @@ function jabber_normalize_jid($jid) {
}
}
-function jabber_connect($resource=NULL, $status=NULL) {
+function jabber_daemon_address() {
+ return common_config('xmpp', 'user') . '@' . common_config('xmpp', 'server');
+}
+
+function jabber_connect($resource=NULL) {
static $conn = NULL;
if (!$conn) {
- $conn = new 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;
}
- $conn->connect(true); # try to get a persistent connection
- if ($conn->disconnected) {
+ $conn->connect(true); # true = persistent connection
+ if ($conn->isDisconnected()) {
return false;
}
- $conn->processUntil('session_start');
- if ($status) {
- $conn->presence($status);
- }
+ $conn->processUntil('session_start');
}
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 .= "