github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Do not return channels for hashtags if user cannot chat (#19417)

Browse Source 
Previously with this experimental feature a user would be
able to search for public channels for public categories
using the new #hashtag system even if they couldn't chat.
This commit fixes the hole.
This commit is contained in:
Martin Brennan
2022-12-12 12:24:41 +10:00
committed by GitHub
parent ab4158d257
commit f5b464ead5
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/chat/lib/chat_channel_hashtag_data_source.rb
View File

@ -18,6 +18,7 @@ class Chat::ChatChannelHashtagDataSource
def self.lookup(guardian, slugs)
if SiteSetting.enable_experimental_hashtag_autocomplete
return [] if !guardian.can_chat?(guardian.user)
Chat::ChatChannelFetcher
.secured_public_channel_slug_lookup(guardian, slugs)
.map { |channel| channel_to_hashtag_item(guardian, channel) }
@ -28,6 +29,7 @@ class Chat::ChatChannelHashtagDataSource
def self.search(guardian, term, limit)
if SiteSetting.enable_experimental_hashtag_autocomplete
return [] if !guardian.can_chat?(guardian.user)
Chat::ChatChannelFetcher
.secured_public_channel_search(
guardian,
@ -47,6 +49,7 @@ class Chat::ChatChannelHashtagDataSource
def self.search_without_term(guardian, limit)
if SiteSetting.enable_experimental_hashtag_autocomplete
return [] if !guardian.can_chat?(guardian.user)
allowed_channel_ids_sql =
Chat::ChatChannelFetcher.generate_allowed_channel_ids_sql(
guardian,