Resolve conflicts and convert _t( to _( where it was introduced again.

[quix0rs-gnu-social.git] / xmppdaemon.php

diff --git a/xmppdaemon.php b/xmppdaemon.php
index e5c5c20afb5af87a1e2021cf7cd4d26e7df08783..dd262282885294d18a9132c1e2ecc324f76c989c 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -135,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);
@@ -181,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();
@@ -204,6 +216,7 @@ class XMPPDaemon {
                        return;
                }
                $notice->query('COMMIT');
+        common_save_replies($notice);  
                common_real_broadcast($notice);
                $this->log(LOG_INFO,
                                   'Added notice ' . $notice->id . ' from user ' . $user->nickname);
@@ -315,6 +328,7 @@ class XMPPDaemon {
 
        function clear_old_claims() {
                $qi = new Queue_item();
+               $qi->claimed = NULL;
                $qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
                $qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
        }
@@ -347,7 +361,7 @@ class XMPPDaemon {
                                        $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
                                        # Mark confirmation sent
                                        $original = clone($confirm);
-                                       $confirm->sent = DB_DataObject_Cast::dateTime();
+                                       $confirm->sent = $confirm->claimed;
                                        $result = $confirm->update($original);
                                        if (!$result) {
                                                $this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address);
@@ -362,17 +376,20 @@ class XMPPDaemon {
        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);
-                       $original = clone($confirm);
+                       # 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!');
+                               $this->log(LOG_INFO, 'Succeeded in claim! '. $result);
                                return $confirm;
                        } else {
                                $this->log(LOG_INFO, 'Failed in claim!');
@@ -384,6 +401,7 @@ class XMPPDaemon {
        
        function clear_old_confirm_claims() {
                $confirm = new Confirm();
+               $confirm->claimed = NULL;
                $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
                $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
        }