Hide notices from members the currently logged-in user has blocked

RedEnchilada · Sep 5, 2014 · 17c5942 · 17c5942
1 parent d0f245c
commit 17c5942
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/actions/showstream.php b/actions/showstream.php
@@ -220,6 +220,16 @@ function extraHead()
                                      'href' => $rsd));
     }
 
+    function showBlockedListMessage()
+    {
+        // TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+        $message = sprintf(_('This is the timeline for %1$s, but you have blocked %1$s, so their notices will not show up for you.'), $this->user->nickname) . ' ';
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+
     function showEmptyListMessage()
     {
         // TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
@@ -249,6 +259,14 @@ function showEmptyListMessage()
 
     function showNotices()
     {
+		if (common_logged_in()) {
+			$u = common_current_user();
+			if ($u->hasBlocked($this->user)) {
+				$this->showBlockedListMessage();
+				return;
+			}
+		}
+
         $pnl = null;
         if (Event::handle('ShowStreamNoticeList', array($this->notice, $this, &$pnl))) {
             $pnl = new ProfileNoticeList($this->notice, $this);

diff --git a/classes/Notice.php b/classes/Notice.php
@@ -2404,6 +2404,12 @@ protected function _inScope($profile)
         } else {
             $scope = self::defaultScope();
         }
+
+		// If user has blocked this notice's owner, hide it regardless
+
+		if ($profile && $profile->hasBlocked($this->getProfile())) {
+			return false;
+		}
 
         // If there's no scope, anyone (even anon) is in scope.