mirror of
https://github.com/lingble/chatwoot.git
synced 2025-12-10 23:05:21 +00:00
fix: Prevent duplicate notifications for mentions (#10675)
This PR addresses an issue where mention_notification was being overwritten by assigned_conversation_new_message notifications. Similarly, participating_conversation_new_message was taking priority over assigned_conversation_new_message. The fix ensures that additional notifications are not created in these scenarios by establishing a priority order for notifications as follows: 1. mention_notification 2. assigned_conversation_new_message 3. participating_conversation_new_message This change maintains consistency and prevents redundant notifications. ---- Note: In the older implementation of notifications in Chatwoot, notification objects were created only if the user had subscribed to a specific notification type. With the new inbox_view model, we are changing this approach to create notification objects in all cases. This PR updates the services to remove reliance on notification preferences, simplifying the logic. ---- Caveat: Since we don’t create extra notifications for new messages if a mention_notification already exists, a user subscribed to new_message_notification push/email notifications but not to mention_notification will not receive notifications in these cases.
This commit is contained in:
@@ -4,32 +4,17 @@ class Messages::NewMessageNotificationService
|
||||
def perform
|
||||
return unless message.notifiable?
|
||||
|
||||
notify_participating_users
|
||||
notify_conversation_assignee
|
||||
notify_participating_users
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
delegate :conversation, :sender, :account, to: :message
|
||||
|
||||
def notify_participating_users
|
||||
participating_users = conversation.conversation_participants.map(&:user)
|
||||
participating_users -= [sender] if sender.is_a?(User)
|
||||
|
||||
participating_users.uniq.each do |participant|
|
||||
NotificationBuilder.new(
|
||||
notification_type: 'participating_conversation_new_message',
|
||||
user: participant,
|
||||
account: account,
|
||||
primary_actor: message.conversation,
|
||||
secondary_actor: message
|
||||
).perform
|
||||
end
|
||||
end
|
||||
|
||||
def notify_conversation_assignee
|
||||
return if conversation.assignee.blank?
|
||||
return if assignee_already_notified_via_participation?
|
||||
return if already_notified?(conversation.assignee)
|
||||
return if conversation.assignee == sender
|
||||
|
||||
NotificationBuilder.new(
|
||||
@@ -41,12 +26,26 @@ class Messages::NewMessageNotificationService
|
||||
).perform
|
||||
end
|
||||
|
||||
def assignee_already_notified_via_participation?
|
||||
return unless conversation.conversation_participants.map(&:user).include?(conversation.assignee)
|
||||
def notify_participating_users
|
||||
participating_users = conversation.conversation_participants.map(&:user)
|
||||
participating_users -= [sender] if sender.is_a?(User)
|
||||
|
||||
# check whether participation notifcation is disabled for assignee
|
||||
notification_setting = conversation.assignee.notification_settings.find_by(account_id: account.id)
|
||||
notification_setting.public_send(:email_participating_conversation_new_message?) || notification_setting
|
||||
.public_send(:push_participating_conversation_new_message?)
|
||||
participating_users.uniq.each do |participant|
|
||||
next if already_notified?(participant)
|
||||
|
||||
NotificationBuilder.new(
|
||||
notification_type: 'participating_conversation_new_message',
|
||||
user: participant,
|
||||
account: account,
|
||||
primary_actor: message.conversation,
|
||||
secondary_actor: message
|
||||
).perform
|
||||
end
|
||||
end
|
||||
|
||||
# The user could already have been notified via a mention or via assignment
|
||||
# So we don't need to notify them again
|
||||
def already_notified?(user)
|
||||
conversation.notifications.exists?(user: user, secondary_actor: message)
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user