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

Merge branch 'no_sandboxed_repeats_branch' into 'nightly'

Browse Source 
Don't include repeated notices from sandboxed users in the public timeline



See merge request !115
This commit is contained in:
mmn 2016-03-05 08:08:42 -05:00
commit 0785e2910f
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/moderatednoticestream.php
View File

@ -25,18 +25,40 @@ class ModeratedNoticeStream extends ScopingNoticeStream
if (!parent::filter($notice)) { if (!parent::filter($notice)) {
return false; return false;
} }
// If the notice author is sandboxed if(self::include_or_not($notice) === false) {
if ($notice->getProfile()->isSandboxed()) { return false;
if (!$this->scoped instanceof Profile) { }
// Non-logged in users don't get to see posts by sandboxed users
return false; // If this is a repeat the repeated notice is moderated
} elseif (!$notice->getProfile()->sameAs($this->scoped) && !$this->scoped->hasRight(Right::REVIEWSPAM)) { if($notice->isRepeat()) {
// And if we are logged in, deny if scoped user is neither the author nor has the right to review spam try {
$repeated_notice = Notice::getById($notice->repeat_of);
} catch (Exception $e) {
// if we can't get the repeated notice by id, something is seriously wrong with it, so don't include it
return false; return false;
} }
}
if(self::include_or_not($repeated_notice) === false) {
return false;
}
}
return true; return true;
} }
protected function include_or_not(Notice $notice)
{
$profile = $notice->getProfile();
if ($profile->isSandboxed()) {
if (!$this->scoped instanceof Profile) {
// Non-logged in users don't get to see posts by sandboxed users
return false;
} elseif (!$profile->sameAs($this->scoped) && !$this->scoped->hasRight(Right::REVIEWSPAM)) {
// And if we are logged in, deny if scoped user is neither the author nor has the right to review spam
return false;
}
}
}
} }