X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fxmppdaemon.php;h=ed523cd814c75e3c2ec72efdff5826e28ac360df;hb=9ad8f2766ca2ca59dba9f2b103c7e007d1afc07f;hp=1aa789e7e7ca6c75d10c4bd0198b7e050ba68c3a;hpb=5022a9efb957c6d308d3c729739c2c6c48694002;p=quix0rs-gnu-social.git

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 1aa789e7e7..ed523cd814 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -18,35 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
-    switch ($errno) {
-     case E_USER_ERROR:
-	echo "ERROR: [$errno] $errstr ($errfile:$errline)\n";
-	echo "  Fatal error on line $errline in file $errfile";
-	echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
-	echo "Aborting...\n";
-	exit(1);
-	break;
-
-    case E_USER_WARNING:
-	echo "WARNING [$errno] $errstr ($errfile:$errline)\n";
-	break;
-
-     case E_USER_NOTICE:
-	echo "My NOTICE [$errno] $errstr ($errfile:$errline)\n";
-	break;
-
-     default:
-	echo "Unknown error type: [$errno] $errstr ($errfile:$errline)\n";
-	break;
-    }
-
-    /* Don't execute PHP internal error handler */
-    return true;
-}
-
-set_error_handler('xmppdaemon_error_handler');
-
 # Abort if called from a web server
 if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 	print "This script must be run from the command line\n";
@@ -59,6 +30,8 @@ define('LACONICA', true);
 require_once(INSTALLDIR . '/lib/common.php');
 require_once(INSTALLDIR . '/lib/jabber.php');
 
+set_error_handler('common_error_handler');
+
 # This is kind of clunky; we create a class to call the global functions
 # in jabber.php, which create a new XMPP class. A more elegant (?) solution
 # might be to use make this a subclass of XMPP.
@@ -88,7 +61,7 @@ class XMPPDaemon {
 
 		$this->log(LOG_INFO, "Connecting to $connect_to on port $this->port");
 
-		$this->conn = jabber_connect($this->resource);
+		$this->conn = jabber_connect($this->resource, "Send me a message to post a notice", 100);
 
 		if (!$this->conn) {
 			return false;
@@ -98,39 +71,10 @@ class XMPPDaemon {
 	}
 
 	function handle() {
-
-		static $parts = array('message', 'presence',
-							  'end_stream', 'session_start');
-
-		while(!$this->conn->isDisconnected()) {
-
-			$payloads = $this->conn->processUntil($parts, 10);
-
-			if ($payloads) {
-				foreach($payloads as $event) {
-					$pl = $event[1];
-					switch($event[0]) {
-					 case 'message':
-						$this->handle_message($pl);
-						break;
-					 case 'presence':
-						$this->handle_presence($pl);
-						break;
-					 case 'session_start':
-						$this->handle_session($pl);
-						break;
-					}
-				}
-			}
-
-			$this->broadcast_queue();
-			$this->confirmation_queue();
-		}
-	}
-
-	function handle_session($pl) {
-		# XXX what to do here?
-		return true;
+		$this->conn->addEventHandler('message', 'handle_message', $this);
+		$this->conn->addEventHandler('presence', 'handle_presence', $this);
+		
+		$this->conn->process();
 	}
 
 	function get_user($from) {
@@ -138,22 +82,11 @@ class XMPPDaemon {
 		return $user;
 	}
 
-	function get_confirmation($from) {
-		$confirm = new Confirm_address();
-		$confirm->address = $from;
-		$confirm->address_type = 'jabber';
-		if ($confirm->find(TRUE)) {
-			return $confirm;
-		} else {
-			return NULL;
-		}
-	}
-
 	function handle_message(&$pl) {
 		if ($pl['type'] != 'chat') {
 			return;
 		}
-		if (strlen($pl['body']) == 0) {
+		if (mb_strlen($pl['body']) == 0) {
 			return;
 		}
 
@@ -176,8 +109,9 @@ class XMPPDaemon {
 			$this->log(LOG_INFO, 'Ignoring OTR from ' . $from);
 			return;
 		} else {
-			if(strlen($pl['body'])>140) {
-				$this->from_site($from, 'Message too long - maximum is 140 characters, you sent ' . strlen($pl['body']));
+			$len = mb_strlen($pl['body']);
+			if($len > 140) {
+				$this->from_site($from, 'Message too long - maximum is 140 characters, you sent ' . $len);
 				return;
 			}
 			$this->add_notice($user, $pl);
@@ -199,7 +133,7 @@ class XMPPDaemon {
 			return false;
 		}
 	}
-	
+
 	function from_site($address, $msg) {
 		$text = '['.common_config('site', 'name') . '] ' . $msg;
 		jabber_send_message($address, $text);
@@ -207,15 +141,49 @@ class XMPPDaemon {
 
 	function handle_command($user, $body) {
 		# XXX: localise
-		switch(trim($body)) {
+		$p=explode(' ',$body);
+		if(count($p)>2)
+			return false;
+		switch($p[0]) {
+		 case 'help':
+		 	if(count($p)!=1)
+		 		return false;
+		 	$this->from_site($user->jabber, "Commands:\n on     - turn on notifications\n off    - turn off notifications\n help   - show this help \n sub - subscribe to user\n unsub - unsubscribe from user");
+		 	return true;
 		 case 'on':
+		 	if(count($p)!=1)
+		 		return false;
 			$this->set_notify($user, true);
 			$this->from_site($user->jabber, 'notifications on');
 			return true;
 		 case 'off':
+		 	if(count($p)!=1)
+		 		return false;
 			$this->set_notify($user, false);
 			$this->from_site($user->jabber, 'notifications off');
 			return true;
+		 case 'sub':
+		 	if(count($p)==1) {
+		 		$this->from_site($user->jabber, 'Specify the name of the user to subscribe to');
+		 		return true;
+		 	}
+		 	$result=subs_subscribe_user($user, $p[1]);
+		 	if($result=='true')
+		 		$this->from_site($user->jabber, 'Subscribed to ' . $p[1]);
+		 	else
+		 		$this->from_site($user->jabber, $result);
+		 	return true;
+		 case 'unsub':
+		 	if(count($p)==1) {
+		 		$this->from_site($user->jabber, 'Specify the name of the user to unsubscribe from');
+		 		return true;
+		 	}
+		 	$result=subs_unsubscribe_user($user, $p[1]);
+		 	if($result=='true')
+		 		$this->from_site($user->jabber, 'Unsubscribed from ' . $p[1]);
+		 	else
+		 		$this->from_site($user->jabber, $result);
+		 	return true;
 		 default:
 			return false;
 		}
@@ -225,7 +193,7 @@ class XMPPDaemon {
 		$orig = clone($user);
 		$user->jabbernotify = $notify;
 		$result = $user->update($orig);
-		if (!$id) {
+		if (!$result) {
 			$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
 			$this->log(LOG_ERR,
 					   'Could not set notify flag to ' . $notify .
@@ -243,7 +211,7 @@ class XMPPDaemon {
 			$this->log(LOG_ERR, $notice);
 			return;
 		}
-		common_real_broadcast($notice);
+		common_broadcast_notice($notice);
 		$this->log(LOG_INFO,
 				   'Added notice ' . $notice->id . ' from user ' . $user->nickname);
 	}
@@ -287,162 +255,14 @@ class XMPPDaemon {
 	function subscribed($to) {
 		jabber_special_presence('subscribed', $to);
 	}
-
-	function set_status($status) {
-		$this->log(LOG_INFO, 'Setting status to "' . $status . '"');
-		jabber_send_presence($status);
-	}
-
-	function top_queue_item() {
-
-		$qi = new Queue_item();
-		$qi->orderBy('created');
-		$qi->whereAdd('claimed is NULL');
-
-		$qi->limit(1);
-
-		$cnt = $qi->find(TRUE);
-
-		if ($cnt) {
-			# XXX: potential race condition
-			# can we force it to only update if claimed is still NULL
-			# (or old)?
-			$this->log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id);
-			$orig = clone($qi);
-			$qi->claimed = DB_DataObject_Cast::dateTime();
-			$result = $qi->update($orig);
-			if ($result) {
-				$this->log(LOG_INFO, 'claim succeeded.');
-				return $qi;
-			} else {
-				$this->log(LOG_INFO, 'claim failed.');
-			}
-		}
-		$qi = NULL;
-		return NULL;
-	}
-
-	function broadcast_queue() {
-		$this->clear_old_claims();
-		$this->log(LOG_INFO, 'checking for queued notices');
-		do {
-			$qi = $this->top_queue_item();
-			if ($qi) {
-				$this->log(LOG_INFO, 'Got item enqueued '.common_exact_date($qi->created));
-				$notice = Notice::staticGet($qi->notice_id);
-				if ($notice) {
-					$this->log(LOG_INFO, 'broadcasting notice ID = ' . $notice->id);
-					# XXX: what to do if broadcast fails?
-					$result = common_real_broadcast($notice, $this->is_remote($notice));
-					if (!$result) {
-						$this->log(LOG_WARNING, 'Failed broadcast for notice ID = ' . $notice->id);
-						$orig = $qi;
-						$qi->claimed = NULL;
-						$qi->update($orig);
-						$this->log(LOG_WARNING, 'Abandoned claim for notice ID = ' . $notice->id);
-						continue;
-					}
-					$this->log(LOG_INFO, 'finished broadcasting notice ID = ' . $notice->id);
-					$notice = NULL;
-				} else {
-					$this->log(LOG_WARNING, 'queue item for notice that does not exist');
-				}
-				$qi->delete();
-			}
-		} while ($qi);
-	}
-
-	function clear_old_claims() {
-		$qi = new Queue_item();
-	        $qi->claimed = NULL;
-		$qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
-		$qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
-	}
-
-	function is_remote($notice) {
-		$user = User::staticGet($notice->profile_id);
-		return !$user;
-	}
-
-	function confirmation_queue() {
-	    # $this->clear_old_confirm_claims();
-		$this->log(LOG_INFO, 'checking for queued confirmations');
-		do {
-			$confirm = $this->next_confirm();
-			if ($confirm) {
-				$this->log(LOG_INFO, 'Sending confirmation for ' . $confirm->address);
-				$user = User::staticGet($confirm->user_id);
-				if (!$user) {
-					$this->log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id);
-					continue;
-				}
-				$success = jabber_confirm_address($confirm->code,
-								  $user->nickname,
-								  $confirm->address);
-				if (!$success) {
-					$this->log(LOG_ERR, 'Confirmation failed for ' . $confirm->address);
-					# Just let the claim age out; hopefully things work then
-					continue;
-				} else {
-					$this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
-					# Mark confirmation sent
-					$original = clone($confirm);
-					$confirm->sent = $confirm->claimed;
-					$result = $confirm->update($original);
-					if (!$result) {
-						$this->log(LOG_ERR, 'Cannot mark sent for ' . $confirm->address);
-						# Just let the claim age out; hopefully things work then
-						continue;
-					}
-				}
-			}
-		} while ($confirm);
-	}
-
-	function next_confirm() {
-		$confirm = new Confirm_address();
-		$confirm->whereAdd('claimed IS NULL');
-		$confirm->whereAdd('sent IS NULL');
-		# XXX: eventually we could do other confirmations in the queue, too
-		$confirm->address_type = 'jabber';
-		$confirm->orderBy('modified DESC');
-		$confirm->limit(1);
-		if ($confirm->find(TRUE)) {
-			$this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address);
-		        # working around some weird DB_DataObject behaviour
-			$confirm->whereAdd(''); # clears where stuff
-		        $original = clone($confirm);
-			$confirm->claimed = DB_DataObject_Cast::dateTime();
-			$result = $confirm->update($original);
-			if ($result) {
-				$this->log(LOG_INFO, 'Succeeded in claim! '. $result);
-				return $confirm;
-			} else {
-				$this->log(LOG_INFO, 'Failed in claim!');
-				return false;
-			}
-		}
-		return NULL;
-	}
-
-	function clear_old_confirm_claims() {
-		$confirm = new Confirm();
-	        $confirm->claimed = NULL;
-		$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
-		$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
-	}
-
 }
 
 mb_internal_encoding('UTF-8');
 
-$resource = ($argc > 1) ? $argv[1] : NULL;
+$resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-listen');
 
 $daemon = new XMPPDaemon($resource);
 
 if ($daemon->connect()) {
-	$daemon->set_status("Send me a message to post a notice");
 	$daemon->handle();
 }
-
-?>