Merged stuff from upstream/master

[quix0rs-gnu-social.git] / lib / inboxnoticestream.php

diff --git a/lib/inboxnoticestream.php b/lib/inboxnoticestream.php
index 0d8733e079cc31989dd0e6ecc009a035154c607f..496fe0d05d5425f6c784a0cf448b4fe34e4bb52d 100644 (file)
--- a/lib/inboxnoticestream.php
+++ b/lib/inboxnoticestream.php
@@ -85,6 +85,7 @@ class RawInboxNoticeStream extends NoticeStream
     function __construct(Profile $target)
     {
         $this->target  = $target;
+        $this->unselectVerbs = array(ActivityVerb::DELETE);
     }
 
     /**
@@ -121,6 +122,9 @@ class RawInboxNoticeStream extends NoticeStream
         if (!empty($this->selectVerbs)) {
             $notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb'));
         }
+        if (!empty($this->unselectVerbs)) {
+            $notice->whereAddIn('!verb', $this->unselectVerbs, $notice->columnType('verb'));
+        }
         $notice->limit($offset, $limit);
         // notice.id will give us even really old posts, which were
         // recently imported. For example if a remote instance had
@@ -136,34 +140,4 @@ class RawInboxNoticeStream extends NoticeStream
 
         return $ids;
     }
-
-    function getNotices($offset, $limit, $sinceId, $maxId)
-    {
-        //common_debug('offset=' . $offset . ',limit=' . $limit . ',sinceId=' . $sinceId . ',maxId=' . $maxId . ' - CALLED!');
-        $all = array();
-
-        do {
-
-            $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);
-            //common_debug('ids()=' . count($ids));
-
-            $notices = Notice::pivotGet('id', $ids);
-
-            // By default, takes out false values
-
-            $notices = array_filter($notices);
-
-            $all = array_merge($all, $notices);
-
-            if (count($notices < count($ids))) {
-                $offset += $limit;
-                $limit  -= count($notices);
-            }
-
-            //common_debug('all()=' . count($all));
-        } while (count($notices) < count($ids) && count($ids) > 0);
-
-        //common_debug('all()=' . count($all) . ' - EXIT!');
-        return new ArrayWrapper($all);
-    }
 }