From 819ece93aa9a0c9471b09e83551c1d82a8122593 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Tue, 30 Jun 2020 23:03:41 +0300
Subject: [PATCH] Revert "FullNoticeStream selects all verbs"

It appears this was added to display "tombstones" of deleted notices.
However, it has other side-effects and the concept of keeping them visible has
not been adopted by the wider fediverse.
---
 lib/notices/fullnoticestream.php          | 11 -----------
 lib/notices/inboxnoticestream.php         |  2 +-
 lib/notices/networkpublicnoticestream.php |  2 +-
 lib/notices/publicnoticestream.php        |  2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 lib/notices/fullnoticestream.php

diff --git a/lib/notices/fullnoticestream.php b/lib/notices/fullnoticestream.php
deleted file mode 100644
index 2f83007469..0000000000
--- a/lib/notices/fullnoticestream.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (!defined('GNUSOCIAL')) { exit(1); }
-
-/**
- * Class for notice streams that does not filter anything out.
- */
-abstract class FullNoticeStream extends NoticeStream
-{
-    protected $selectVerbs = [];
-}
diff --git a/lib/notices/inboxnoticestream.php b/lib/notices/inboxnoticestream.php
index 2304612c7a..de621fd3f5 100644
--- a/lib/notices/inboxnoticestream.php
+++ b/lib/notices/inboxnoticestream.php
@@ -58,7 +58,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 FullNoticeStream
+class RawInboxNoticeStream extends NoticeStream
 {
     protected $target = null;
     protected $inbox = null;
diff --git a/lib/notices/networkpublicnoticestream.php b/lib/notices/networkpublicnoticestream.php
index c69a23a1ff..bf0c53727c 100644
--- a/lib/notices/networkpublicnoticestream.php
+++ b/lib/notices/networkpublicnoticestream.php
@@ -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 FullNoticeStream
+class RawNetworkPublicNoticeStream extends NoticeStream
 {
     public function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
diff --git a/lib/notices/publicnoticestream.php b/lib/notices/publicnoticestream.php
index 4ab0ebda64..0a239a7c39 100644
--- a/lib/notices/publicnoticestream.php
+++ b/lib/notices/publicnoticestream.php
@@ -60,7 +60,7 @@ class PublicNoticeStream extends ModeratedNoticeStream
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-class RawPublicNoticeStream extends FullNoticeStream
+class RawPublicNoticeStream extends NoticeStream
 {
     public function getNoticeIds($offset, $limit, $since_id, $max_id)
     {