Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/sup.php b/actions/sup.php
index a199f247eb768cdd914062be8139549e5e4694e9..b871983185a5f66fff3e944ab354ff730810eea2 100644 (file)
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -19,9 +19,10 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+// @todo FIXME: documentation needed.
 class SupAction extends Action
 {
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -60,16 +61,18 @@ class SupAction extends Action
     {
         $notice = new Notice();
 
-        # XXX: cache this. Depends on how big this protocol becomes;
-        # Re-doing this query every 15 seconds is not the end of the world.
+        // 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 notice ' .
+                       '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();
@@ -81,7 +84,7 @@ class SupAction extends Action
         return $updates;
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }