We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit fde3b99e authored by mattl's avatar mattl

Less redundant code, please

parent 29620619
...@@ -172,21 +172,12 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction ...@@ -172,21 +172,12 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
*/ */
function getNotices() function getNotices()
{ {
$notices = array(); $notice = Notice_tag::getStream($this->tag)->getNotices(($this->page - 1) * $this->count,
$this->count + 1,
$this->since_id,
$this->max_id);
$notice = Notice_tag::getStream( return $notice->fetchAll();
$this->tag,
($this->page - 1) * $this->count,
$this->count + 1,
$this->since_id,
$this->max_id
);
while ($notice->fetch()) {
$notices[] = clone($notice);
}
return $notices;
} }
/** /**
......
...@@ -46,7 +46,8 @@ class TagAction extends ManagedAction ...@@ -46,7 +46,8 @@ class TagAction extends ManagedAction
common_set_returnto($this->selfUrl()); common_set_returnto($this->selfUrl());
$this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); $this->notice = Notice_tag::getStream($this->tag)->getNotices(($this->page-1)*NOTICES_PER_PAGE,
NOTICES_PER_PAGE + 1);
if($this->page > 1 && $this->notice->N == 0){ if($this->page > 1 && $this->notice->N == 0){
// TRANS: Client error when page not found (404). // TRANS: Client error when page not found (404).
......
...@@ -47,12 +47,8 @@ class TagrssAction extends Rss10Action ...@@ -47,12 +47,8 @@ class TagrssAction extends Rss10Action
return null; return null;
} }
$notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit); $notice = Notice_tag::getStream($tag->tag)->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
while ($notice->fetch()) { return $notice->fetchAll();
$notices[] = clone($notice);
}
return $notices;
} }
function getChannel() function getChannel()
......
...@@ -56,8 +56,7 @@ class Notice_tag extends Managed_DataObject ...@@ -56,8 +56,7 @@ class Notice_tag extends Managed_DataObject
static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0) static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
{ {
$stream = new TagNoticeStream($tag); $stream = new TagNoticeStream($tag);
return $stream;
return $stream->getNotices($offset, $limit, $sinceId, $maxId);
} }
function blowCache($blowLast=false) function blowCache($blowLast=false)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment