Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FEATURE: Allow user to leave a PM.

Browse source
This commit is contained in:
Guo Xiang Tan 2017-10-10 16:26:56 +08:00
parent 79de10b212
commit 25c25ae423
11 changed files with 132 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/models/topic.rb
View file

@ -709,14 +709,21 @@ SQL
end
def remove_allowed_user(removed_by, username)
if user = User.find_by(username: username)
user = username.is_a?(User) ? username : User.find_by(username: username)
if user
topic_user = topic_allowed_users.find_by(user_id: user.id)
if topic_user
topic_user.destroy
# we can not remove ourselves cause then we will end up adding
# ourselves in add_small_action
removed_by = Discourse.system_user if user.id == removed_by&.id
add_small_action(removed_by, "removed_user", user.username)
if user.id == removed_by&.id
removed_by = Discourse.system_user
add_small_action(removed_by, "user_left", user.username)
else
add_small_action(removed_by, "removed_user", user.username)
end
return true
end
end