wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update from git.gnu.io

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-02-16 11:54:47 +01:00
parent f5acc4a386
commit 0e99f04c43
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
actions/apitimelinefriendshiddenreplies.php
View File

@ -390,6 +390,8 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
protected $target = null; protected $target = null;
protected $inbox = null; protected $inbox = null;
protected $selectVerbs = array();
/** /**
* Constructor * Constructor
* *
@ -397,6 +399,7 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
*/ */
function __construct(Profile $target) function __construct(Profile $target)
{ {
parent::__construct();
$this->target = $target; $this->target = $target;
} }
@ -453,9 +456,17 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
if (!empty($max_id)) { if (!empty($max_id)) {
$notice->whereAdd(sprintf('notice.id <= %d', $max_id)); $notice->whereAdd(sprintf('notice.id <= %d', $max_id));
} }
if (!empty($this->selectVerbs)) {
// We have changed how selectVerbs work in GNUsocial, so it's an associative array
// where each verb is in the key and then the value (true/false) is how to filter.
// $this->unselectVerbs is always unset in newer GNUsocials.
if (!isset($this->unselectVerbs)) {
self::filterVerbs($notice, $this->selectVerbs);
} elseif (!empty($this->selectVerbs)) {
// old behaviour was just if there were selectVerbs set
$notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb')); $notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb'));
} }
$notice->limit($offset, $limit); $notice->limit($offset, $limit);
// notice.id will give us even really old posts, which were // notice.id will give us even really old posts, which were
// recently imported. For example if a remote instance had // recently imported. For example if a remote instance had

4
css/qvitter.css
View File

@ -1609,7 +1609,7 @@ body.rtl #history-container.menu-container a .chev-right {
border-image-repeat: stretch stretch; border-image-repeat: stretch stretch;
border-image-slice: 100% 100% 100% 100%; border-image-slice: 100% 100% 100% 100%;
border-image-source: none; border-image-source: none;
border-image-width: 1 1 1 1: border-image-width: 1 1 1 1;
} }
#feed-header-inner { #feed-header-inner {
position:relative; position:relative;
@ -1836,7 +1836,7 @@ background-repeat: no-repeat;
.stream-item.notification .small-grey-notice, .stream-item.notification .small-grey-notice,
.stream-item.notification .small-grey-notice a { .stream-item.notification .small-grey-notice a {
color:#999; color:#999;
word-break: break-all; word-wrap: break-word;
} }
.stream-item.notification .small-grey-notice a:hover { .stream-item.notification .small-grey-notice a:hover {
color:#333; color:#333;