Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / inboxtagcloudsection.php

diff --git a/lib/inboxtagcloudsection.php b/lib/inboxtagcloudsection.php
index 51424c5939e24a1c64623db1d198fee94ba5c5b8..fbc137041fedfb9b8979ff6db79954e2dcce68ff 100644 (file)
--- a/lib/inboxtagcloudsection.php
+++ b/lib/inboxtagcloudsection.php
@@ -42,12 +42,14 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class InboxTagCloudSection extends TagCloudSection
 {
-    var $user = null;
+    const MAX_NOTICES = 1024;   // legacy value for "Inbox" table size when that existed
 
-    function __construct($out=null, $user=null)
+    protected $target = null;
+
+    function __construct($out=null, Profile $target)
     {
         parent::__construct($out);
-        $this->user = $user;
+        $this->target = $target;
     }
 
     function title()
@@ -60,52 +62,42 @@ class InboxTagCloudSection extends TagCloudSection
     {
         $profile = Profile::current();
 
-        $keypart = sprintf('Inbox:notice_tag:%d:%d', $this->user->id,
-                $profile instanceof Profile ? $profile->id : 0);
+        $stream = new InboxNoticeStream($this->target, $profile);
 
-        $tag = Memcached_DataObject::cacheGet($keypart);
+        $ids = $stream->getNoticeIds(0, self::MAX_NOTICES, null, null);
 
-        if ($tag === false) {
+        if (empty($ids)) {
+            $tag = array();
+        } else {
+            $weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
+            // @fixme should we use the cutoff too? Doesn't help with indexing per-user.
 
-            $stream = new InboxNoticeStream($this->user, $profile);
+            $qry = 'SELECT notice_tag.tag, notice_tag.notice_id, '.
+                $weightexpr . ' as weight ' .
+                'FROM notice_tag JOIN notice ' .
+                'ON notice_tag.notice_id = notice.id ' .
+                'WHERE notice.id in (' . implode(',', $ids) . ')'.
+                'GROUP BY notice_tag.tag ' .
+                'ORDER BY weight DESC ';
 
-            $ids = $stream->getNoticeIds(0, Inbox::MAX_NOTICES, null, null);
+            $limit = TAGS_PER_SECTION;
+            $offset = 0;
 
-            if (empty($ids)) {
-                $tag = array();
+            if (common_config('db','type') == 'pgsql') {
+                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
             } else {
-                $weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
-                // @fixme should we use the cutoff too? Doesn't help with indexing per-user.
-
-                $qry = 'SELECT notice_tag.tag, '.
-                    $weightexpr . ' as weight ' .
-                    'FROM notice_tag JOIN notice ' .
-                    'ON notice_tag.notice_id = notice.id ' .
-                    'WHERE notice.id in (' . implode(',', $ids) . ')'.
-                    'GROUP BY notice_tag.tag ' .
-                    'ORDER BY weight DESC ';
-
-                $limit = TAGS_PER_SECTION;
-                $offset = 0;
-
-                if (common_config('db','type') == 'pgsql') {
-                    $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-                } else {
-                    $qry .= ' LIMIT ' . $offset . ', ' . $limit;
-                }
+                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            }
 
-                $t = new Notice_tag();
+            $t = new Notice_tag();
 
-                $t->query($qry);
+            $t->query($qry);
 
-                $tag = array();
+            $tag = array();
 
-                while ($t->fetch()) {
-                    $tag[] = clone($t);
-                }
+            while ($t->fetch()) {
+                $tag[] = clone($t);
             }
-
-            Memcached_DataObject::cacheSet($keypart, $tag, 3600);
         }
 
         return new ArrayWrapper($tag);