Merge branch 'nightly' into 'nightly'

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

diff --git a/lib/noticestream.php b/lib/noticestream.php
index 0f53daf83f407e15a878d747d1268b972eb451c9..72325a0fe484f505febe8a2d81f90f1d18cba54c 100644 (file)
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    // This check helps protect against security problems;
-    // your code file can't be executed directly from the web.
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Class for notice streams
@@ -46,12 +42,16 @@ if (!defined('STATUSNET')) {
  */
 abstract class NoticeStream
 {
-    // Will only get notices with the 'post' activityverb by default.
-    protected $selectVerbs = array();
+    protected $selectVerbs   = array(ActivityVerb::POST => true,
+                                     ActivityVerb::SHARE => true);
 
     public function __construct()
     {
-        $this->selectVerbs = array(ActivityVerb::POST, ActivityUtils::resolveUri(ActivityVerb::POST, true));
+        foreach ($this->selectVerbs as $key=>$val) {
+            $this->selectVerbs[ActivityUtils::resolveUri($key)] = $val;
+            // to avoid database inconsistency issues we can select both relative and absolute verbs
+            //$this->selectVerbs[ActivityUtils::resolveUri($key, true)] = $val;
+        }
     }
 
     abstract function getNoticeIds($offset, $limit, $since_id, $max_id);
@@ -69,4 +69,21 @@ abstract class NoticeStream
     {
        return Notice::multiGet('id', $ids);
     }
+
+    static function filterVerbs(Notice $notice, array $selectVerbs)
+    {
+        $filter = array_keys(array_filter($selectVerbs));
+        if (!empty($filter)) {
+            // include verbs in selectVerbs with values that equate to true
+            $notice->whereAddIn('verb', $filter, $notice->columnType('verb'));
+        }
+
+        $filter = array_keys(array_filter($selectVerbs, function ($v) { return !$v; }));
+        if (!empty($filter)) {
+            // exclude verbs in selectVerbs with values that equate to false
+            $notice->whereAddIn('!verb', $filter, $notice->columnType('verb'));
+        }
+
+        unset($filter);
+    }
 }