mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-02 03:57:52 +00:00
c75ed1ef69
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.
52 lines
1.4 KiB
Ruby
52 lines
1.4 KiB
Ruby
class Messages::NewMessageNotificationService
|
|
pattr_initialize [:message!]
|
|
|
|
def perform
|
|
return unless message.notifiable?
|
|
|
|
notify_conversation_assignee
|
|
notify_participating_users
|
|
end
|
|
|
|
private
|
|
|
|
delegate :conversation, :sender, :account, to: :message
|
|
|
|
def notify_conversation_assignee
|
|
return if conversation.assignee.blank?
|
|
return if already_notified?(conversation.assignee)
|
|
return if conversation.assignee == sender
|
|
|
|
NotificationBuilder.new(
|
|
notification_type: 'assigned_conversation_new_message',
|
|
user: conversation.assignee,
|
|
account: account,
|
|
primary_actor: message.conversation,
|
|
secondary_actor: message
|
|
).perform
|
|
end
|
|
|
|
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|
|
|
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
|