Merge pull request #11510 from nanaya/announce-channel-users

Don't send user ids for announcement channels
ppy · Sep 27, 2024 · 516d8ab · 516d8ab
2 parents de0db22 + 27a3e1c
commit 516d8ab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/app/Http/Controllers/Chat/ChannelsController.php b/app/Http/Controllers/Chat/ChannelsController.php
@@ -205,7 +205,7 @@ public function show($channelId)
             'channel' => json_item($channel, ChannelTransformer::forUser($user), ChannelTransformer::LISTING_INCLUDES),
             // TODO: probably going to need a better way to list/fetch/update users on larger channels without sending user on every message.
             'users' => json_collection(
-                $channel->visibleUsers($user)->loadMissing(UserCompactTransformer::CARD_INCLUDES_PRELOAD),
+                $channel->visibleUsers()->loadMissing(UserCompactTransformer::CARD_INCLUDES_PRELOAD),
                 new UserCompactTransformer(),
                 UserCompactTransformer::CARD_INCLUDES
             ),

diff --git a/app/Models/Chat/Channel.php b/app/Models/Chat/Channel.php
@@ -291,13 +291,9 @@ public function users(): Collection
         });
     }
 
-    public function visibleUsers(?User $user)
+    public function visibleUsers(): Collection
     {
-        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)

diff --git a/tests/Models/Chat/ChannelTest.php b/tests/Models/Chat/ChannelTest.php
@@ -279,7 +279,7 @@ public function testPublicChannelDoesNotShowUsers()
         $channel = Channel::factory()->type('public', [$user])->create();
 
         $this->assertSame(1, $channel->users()->count());
-        $this->assertEmpty($channel->visibleUsers($user));
+        $this->assertEmpty($channel->visibleUsers());
     }
 
     // test add/removeUser resets any memoized values