GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Revert "Add threading notice stream class to threaded pages"

Browse Source 
This reverts commit 97a8bae4a9.
This commit is contained in:
Evan Prodromou 2011-04-15 18:20:06 -04:00
parent 97a8bae4a9
commit 97bae46da1
4 changed files with 11 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/groupnoticestream.php
View File

@ -44,18 +44,16 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class GroupNoticeStream extends ThreadingNoticeStream class GroupNoticeStream extends ScopingNoticeStream
{ {
function __construct($group, $profile = -1) function __construct($group, $profile = -1)
{ {
if (is_int($profile) && $profile == -1) { if (is_int($profile) && $profile == -1) {
$profile = Profile::current(); $profile = Profile::current();
} }
parent::__construct(new CachingNoticeStream(new RawGroupNoticeStream($group),
$stream = new ScopingNoticeStream(new CachingNoticeStream(new RawGroupNoticeStream($group), 'user_group:notice_ids:' . $group->id),
'user_group:notice_ids:' . $group->id), $profile);
$profile);
parent::__construct($stream);
} }
} }

7
lib/inboxnoticestream.php
View File

@ -20,7 +20,7 @@
* You should have received a copy of the GNU Affero General Public License * 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/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @category * @category Cache
* @package StatusNet * @package StatusNet
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc. * @copyright 2011 StatusNet, Inc.
@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class InboxNoticeStream extends ThreadingNoticeStream class InboxNoticeStream extends ScopingNoticeStream
{ {
/** /**
* Constructor * Constructor
@ -58,8 +58,7 @@ class InboxNoticeStream extends ThreadingNoticeStream
} }
// Note: we don't use CachingNoticeStream since RawInboxNoticeStream // Note: we don't use CachingNoticeStream since RawInboxNoticeStream
// uses Inbox::staticGet(), which is cached. // uses Inbox::staticGet(), which is cached.
$stream = new ScopingNoticeStream(new RawInboxNoticeStream($user), $profile); parent::__construct(new RawInboxNoticeStream($user), $profile);
parent::__construct($stream);
} }
} }

8
lib/publicnoticestream.php
View File

@ -45,13 +45,13 @@ if (!defined('STATUSNET')) {
* @link http://status.net/ * @link http://status.net/
*/ */
class PublicNoticeStream extends ThreadingNoticeStream class PublicNoticeStream extends ScopingNoticeStream
{ {
function __construct($profile=null) function __construct($profile=null)
{ {
$stream = new ScopingNoticeStream(new CachingNoticeStream(new RawPublicNoticeStream(), 'public'), parent::__construct(new CachingNoticeStream(new RawPublicNoticeStream(),
$profile); 'public'),
parent::__construct($stream); $profile);
} }
} }

70
lib/threadingnoticestream.php
View File

@ -1,70 +0,0 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* Notice stream that's good for threading lists
*
* PHP version 5
*
* 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 Notice stream
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
// This check helps protect against security problems;
// your code file can't be executed directly from the web.
exit(1);
}
/**
* This notice stream filters notices by whether their conversation
* has been seen before. It's a good (well, OK) way to get streams
* for a ThreadedNoticeList display.
*
* @category Notice stream
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class ThreadingNoticeStream extends FilteringNoticeStream
{
protected $seen = array();
function getNotices($offset, $limit, $sinceId=null, $maxId=null)
{
// Clear this each time we're called
$this->seen = array();
return parent::getNotices($offset, $limit, $sinceId, $maxId);
}
function filter($notice)
{
if (!array_key_exists($notice->id, $this->seen)) {
$this->seen[$notice->id] = true;
return true;
} else {
return false;
}
}
}