unique key on a boolean value is not scalable

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

diff --git a/xmppdaemon.php b/xmppdaemon.php
index 85810fdbf09a8cce1faa5f01d3df7280e24bc6fd..9aaa953fd0c3016e027c579b889bf164e3942247 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -98,7 +98,12 @@ class XMPPDaemon {
                        $this->confirmation_queue();
                }
        }
-
+       
+       function handle_session($pl) {
+               # XXX what to do here?
+               return true;
+       }
+       
        function get_user($from) {
                $user = User::staticGet('jabber', jabber_normalize_jid($from));
                return $user;
@@ -135,11 +140,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 +197,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 +221,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);