summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/favorited.php7
-rw-r--r--actions/public.php6
-rw-r--r--classes/Memcached_DataObject.php49
-rw-r--r--classes/Notice.php6
-rw-r--r--classes/NoticeWrapper.php62
-rw-r--r--lib/arraywrapper.php79
-rw-r--r--lib/profilesection.php97
-rw-r--r--lib/section.php8
-rw-r--r--lib/topposterssection.php105
9 files changed, 336 insertions, 83 deletions
diff --git a/actions/favorited.php b/actions/favorited.php
index 0223564f3..4155b3a23 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -181,10 +181,9 @@ class FavoritedAction extends Action
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
- // XXX: Figure out how to cache this query
-
- $notice = new Notice;
- $notice->query(sprintf($qry, common_config('popular', 'dropoff')));
+ $notice = Memcached_DataObject::cachedQuery('Notice',
+ sprintf($qry, common_config('popular', 'dropoff')),
+ 600);
$nl = new NoticeList($notice, $this);
diff --git a/actions/public.php b/actions/public.php
index 0ceeef98e..880b651e1 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -197,4 +197,10 @@ class PublicAction extends Action
'version' => 'Atom 1.0',
'item' => 'publicatom')));
}
+
+ function showSections()
+ {
+ $top = new TopPostersSection($this);
+ $top->show();
+ }
}
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index b9f599dbc..c670e99c8 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-class Memcached_DataObject extends DB_DataObject
+class Memcached_DataObject extends DB_DataObject
{
function &staticGet($cls, $k, $v=null)
{
@@ -69,7 +69,7 @@ class Memcached_DataObject extends DB_DataObject
$result = parent::insert();
return $result;
}
-
+
function update($orig=null)
{
if (is_object($orig) && $orig instanceof Memcached_DataObject) {
@@ -81,21 +81,21 @@ class Memcached_DataObject extends DB_DataObject
}
return $result;
}
-
+
function delete()
{
$this->decache(); # while we still have the values!
return parent::delete();
}
-
+
static function memcache() {
return common_memcache();
}
-
+
static function cacheKey($cls, $k, $v) {
return common_cache_key(strtolower($cls).':'.$k.':'.$v);
}
-
+
static function getcached($cls, $k, $v) {
$c = Memcached_DataObject::memcache();
if (!$c) {
@@ -114,7 +114,7 @@ class Memcached_DataObject extends DB_DataObject
}
return $_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"];
}
-
+
function encache()
{
$c = $this->memcache();
@@ -122,7 +122,7 @@ class Memcached_DataObject extends DB_DataObject
return false;
} else {
$pkey = array();
- $pval = array();
+ $pval = array();
$types = $this->keyTypes();
ksort($types);
foreach ($types as $key => $type) {
@@ -139,7 +139,7 @@ class Memcached_DataObject extends DB_DataObject
$c->set($this->cacheKey($this->tableName(), $pkeys, $pvals), $this);
}
}
-
+
function decache()
{
$c = $this->memcache();
@@ -147,7 +147,7 @@ class Memcached_DataObject extends DB_DataObject
return false;
} else {
$pkey = array();
- $pval = array();
+ $pval = array();
$types = $this->keyTypes();
ksort($types);
foreach ($types as $key => $type) {
@@ -201,4 +201,33 @@ class Memcached_DataObject extends DB_DataObject
}
return $search_engine;
}
+
+ static function cachedQuery($cls, $qry, $expiry=3600)
+ {
+ $c = Memcached_DataObject::memcache();
+ if (!$c) {
+ $inst = new $cls();
+ $inst->query($qry);
+ return $cls;
+ }
+ $key_part = common_keyize($cls).':'.md5($qry);
+ $ckey = common_cache_key($key_part);
+ $stored = $c->get($ckey);
+ if ($stored) {
+ return new ArrayWrapper($stored);
+ }
+
+ $inst = new $cls();
+ $result = $inst->query($qry);
+ if (!$result) {
+ return $inst;
+ }
+ $cached = array();
+ while ($inst->fetch()) {
+ $cached[] = clone($inst);
+ }
+ $inst->free();
+ $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
+ return ArrayWrapper($cached);
+ }
}
diff --git a/classes/Notice.php b/classes/Notice.php
index 5fa078205..de7540705 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -443,7 +443,7 @@ class Notice extends Memcached_DataObject
# On a cache hit, return a DB-object-like wrapper
if ($notices !== false) {
- $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
+ $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
return $wrapper;
}
@@ -483,7 +483,7 @@ class Notice extends Memcached_DataObject
# return a wrapper of the array for use now
- return new NoticeWrapper(array_slice($notices, $offset, $limit));
+ return new ArrayWrapper(array_slice($notices, $offset, $limit));
}
}
@@ -514,7 +514,7 @@ class Notice extends Memcached_DataObject
# return a wrapper of the array for use now
- $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
+ $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
return $wrapper;
}
diff --git a/classes/NoticeWrapper.php b/classes/NoticeWrapper.php
deleted file mode 100644
index 233340ccd..000000000
--- a/classes/NoticeWrapper.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/classes/Notice.php');
-
-class NoticeWrapper extends Notice
-{
-
- public $id; // int(4) primary_key not_null
- public $profile_id; // int(4) not_null
- public $uri; // varchar(255) unique_key
- public $content; // varchar(140)
- public $rendered; // text()
- public $url; // varchar(255)
- public $created; // datetime() not_null
- public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
- public $reply_to; // int(4)
- public $is_local; // tinyint(1)
- public $source; // varchar(32)
-
- var $notices = null;
- var $i = -1;
-
- function __construct($arr)
- {
- $this->notices = $arr;
- }
-
- function fetch()
- {
- static $fields = array('id', 'profile_id', 'uri', 'content', 'rendered',
- 'url', 'created', 'modified', 'reply_to', 'is_local', 'source');
- $this->i++;
- if ($this->i >= count($this->notices)) {
- return false;
- } else {
- $n = $this->notices[$this->i];
- foreach ($fields as $f) {
- $this->$f = $n->$f;
- }
- return true;
- }
- }
-} \ No newline at end of file
diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
new file mode 100644
index 000000000..ef0eeffa5
--- /dev/null
+++ b/lib/arraywrapper.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) {
+ exit(1);
+}
+
+class ArrayWrapper
+{
+ var $_items = null;
+ var $_count = 0;
+ var $_i = -1;
+
+ function __construct($items)
+ {
+ $this->_items = $items;
+ $this->_count = count($this->_items);
+ }
+
+ function fetch()
+ {
+ if (!$this->_items) {
+ return false;
+ }
+ $this->_i++;
+ if ($this->_i < $this->_count) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ function __set($name, $value)
+ {
+ $item =& $this->_items[$this->_i];
+ $item->$name = $value;
+ return $item->$name;
+ }
+
+ function __get($name)
+ {
+ $item =& $this->_items[$this->_i];
+ return $item->$name;
+ }
+
+ function __isset($name)
+ {
+ $item =& $this->_items[$this->_i];
+ return isset($item->$name);
+ }
+
+ function __unset($name)
+ {
+ $item =& $this->_items[$this->_i];
+ unset($item->$name);
+ }
+
+ function __call($name, $args)
+ {
+ $item =& $this->_items[$this->_i];
+ return call_user_func_array(array($item, $name), $args);
+ }
+} \ No newline at end of file
diff --git a/lib/profilesection.php b/lib/profilesection.php
new file mode 100644
index 000000000..087adb2ef
--- /dev/null
+++ b/lib/profilesection.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for sections showing lists of people
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Widget
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @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('PROFILES_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 <evan@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
+class ProfileSection extends Section
+{
+ function showContent()
+ {
+ $profiles = $this->getProfiles();
+
+ $cnt = 0;
+
+ $this->out->elementStart('ul', 'entities users xoxo');
+
+ while ($profiles->fetch() && ++$cnt <= PROFILES_PER_SECTION) {
+ $this->showProfile($profiles);
+ }
+
+ $this->out->elementEnd('ul');
+
+ return ($cnt > PROFILES_PER_SECTION);
+ }
+
+ function getProfiles()
+ {
+ return null;
+ }
+
+ function showProfile($profile)
+ {
+ $this->out->elementStart('li', 'vcard');
+ $this->out->elementStart('a', array('title' => ($profile->fullname) ?
+ $profile->fullname :
+ $profile->nickname,
+ 'href' => $profile->profileurl,
+ 'rel' => 'contact member',
+ 'class' => 'url'));
+ $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+ $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)),
+ 'width' => AVATAR_MINI_SIZE,
+ 'height' => AVATAR_MINI_SIZE,
+ 'class' => 'avatar photo',
+ 'alt' => ($profile->fullname) ?
+ $profile->fullname :
+ $profile->nickname));
+ $this->out->element('span', 'fn nickname', $profile->nickname);
+ $this->out->elementEnd('a');
+ if ($profile->value) {
+ $this->out->element('span', 'value', $profile->value);
+ }
+ $this->out->elementEnd('li');
+ }
+}
diff --git a/lib/section.php b/lib/section.php
index d64095a3e..0c32ddcf8 100644
--- a/lib/section.php
+++ b/lib/section.php
@@ -69,14 +69,14 @@ class Section extends Widget
$have_more = $this->showContent();
if ($have_more) {
- $this->elementStart('p');
- $this->element('a', array('href' => $this->moreUrl(),
+ $this->out->elementStart('p');
+ $this->out->element('a', array('href' => $this->moreUrl(),
'class' => 'more'),
$this->moreTitle());
- $this->elementEnd('p');
+ $this->out->elementEnd('p');
}
- $this->elementEnd('div');
+ $this->out->elementEnd('div');
}
function divId()
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
new file mode 100644
index 000000000..116373818
--- /dev/null
+++ b/lib/topposterssection.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for sections showing lists of people
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Widget
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @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);
+}
+
+/**
+ * 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 <evan@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
+class TopPostersSection extends ProfileSection
+{
+ function getProfiles()
+ {
+ $qry = 'SELECT profile.*, count(*) as value ' .
+ 'FROM profile JOIN notice ON profile.id = notice.profile_id ' .
+ 'GROUP BY profile.id ' .
+ 'ORDER BY value DESC ';
+
+ $limit = PROFILES_PER_SECTION;
+ $offset = 0;
+
+ if (common_config('db','type') == 'pgsql') {
+ $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+ } else {
+ $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+ }
+
+ $profile = Memcached_DataObject::cachedQuery('Profile',
+ $qry,
+ 6 * 3600);
+ return $profile;
+ }
+
+ function showProfile($profile)
+ {
+ $this->out->elementStart('li', 'vcard');
+ $this->out->elementStart('a', array('title' => ($profile->fullname) ?
+ $profile->fullname :
+ $profile->nickname,
+ 'href' => $profile->profileurl,
+ 'rel' => 'contact member',
+ 'class' => 'url'));
+ $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+ $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)),
+ 'width' => AVATAR_MINI_SIZE,
+ 'height' => AVATAR_MINI_SIZE,
+ 'class' => 'avatar photo',
+ 'alt' => ($profile->fullname) ?
+ $profile->fullname :
+ $profile->nickname));
+ $this->out->element('span', 'fn nickname', $profile->nickname);
+ $this->out->elementEnd('a');
+ if ($profile->value) {
+ $this->out->element('span', 'value', $profile->value);
+ }
+ $this->out->elementEnd('li');
+ }
+
+ function title()
+ {
+ return _('Top posters');
+ }
+
+ function divId()
+ {
+ return 'top_posters';
+ }
+}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-12 16:46:00 +0000