From 403b727138e22ce8ba83332ab03fa21fb7f72a1c Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 27 Mar 2015 11:53:23 +0100
Subject: [PATCH] Slightly refactor getting note notification recipients.
---
app/models/concerns/mentionable.rb | 2 +-
app/services/notification_service.rb | 37 +++++++++++++++++-----------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index db75a34f592..1ab0a28fddd 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -53,7 +53,7 @@ module Mentionable
# Extract GFM references to other Mentionables from this Mentionable. Always excludes its #local_reference.
def references(p = project, text = mentionable_text)
return [] if text.blank?
-
+
ext = Gitlab::ReferenceExtractor.new(p)
ext.analyze(text)
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index cc5853144c5..42547f6f481 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -123,32 +123,29 @@ class NotificationService
return true if note.note.start_with?('Status changed to closed')
return true if note.cross_reference? && note.system == true
- opts = { noteable_type: note.noteable_type, project_id: note.project_id }
-
target = note.noteable
- if target.respond_to?(:participants)
- recipients = target.participants
- else
- recipients = note.mentioned_users
- end
+ recipients = []
if note.commit_id.present?
- opts.merge!(commit_id: note.commit_id)
recipients << note.commit_author
- else
- opts.merge!(noteable_id: note.noteable_id)
end
# Get users who left comment in thread
- recipients = recipients.concat(User.where(id: Note.where(opts).pluck(:author_id)))
+ recipients = recipients.concat(noteable_commenters(note))
# Merge project watchers
recipients = recipients.concat(project_watchers(note.project)).compact.uniq
- # Reject mention users unless mentioned in comment
- recipients = reject_mention_users(recipients - note.mentioned_users, note.project)
- recipients = recipients + note.mentioned_users
+ # Reject users with Mention notification level
+ recipients = reject_mention_users(recipients, note.project)
+
+ # Add explicitly mentioned users
+ if target.respond_to?(:participants)
+ recipients = recipients.concat(target.participants)
+ else
+ recipients = recipients.concat(note.mentioned_users)
+ end
# Reject mutes users
recipients = reject_muted_users(recipients, note.project)
@@ -195,6 +192,18 @@ class NotificationService
protected
+ def noteable_commenters(note)
+ opts = { noteable_type: note.noteable_type, project_id: note.project_id }
+
+ if note.commit_id.present?
+ opts.merge!(commit_id: note.commit_id)
+ else
+ opts.merge!(noteable_id: note.noteable_id)
+ end
+
+ User.where(id: Note.where(opts).pluck(:author_id))
+ end
+
# Get project users with WATCH notification level
def project_watchers(project)
project_members = project_member_notification(project)
--
GitLab