github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-15 18:51:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: no need to pass down skip_notifications for expanding mentions (#20683)

Browse Source 
This refactoring simplifies ChatNotifier a bit. I wanted to drop 
that argument for expand_direct_mentions too, but that needs 
a bit deeper refactoring, so it's better to do it separately.

Co-authored-by: Joffrey JAFFEUX <j.jaffeux@gmail.com>
This commit is contained in:
Andrei Prigorshnev 2023-03-21 19:44:24 +04:00 committed by GitHub
parent 0231e2332d
commit 0562f952ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/chat/lib/chat/notifier.rb
View File

@ -130,9 +130,11 @@ module Chat
already_covered_ids = [] already_covered_ids = []
expand_direct_mentions(to_notify, already_covered_ids, skip_notifications) expand_direct_mentions(to_notify, already_covered_ids, skip_notifications)
expand_group_mentions(to_notify, already_covered_ids, skip_notifications) if !skip_notifications
expand_here_mention(to_notify, already_covered_ids, skip_notifications) expand_group_mentions(to_notify, already_covered_ids)
expand_global_mention(to_notify, already_covered_ids, skip_notifications) expand_here_mention(to_notify, already_covered_ids)
expand_global_mention(to_notify, already_covered_ids)
end
filter_users_ignoring_or_muting_creator(to_notify, already_covered_ids) filter_users_ignoring_or_muting_creator(to_notify, already_covered_ids)
@ -140,10 +142,10 @@ module Chat
end end
end end
def expand_global_mention(to_notify, already_covered_ids, skip) def expand_global_mention(to_notify, already_covered_ids)
has_all_mention = @mentions.has_global_mention has_all_mention = @mentions.has_global_mention
if has_all_mention && @chat_channel.allow_channel_wide_mentions && !skip if has_all_mention && @chat_channel.allow_channel_wide_mentions
to_notify[:global_mentions] = @mentions to_notify[:global_mentions] = @mentions
.global_mentions .global_mentions
.not_suspended .not_suspended
@ -157,10 +159,10 @@ module Chat
end end
end end
def expand_here_mention(to_notify, already_covered_ids, skip) def expand_here_mention(to_notify, already_covered_ids)
has_here_mention = @mentions.has_here_mention has_here_mention = @mentions.has_here_mention
if has_here_mention && @chat_channel.allow_channel_wide_mentions && !skip if has_here_mention && @chat_channel.allow_channel_wide_mentions
to_notify[:here_mentions] = @mentions to_notify[:here_mentions] = @mentions
.here_mentions .here_mentions
.not_suspended .not_suspended
@ -212,8 +214,8 @@ module Chat
already_covered_ids.concat(to_notify[:direct_mentions]) already_covered_ids.concat(to_notify[:direct_mentions])
end end
def expand_group_mentions(to_notify, already_covered_ids, skip) def expand_group_mentions(to_notify, already_covered_ids)
return [] if skip || @mentions.visible_groups.empty? return if @mentions.visible_groups.empty?
reached_by_group = reached_by_group =
@mentions @mentions