Merge branch 'blacklistplus' into testing

[quix0rs-gnu-social.git] / actions / sup.php

diff --git a/actions/sup.php b/actions/sup.php
index 887017b2a44b222ad6ac47f78a79d761027f87ec..4e428dfa580ef5b70481a37894fb6448766683dd 100644 (file)
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,65 +17,74 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-class SupAction extends Action {
-       
-       function handle($args) {
-               
-               parent::handle($args);
-               
-               $seconds = $this->trimmed('seconds');
-               
-               if (!$seconds) {
-                       $seconds = 15;
-               }
-
-               $updates = $this->get_updates($seconds);
-               
-               header('Content-Type: application/json; charset=utf-8');
-               
-               print json_encode(array('updated_time' => date('c'),
-                                                               'since_time' => date('c', time() - $seconds),
-                                                               'available_periods' => $this->available_periods(),
-                                                               'period' => $seconds,
-                                                               'updates' => $updates));
-       }
-       
-       function available_periods() {
-               static $periods = array(86400, 43200, 21600, 7200,
-                                                               3600, 1800,     600, 300, 120,
-                                                               60, 30, 15); 
-               $available = array();
-               foreach ($periods as $period) {
-                       $available[$period] = common_local_url('sup',
-                                                                                                  array('seconds' => $period));
-               }
-               
-               return $available;
-       }
-       
-       function get_updates($seconds) {
-               $notice = new Notice();
-
-               # XXX: cache this. Depends on how big this protocol becomes;
-               # Re-doing this query every 15 seconds isn't the end of the world.
-
-               $notice->query('SELECT profile_id, max(id) AS max_id ' .
-                                          'FROM notice ' .
-                                          'WHERE created > (now() - ' . $seconds . ') ' .
-                                          'GROUP BY profile_id');
-               
-               $updates = array();
-               
-               while ($notice->fetch()) {
-                       $updates[] = array($notice->profile_id, $notice->max_id);
-               }
-               
-               return $updates;
-       }
-       
-       function is_readonly() {
-               return true;
-       }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class SupAction extends Action
+{
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $seconds = $this->trimmed('seconds');
+
+        if (!$seconds) {
+            $seconds = 15;
+        }
+
+        $updates = $this->getUpdates($seconds);
+
+        header('Content-Type: application/json; charset=utf-8');
+
+        print json_encode(array('updated_time' => date('c'),
+                                'since_time' => date('c', time() - $seconds),
+                                'available_periods' => $this->availablePeriods(),
+                                'period' => $seconds,
+                                'updates' => $updates));
+    }
+
+    function availablePeriods()
+    {
+        static $periods = array(86400, 43200, 21600, 7200,
+                                3600, 1800, 600, 300, 120,
+                                60, 30, 15);
+        $available = array();
+        foreach ($periods as $period) {
+            $available[$period] = common_local_url('sup',
+                                                   array('seconds' => $period));
+        }
+
+        return $available;
+    }
+
+    function getUpdates($seconds)
+    {
+        $notice = new Notice();
+
+        # XXX: cache this. Depends on how big this protocol becomes;
+        # Re-doing this query every 15 seconds isn't the end of the world.
+
+        $divider = common_sql_date(time() - $seconds);
+
+        $notice->query('SELECT profile_id, max(id) AS max_id ' .
+                       'FROM ( ' .
+                       'SELECT profile_id, id FROM notice ' .
+                        ((common_config('db','type') == 'pgsql') ?
+                       'WHERE extract(epoch from created) > (extract(epoch from now()) - ' . $seconds . ') ' :
+                       'WHERE created > "'.$divider.'" ' ) .
+                       ') AS latest ' .
+                       'GROUP BY profile_id');
+
+        $updates = array();
+
+        while ($notice->fetch()) {
+            $updates[] = array($notice->profile_id, $notice->max_id);
+        }
+
+        return $updates;
+    }
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
 }