X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fprofilenoticestream.php;h=1fa795d32090a55866c49f9221757ab7c089fdcb;hb=1ae5ea8f4cf40113a14a183b754101177f99ba32;hp=f62b787b04d5109b8653c47266ac598d6d3b3d1d;hpb=3cc7dda4784064cca1363e24a91e379de5159287;p=quix0rs-gnu-social.git

diff --git a/lib/profilenoticestream.php b/lib/profilenoticestream.php
index f62b787b04..1fa795d320 100644
--- a/lib/profilenoticestream.php
+++ b/lib/profilenoticestream.php
@@ -45,12 +45,62 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class ProfileNoticeStream extends CachingNoticeStream
+class ProfileNoticeStream extends ScopingNoticeStream
 {
-    function __construct($profile)
+    var $streamProfile;
+    var $userProfile;
+
+    function __construct($profile, $userProfile = -1)
+    {
+        if (is_int($userProfile) && $userProfile == -1) {
+            $userProfile = Profile::current();
+        }
+        $this->streamProfile = $profile;
+        $this->userProfile   = $userProfile;
+        parent::__construct(new CachingNoticeStream(new RawProfileNoticeStream($profile),
+                                                    'profile:notice_ids:' . $profile->id),
+                            $userProfile);
+    }
+
+    function getNoticeIds($offset, $limit, $since_id=null, $max_id=null)
     {
-        parent::__construct(new RawProfileNoticeStream($profile),
-                            'profile:notice_ids:' . $profile->id);
+        if ($this->impossibleStream()) {
+            return array();
+        } else {
+            return parent::getNoticeIds($offset, $limit, $since_id, $max_id);
+        }
+    }
+
+    function getNotices($offset, $limit, $since_id=null, $max_id=null)
+    {
+        if ($this->impossibleStream()) {
+            return new ArrayWrapper(array());
+        } else {
+            return parent::getNotices($offset, $limit, $since_id, $max_id);
+        }
+    }
+
+    function impossibleStream() 
+    {
+        $user = User::getKV('id', $this->streamProfile->id);
+
+        // If it's a private stream, and no user or not a subscriber
+
+        if (!empty($user) && $user->private_stream && 
+            (empty($this->userProfile) || !$this->userProfile->isSubscribed($this->streamProfile))) {
+            return true;
+        }
+
+        // If it's a spammy stream, and no user or not a moderator
+
+        if (common_config('notice', 'hidespam')) {
+            if ($this->streamProfile->hasRole(Profile_role::SILENCED) &&
+                (empty($this->userProfile) || (($this->userProfile->id !== $this->streamProfile->id) && !$this->userProfile->hasRight(Right::REVIEWSPAM)))) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }
 
@@ -71,6 +121,7 @@ class RawProfileNoticeStream extends NoticeStream
 
     function __construct($profile)
     {
+        parent::__construct();
         $this->profile = $profile;
     }