From 0642b6aa634bc37f86fd54441a3c8358e8da1284 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 22 Jan 2009 20:16:19 +0000 Subject: [PATCH 1/4] Fixed bug in caching of queries --- classes/Memcached_DataObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 3ec7613891..97e1ed736e 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -228,6 +228,6 @@ class Memcached_DataObject extends DB_DataObject } $inst->free(); $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry); - return ArrayWrapper($cached); + return new ArrayWrapper($cached); } } From 82e47b2ec1a2cd9e3e3eeac9b35996935403ab8e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 22 Jan 2009 20:16:43 +0000 Subject: [PATCH 2/4] Add new section type for groups --- lib/groupsection.php | 103 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 lib/groupsection.php diff --git a/lib/groupsection.php b/lib/groupsection.php new file mode 100644 index 0000000000..bf26ab48ca --- /dev/null +++ b/lib/groupsection.php @@ -0,0 +1,103 @@ +. + * + * @category Widget + * @package Laconica + * @author Evan Prodromou + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +if (!defined('LACONICA')) { + exit(1); +} + +define('GROUPS_PER_SECTION', 6); + +/** + * Base class for sections + * + * These are the widgets that show interesting data about a person + * group, or site. + * + * @category Widget + * @package Laconica + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +class GroupSection extends Section +{ + function showContent() + { + $profiles = $this->getGroups(); + + if (!$profiles) { + return false; + } + + $cnt = 0; + + $this->out->elementStart('ul', 'entities group xoxo'); + + while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) { + $this->showGroup($profiles); + } + + $this->out->elementEnd('ul'); + + return ($cnt > GROUPS_PER_SECTION); + } + + function getGroups() + { + return null; + } + + function showGroup($group) + { + $this->out->elementStart('li', 'vcard'); + $this->out->elementStart('a', array('title' => ($group->fullname) ? + $group->fullname : + $group->nickname, + 'href' => $group->homeUrl(), + 'rel' => 'contact group', + 'class' => 'url')); + $logo = ($group->stream_logo) ? + $group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); + + $this->out->element('img', array('src' => $logo, + 'width' => AVATAR_MINI_SIZE, + 'height' => AVATAR_MINI_SIZE, + 'class' => 'avatar photo', + 'alt' => ($group->fullname) ? + $group->fullname : + $group->nickname)); + $this->out->element('span', 'fn org nickname', $group->nickname); + $this->out->elementEnd('a'); + if ($group->value) { + $this->out->element('span', 'value', $group->value); + } + $this->out->elementEnd('li'); + } +} From 06cc977032f47ab6dcc44a4fd4c4d57e3f8497b3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 22 Jan 2009 20:17:05 +0000 Subject: [PATCH 3/4] Add a section to show popular groups (by posts) --- lib/groupsbypostssection.php | 78 ++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 lib/groupsbypostssection.php diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php new file mode 100644 index 0000000000..a5e33a93de --- /dev/null +++ b/lib/groupsbypostssection.php @@ -0,0 +1,78 @@ +. + * + * @category Widget + * @package Laconica + * @author Evan Prodromou + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +if (!defined('LACONICA')) { + exit(1); +} + +/** + * Groups with the most posts section + * + * @category Widget + * @package Laconica + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +class GroupsByPostsSection extends GroupSection +{ + function getGroups() + { + $qry = 'SELECT user_group.*, count(*) as value ' . + 'FROM user_group JOIN group_inbox '. + 'ON user_group.id = group_inbox.group_id ' . + 'GROUP BY user_group.id ' . + 'ORDER BY value DESC '; + + $limit = GROUPS_PER_SECTION; + $offset = 0; + + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } + + $group = Memcached_DataObject::cachedQuery('User_group', + $qry, + 3600); + return $group; + } + + function title() + { + return _('Groups with most posts'); + } + + function divId() + { + return 'top_groups_by_post'; + } +} From 248fd763bde70537e5e9a14db435c27a52849c9a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 22 Jan 2009 20:17:32 +0000 Subject: [PATCH 4/4] Add groups by notice to public --- actions/public.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actions/public.php b/actions/public.php index 8ce7fbee3e..b51a95f244 100644 --- a/actions/public.php +++ b/actions/public.php @@ -204,5 +204,7 @@ class PublicAction extends Action $top->show(); $pop = new PopularNoticeSection($this); $pop->show(); + $gbp = new GroupsByPostsSection($this); + $gbp->show(); } }