chore: Strip unnecessary data from push payload (#2924)

chatwoot · Sep 9, 2021 · 9c4ce9a · 9c4ce9a
1 parent 2821777
commit 9c4ce9a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/models/notification.rb b/app/models/notification.rb
@@ -60,6 +60,16 @@ def push_event_data
     }
   end
 
+  def fcm_push_data
+    {
+      id: id,
+      notification_type: notification_type,
+      primary_actor_id: primary_actor_id,
+      primary_actor_type: primary_actor_type,
+      primary_actor: primary_actor.push_event_data.slice(:conversation_id)
+    }
+  end
+
   # TODO: move to a data presenter
   def push_message_title
     case notification_type

diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
@@ -94,9 +94,10 @@ def fcm_options
     {
       notification: {
         title: notification.notification_type.titleize,
-        body: notification.push_message_title
+        body: notification.push_message_title,
+        sound: 'default'
       },
-      data: { notification: notification.push_event_data.to_json },
+      data: { notification: notification.fcm_push_data.to_json },
       collapse_key: "chatwoot_#{notification.primary_actor_type.downcase}_#{notification.primary_actor_id}"
     }
   end