From 776c2c99ea3cd57866789ca1953f733783adb668 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 20 Apr 2011 16:11:42 -0400 Subject: [PATCH] inbox tag cloud section --- actions/all.php | 8 +-- lib/inboxtagcloudsection.php | 112 ++++++++++++++++++++++++++++++++ lib/personaltagcloudsection.php | 2 + 3 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 lib/inboxtagcloudsection.php diff --git a/actions/all.php b/actions/all.php index 24d8f6ec09..17d5a76ec7 100644 --- a/actions/all.php +++ b/actions/all.php @@ -185,10 +185,10 @@ class AllAction extends ProfileAction { $ibs = new InviteButtonSection($this); $ibs->show(); - $this->showSubscriptions(); - $this->showSubscribers(); - $this->showGroups(); - $this->showLists(); + $pop = new PopularNoticeSection($this); + $pop->show(); + $pop = new InboxTagCloudSection($this, $this->user); + $pop->show(); } function showPageTitle() diff --git a/lib/inboxtagcloudsection.php b/lib/inboxtagcloudsection.php new file mode 100644 index 0000000000..e41ee22a17 --- /dev/null +++ b/lib/inboxtagcloudsection.php @@ -0,0 +1,112 @@ +. + * + * @category Widget + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Personal tag cloud section + * + * @category Widget + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ +class InboxTagCloudSection extends TagCloudSection +{ + var $user = null; + + function __construct($out=null, $user=null) + { + parent::__construct($out); + $this->user = $user; + } + + function title() + { + // TRANS: Title for inbox tag cloud section. + return _m('TITLE', 'Trends'); + } + + function getTags() + { + $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->user, $profile); + + $ids = $stream->getNoticeIds(0, Inbox::MAX_NOTICES, null, null); + + $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; + } + + $t = new Notice_tag(); + + $t->query($qry); + + $tag = array(); + + while ($t->fetch()) { + $tag[] = clone($t); + } + + Memcached_DataObject::cacheSet($keypart, $tag, 3600); + } + + return new ArrayWrapper($tag); + } + + function showMore() + { + } +} diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php index c861c4f57f..cc1693abcb 100644 --- a/lib/personaltagcloudsection.php +++ b/lib/personaltagcloudsection.php @@ -58,6 +58,8 @@ class PersonalTagCloudSection extends TagCloudSection function getTags() { + $inbox = Inbox::staticGet('user_id', $this->user->id); + $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. -- 2.39.5