Merge branch '1.0.x'

[quix0rs-gnu-social.git] / classes / Notice.php

diff --git a/classes/Notice.php b/classes/Notice.php
index b186b3ad086c4fcb7ea41058eca150e4d63d80ff..a0b2e910658077273120bcdf9c81c4eae73ee06d 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -2365,7 +2365,11 @@ class Notice extends Managed_DataObject
         $result = self::cacheGet($keypart);
 
         if ($result === false) {
-            $bResult = $this->_inScope($profile);
+            $bResult = false;
+            if (Event::handle('StartNoticeInScope', array($this, $profile, &$bResult))) {
+                $bResult = $this->_inScope($profile);
+                Event::handle('EndNoticeInScope', array($this, $profile, &$bResult));
+            }
             $result = ($bResult) ? 1 : 0;
             self::cacheSet($keypart, $result, 0, 300);
         }
@@ -2383,75 +2387,100 @@ class Notice extends Managed_DataObject
 
         // If there's no scope, anyone (even anon) is in scope.
 
-        if ($scope == 0) {
-            return true;
-        }
+        if ($scope == 0) { // Not private
 
-        // If there's scope, anon cannot be in scope
+            return !$this->isHiddenSpam($profile);
 
-        if (empty($profile)) {
-            return false;
-        }
+        } else { // Private, somehow
 
-        // Author is always in scope
+            // If there's scope, anon cannot be in scope
 
-        if ($this->profile_id == $profile->id) {
-            return true;
-        }
+            if (empty($profile)) {
+                return false;
+            }
 
-        // Only for users on this site
+            // Author is always in scope
 
-        if ($scope & Notice::SITE_SCOPE) {
-            $user = $profile->getUser();
-            if (empty($user)) {
-                return false;
+            if ($this->profile_id == $profile->id) {
+                return true;
+            }
+
+            // Only for users on this site
+
+            if ($scope & Notice::SITE_SCOPE) {
+                $user = $profile->getUser();
+                if (empty($user)) {
+                    return false;
+                }
             }
-        }
 
-        // Only for users mentioned in the notice
+            // Only for users mentioned in the notice
 
-        if ($scope & Notice::ADDRESSEE_SCOPE) {
+            if ($scope & Notice::ADDRESSEE_SCOPE) {
 
-                       $repl = Reply::pkeyGet(array('notice_id' => $this->id,
-                                                                                'profile_id' => $profile->id));
+                $repl = Reply::pkeyGet(array('notice_id' => $this->id,
+                                             'profile_id' => $profile->id));
                                                                                 
-            if (empty($repl)) {
-                return false;
+                if (empty($repl)) {
+                    return false;
+                }
             }
-        }
 
-        // Only for members of the given group
+            // Only for members of the given group
 
-        if ($scope & Notice::GROUP_SCOPE) {
+            if ($scope & Notice::GROUP_SCOPE) {
 
-            // XXX: just query for the single membership
+                // XXX: just query for the single membership
 
-            $groups = $this->getGroups();
+                $groups = $this->getGroups();
 
-            $foundOne = false;
+                $foundOne = false;
 
-            foreach ($groups as $group) {
-                if ($profile->isMember($group)) {
-                    $foundOne = true;
-                    break;
+                foreach ($groups as $group) {
+                    if ($profile->isMember($group)) {
+                        $foundOne = true;
+                        break;
+                    }
+                }
+
+                if (!$foundOne) {
+                    return false;
                 }
             }
 
-            if (!$foundOne) {
-                return false;
+            // Only for followers of the author
+
+            $author = null;
+
+            if ($scope & Notice::FOLLOWER_SCOPE) {
+
+                $author = $this->getProfile();
+        
+                if (!Subscription::exists($profile, $author)) {
+                    return false;
+                }
             }
+
+            return !$this->isHiddenSpam($profile);
         }
+    }
 
-        // Only for followers of the author
+    function isHiddenSpam($profile) {
+        
+        // Hide posts by silenced users from everyone but moderators.
+
+        if (common_config('notice', 'hidespam')) {
 
-        if ($scope & Notice::FOLLOWER_SCOPE) {
             $author = $this->getProfile();
-            if (!Subscription::exists($profile, $author)) {
-                return false;
+
+            if ($author->hasRole(Profile_role::SILENCED)) {
+                if (empty($profile) || !$profile->hasRole(Profile_role::MODERATOR)) {
+                    return true;
+                }
             }
         }
 
-        return true;
+        return false;
     }
 
     static function groupsFromText($text, $profile)