Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/lib/inboxtagcloudsection.php b/lib/inboxtagcloudsection.php
index e41ee22a17dbfb41a7fe9fcbce3e9d8d618add51..d19f76366d6f09d072f8f04218d83d0c4f465d54 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,16 +62,13 @@ class InboxTagCloudSection extends TagCloudSection
     {
         $profile = Profile::current();
 
-        $keypart = sprintf('Inbox:notice_tag:%d:%d', $this->user->id, $profile->id);
-
-        $tag = Memcached_DataObject::cacheGet($keypart);
-
-        if ($tag === false) {
+        $stream = new InboxNoticeStream($this->target, $profile);
 
-            $stream = new InboxNoticeStream($this->user, $profile);
-
-            $ids = $stream->getNoticeIds(0, Inbox::MAX_NOTICES, null, null);
+        $ids = $stream->getNoticeIds(0, self::MAX_NOTICES, null, null);
 
+        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.
 
@@ -99,8 +98,6 @@ class InboxTagCloudSection extends TagCloudSection
             while ($t->fetch()) {
                 $tag[] = clone($t);
             }
-
-            Memcached_DataObject::cacheSet($keypart, $tag, 3600);
         }
 
         return new ArrayWrapper($tag);