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

Notification created for wrong user after invite.

Browse Source 
Introduced in c64f09b6b7
This commit is contained in:
Guo Xiang Tan 2018-02-26 13:19:52 +08:00
parent 6c1c5fe2d6
commit 6a88f7db61
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/models/topic.rb
View File

@ -793,26 +793,28 @@ SQL
end end
def invite(invited_by, username_or_email, group_ids = nil, custom_message = nil) def invite(invited_by, username_or_email, group_ids = nil, custom_message = nil)
user = User.find_by_username_or_email(username_or_email) target_user = User.find_by_username_or_email(username_or_email)
if user && topic_allowed_users.where(user_id: user.id).exists? if target_user && topic_allowed_users.where(user_id: target_user.id).exists?
raise UserExists.new(I18n.t("topic_invite.user_exists")) raise UserExists.new(I18n.t("topic_invite.user_exists"))
end end
if user && private_message? && topic_allowed_users.create!(user_id: user.id) if target_user && private_message? && topic_allowed_users.create!(user_id: target_user.id)
add_small_action(invited_by, "invited_user", user.username) add_small_action(invited_by, "invited_user", target_user.username)
create_invite_notification!( create_invite_notification!(
target_user,
Notification.types[:invited_to_private_message], Notification.types[:invited_to_private_message],
invited_by.username invited_by.username
) )
true true
elsif username_or_email =~ /^.+@.+$/ && Guardian.new(invited_by).can_invite_via_email?(self) elsif username_or_email =~ /^.+@.+$/ && Guardian.new(invited_by).can_invite_via_email?(self)
if user if target_user
Invite.extend_permissions(self, user, invited_by) Invite.extend_permissions(self, target_user, invited_by)
create_invite_notification!( create_invite_notification!(
target_user,
Notification.types[:invited_to_topic], Notification.types[:invited_to_topic],
invited_by.username invited_by.username
) )
@ -821,8 +823,9 @@ SQL
end end
true true
elsif user && topic_allowed_users.create!(user_id: user.id) elsif target_user && topic_allowed_users.create!(user_id: target_user.id)
create_invite_notification!( create_invite_notification!(
target_user,
Notification.types[:invited_to_topic], Notification.types[:invited_to_topic],
invited_by.username invited_by.username
) )
@ -1290,8 +1293,8 @@ SQL
RateLimiter.new(user, "#{key}-per-day", SiteSetting.send(method_name), 1.day.to_i) RateLimiter.new(user, "#{key}-per-day", SiteSetting.send(method_name), 1.day.to_i)
end end
def create_invite_notification!(notification_type, username) def create_invite_notification!(target_user, notification_type, username)
user.notifications.create!( target_user.notifications.create!(
notification_type: notification_type, notification_type: notification_type,
topic_id: self.id, topic_id: self.id,
post_number: 1, post_number: 1,

7
spec/models/topic_spec.rb
View File

@ -546,6 +546,13 @@ describe Topic do
expect(topic.invite(topic.user, walter.username)).to eq(true) expect(topic.invite(topic.user, walter.username)).to eq(true)
expect(topic.allowed_users.include?(walter)).to eq(true) expect(topic.allowed_users.include?(walter)).to eq(true)
notification = Notification.last
expect(notification.user).to eq(walter)
expect(notification.notification_type)
.to eq(Notification.types[:invited_to_private_message])
expect(topic.remove_allowed_user(topic.user, walter.username)).to eq(true) expect(topic.remove_allowed_user(topic.user, walter.username)).to eq(true)
topic.reload topic.reload
expect(topic.allowed_users.include?(walter)).to eq(false) expect(topic.allowed_users.include?(walter)).to eq(false)