Don't send user ids for announcement channels

ppy · Sep 26, 2024 · 69851f3 · 69851f3
1 parent 742ba3c
commit 69851f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/app/Models/Chat/Channel.php b/app/Models/Chat/Channel.php
@@ -293,11 +293,7 @@ public function users(): Collection
 
     public function visibleUsers(?User $user)
     {
-        if ($this->isPM() || $this->isAnnouncement() && priv_check_user($user, 'ChatAnnounce', $this)->can()) {
-            return $this->users();
-        }
-
-        return new Collection();
+        return $this->isPM() ? $this->users() : new Collection();
     }
 
     public function scopePublic($query)

diff --git a/app/Transformers/Chat/ChannelTransformer.php b/app/Transformers/Chat/ChannelTransformer.php
@@ -99,14 +99,7 @@ public function includeRecentMessages(Channel $channel)
 
     public function includeUsers(Channel $channel)
     {
-        if (
-            $channel->isPM()
-            || $channel->isAnnouncement() && priv_check_user($this->user, 'ChatAnnounce', $channel)->can()
-        ) {
-            return $this->primitive($channel->userIds());
-        }
-
-        return $this->primitive([]);
+        return $this->primitive($channel->isPM() ? $channel->userIds() : []);
     }
 
     public function includeUuid(Channel $channel)