nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix receiving multiple mentioned-in-comment notifications

Browse source 
When somebody commented multiple times and is mentioned in another
comment afterwards, the person received multiple notifications.
This commit is contained in:
Benjamin Neff 2017-02-16 03:02:38 +01:00
parent eac8c7572c
commit 3d95642aca
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/notifications/mentioned_in_comment.rb
View file

@ -11,7 +11,7 @@ module Notifications
end
def self.filter_mentions(mentions, mentionable, _recipient_user_ids)
mentions.joins(:person).merge(Person.allowed_to_be_mentioned_in_a_comment_to(mentionable.parent))
mentions.includes(:person).merge(Person.allowed_to_be_mentioned_in_a_comment_to(mentionable.parent)).distinct
end
def mail_job

12
spec/integration/mentioning_spec.rb
View file

@ -376,6 +376,18 @@ describe "mentioning", type: :request do
end
end
end
it "only creates one notification for the mentioned person, when mentioned person commented twice before" do
parent = FactoryGirl.create(:status_message_in_aspect, author: author.person)
mentioned_user = FactoryGirl.create(:user_with_aspect, friends: [author])
mentioned_user.comment!(parent, "test comment 1")
mentioned_user.comment!(parent, "test comment 2")
comment = inlined_jobs do
author.comment!(parent, text_mentioning(mentioned_user))
end
expect(notifications_about_mentioning(mentioned_user, comment).count).to eq(1)
end
end
end
end