github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 20:45:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: User archive messages should only publish to the user.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-03-07 11:28:29 +08:00
parent 82619c2445
commit bef35f7be5
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/topic_tracking_state.rb
View File

@ -246,7 +246,7 @@ SQL
sql
end
def self.publish_private_message(topic, archived: false, post: nil, group_archived: false)
def self.publish_private_message(topic, user_id: user_id, user_archive: false, post: nil, group_archived: false)
return unless topic.private_message?
channels = {}
@ -256,8 +256,10 @@ SQL
channels["/private-messages/sent"] = [post.user_id]
end
if archived
channels["/private-messages/archive"] = allowed_user_ids
if user_archive
user_ids = [user_id]
channels["/private-messages/archive"] = user_ids
channels["/private-messages/inbox"] = user_ids
else
topic.allowed_groups.each do |group|
channel = "/private-messages/group/#{group.name.downcase}"
@ -274,13 +276,11 @@ SQL
topic_id: topic.id
}
admin_ids = User.admins.human_users.pluck(:id)
channels.each do |channel, user_ids|
MessageBus.publish(
channel,
message.as_json,
user_ids: user_ids | admin_ids
user_ids: user_ids
)
end
end