IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Correctly publish messages unconditionally to admins (#13053)

Browse Source 
Under certain conditions admins would miss messages when posting action in
topics where they have permission.

This also fixes an error where we would sometimes explode when publishing to
an empty group.
This commit is contained in:
Sam
2021-05-20 16:58:27 +10:00
committed by GitHub
parent f1b14a7f71
commit 058b5310c1
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user_action.rb
View File

@@ -283,14 +283,14 @@ class UserAction < ActiveRecord::Base
update_like_count(user_id, hash[:action_type], 1)
end
# move into Topic perhaps
group_ids = nil
if topic && topic.category && topic.category.read_restricted
group_ids = topic.category.groups.pluck("groups.id")
group_ids = [Group::AUTO_GROUPS[:admins]]
group_ids.concat(topic.category.groups.pluck("groups.id"))
end
if action.user
MessageBus.publish("/u/#{action.user.username.downcase}", action.id, user_ids: [user_id], group_ids: group_ids)
MessageBus.publish("/u/#{action.user.username_lower}", action.id, user_ids: [user_id], group_ids: group_ids)
end
action