* @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);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Stream of mentions of me
class ReplyNoticeStream extends ScopingNoticeStream
{
- function __construct($userId, $profile=-1)
+ function __construct($userId, Profile $scoped=null)
{
- if (is_int($profile) && $profile == -1) {
- $profile = Profile::current();
- }
parent::__construct(new CachingNoticeStream(new RawReplyNoticeStream($userId),
'reply:stream:' . $userId),
- $profile);
+ $scoped);
}
}
function getNoticeIds($offset, $limit, $since_id, $max_id)
{
$reply = new Reply();
- $reply->profile_id = $this->userId;
- Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'modified');
- Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'modified');
+ $reply->selectAdd();
+ $reply->selectAdd('notice_id');
+
+ $reply->whereAdd(sprintf('reply.profile_id = %u', $this->userId));
+
+ Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'reply.modified');
+ Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'reply.modified');
if (!empty($this->selectVerbs)) {
+ // this is a little special since we have to join in Notice
$reply->joinAdd(array('notice_id', 'notice:id'));
- $reply->whereAddIn('notice.verb', $this->selectVerbs, 'string');
+
+ $filter = array_keys(array_filter($this->selectVerbs));
+ if (!empty($filter)) {
+ // include verbs in selectVerbs with values that equate to true
+ $reply->whereAddIn('notice.verb', $filter, 'string');
+ }
+
+ $filter = array_keys(array_filter($this->selectVerbs, function ($v) { return !$v; }));
+ if (!empty($filter)) {
+ // exclude verbs in selectVerbs with values that equate to false
+ $reply->whereAddIn('!notice.verb', $filter, 'string');
+ }
}
- $reply->orderBy('modified DESC, notice_id DESC');
+ $reply->orderBy('reply.modified DESC, reply.notice_id DESC');
if (!is_null($offset)) {
$reply->limit($offset, $limit);