X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmppdaemon.php;h=dd262282885294d18a9132c1e2ecc324f76c989c;hb=7e38142d4aa080767617724a98c0cf60c70961d0;hp=26c395303a22aa641309b9d233cc6586f3e018a6;hpb=9942b4416b9bc3ea2e0d78f4d1ee46111aef61ac;p=quix0rs-gnu-social.git

diff --git a/xmppdaemon.php b/xmppdaemon.php
index 26c395303a..dd26228288 100755
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -54,6 +54,7 @@ class XMPPDaemon {
 	}
 
 	function connect() {
+
 		$connect_to = ($this->host) ? $this->host : $this->server;
 
 		$this->log(LOG_INFO, "Connecting to $connect_to on port $this->port");
@@ -63,7 +64,8 @@ class XMPPDaemon {
 		if (!$this->conn) {
 			return false;
 		}
-		return !$this->conn->disconnected;
+	    
+		return !$this->conn->isDisconnected();
 	}
 
 	function handle() {
@@ -71,7 +73,7 @@ class XMPPDaemon {
 		static $parts = array('message', 'presence',
 							  'end_stream', 'session_start');
 
-		while(!$this->conn->disconnected) {
+		while(!$this->conn->isDisconnected()) {
 
 			$payloads = $this->conn->processUntil($parts, 10);
 
@@ -93,6 +95,7 @@ class XMPPDaemon {
 			}
 
 			$this->broadcast_queue();
+			$this->confirmation_queue();
 		}
 	}
 
@@ -132,11 +135,22 @@ class XMPPDaemon {
 		}
 		if ($this->handle_command($user, $pl['body'])) {
 			return;
+		} else if ($this->is_autoreply($pl['body'])) {
+			$this->log(LOG_INFO, 'Ignoring auto reply from ' . $from);
+			return;
 		} else {
 			$this->add_notice($user, $pl);
 		}
 	}
 
+	function is_autoreply($txt) {
+		if (preg_match('/[\[\(]?[Aa]uto-?[Rr]eply[\]\)]/', $txt)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
 	function from_site($address, $msg) {
 		$text = '['.common_config('site', 'name') . '] ' . $msg;
 		jabber_send_message($address, $text);
@@ -178,6 +192,7 @@ class XMPPDaemon {
 		$notice = new Notice();
 		$notice->profile_id = $user->id;
 		$notice->content = trim(substr($pl['body'], 0, 140));
+		$notice->rendered = common_render_content($notice->content, $notice);
 		$notice->created = DB_DataObject_Cast::dateTime();
 		$notice->query('BEGIN');
 		$id = $notice->insert();
@@ -201,7 +216,8 @@ class XMPPDaemon {
 			return;
 		}
 		$notice->query('COMMIT');
-		common_broadcast_notice($notice);
+        common_save_replies($notice);	
+		common_real_broadcast($notice);
 		$this->log(LOG_INFO,
 				   'Added notice ' . $notice->id . ' from user ' . $user->nickname);
 	}
@@ -286,7 +302,7 @@ class XMPPDaemon {
 		do {
 			$qi = $this->top_queue_item();
 			if ($qi) {
-				$this->log(LOG_INFO, 'Got queue item #'.$in_a_row.' enqueued '.common_exact_date($qi->created));
+				$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);
@@ -312,7 +328,7 @@ class XMPPDaemon {
 
 	function clear_old_claims() {
 		$qi = new Queue_item();
-		$qi->claimed = NULL;
+	        $qi->claimed = NULL;
 		$qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
 		$qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
 	}
@@ -321,6 +337,75 @@ class XMPPDaemon {
 		$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_ERROR, '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_ERROR, '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);
+	}
+	
 }
 
 $resource = ($argc > 1) ? $argv[1] : NULL;