[NOTICES] Restore FullNoticeStream

But only allow a select number of verbs.
This is to display optional subscription notices.
This commit is contained in:
Alexei Sorokin 2020-08-09 21:00:14 +03:00 committed by Diogo Peralta Cordeiro
parent 5b95c1172a
commit 2de195d20c
5 changed files with 49 additions and 4 deletions

View File

@ -0,0 +1,45 @@
<?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
/**
* Description of this file.
*
* @category Stream
* @package GNUsocial
* @author Mikael Nordfeldth <mmn@hethane.se>
* @copyright 2016 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
defined('GNUSOCIAL') || die();
/**
* Class for notice streams that filter as little as possible.
*
* @copyright 2016 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
abstract class FullNoticeStream extends NoticeStream
{
protected $selectVerbs = [
ActivityVerb::POST => true,
ActivityVerb::SHARE => true,
ActivityVerb::FOLLOW => true,
ActivityVerb::UNFOLLOW => true,
ActivityVerb::JOIN => true,
ActivityVerb::LEAVE => true,
];
}

View File

@ -66,7 +66,7 @@ class InboxNoticeStream extends ScopingNoticeStream
* @copyright 2014 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
class RawInboxNoticeStream extends NoticeStream
class RawInboxNoticeStream extends FullNoticeStream
{
protected $target = null;
protected $inbox = null;

View File

@ -46,7 +46,7 @@ class NetworkPublicNoticeStream extends ModeratedNoticeStream
* @copyright 2011 StatusNet, Inc.
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
class RawNetworkPublicNoticeStream extends NoticeStream
class RawNetworkPublicNoticeStream extends FullNoticeStream
{
public function getNoticeIds($offset, $limit, $since_id, $max_id)
{

View File

@ -104,7 +104,7 @@ class ProfileNoticeStream extends ScopingNoticeStream
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
class RawProfileNoticeStream extends NoticeStream
class RawProfileNoticeStream extends FullNoticeStream
{
protected $target;

View File

@ -60,7 +60,7 @@ class PublicNoticeStream extends ModeratedNoticeStream
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
class RawPublicNoticeStream extends NoticeStream
class RawPublicNoticeStream extends FullNoticeStream
{
public function getNoticeIds($offset, $limit, $since_id, $max_id)
{