From 7b4e338c0eb53b9ce9ba981759abff53aa94d261 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 1 Jun 2022 12:00:05 +1000
Subject: [PATCH] FIX: fallback to default push notification icon if none
 exists (#16961)

Due to some changes we started notifying via push notifications on other
families of notifications. There are a total of about 30 or so possible
notification you could get, some can be pushed.

This fallback means that if for any reason we are unable to find an icon
for a push notification we just fallback to the Discourse logo.

Also go with a simple reply icon for watching first post.

Note, that in production `image_url` can return an exception if an image is
missing. This is not the case in test / development.
---
 .../push-notifications/watching_first_post.png   | Bin 0 -> 2081 bytes
 app/services/push_notification_pusher.rb         |  11 ++++++++++-
 spec/services/push_notification_pusher_spec.rb   |  14 ++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/images/push-notifications/watching_first_post.png

diff --git a/app/assets/images/push-notifications/watching_first_post.png b/app/assets/images/push-notifications/watching_first_post.png
new file mode 100644
index 0000000000000000000000000000000000000000..752e25c78d8dc90cd1646290d519258d153d0730
GIT binary patch
literal 2081
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

literal 0
HcmV?d00001

diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb
index 85ff518a39..3874995eae 100644
--- a/app/services/push_notification_pusher.rb
+++ b/app/services/push_notification_pusher.rb
@@ -5,7 +5,14 @@ class PushNotificationPusher
   CONNECTION_TIMEOUT_SECONDS = 5
 
   def self.push(user, payload)
+    message = nil
     I18n.with_locale(user.effective_locale) do
+      notification_icon_name = Notification.types[payload[:notification_type]]
+      if !File.exist?(File.expand_path("../../app/assets/images/push-notifications/#{notification_icon_name}.png", __dir__))
+        notification_icon_name = "discourse"
+      end
+      notification_icon = ActionController::Base.helpers.image_url("push-notifications/#{notification_icon_name}.png")
+
       message = {
         title: payload[:translated_title] || I18n.t(
           "discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
@@ -15,7 +22,7 @@ class PushNotificationPusher
         ),
         body: payload[:excerpt],
         badge: get_badge,
-        icon: ActionController::Base.helpers.image_url("push-notifications/#{Notification.types[payload[:notification_type]]}.png"),
+        icon: notification_icon,
         tag: payload[:tag] || "#{Discourse.current_hostname}-#{payload[:topic_id]}",
         base_url: Discourse.base_url,
         url: payload[:post_url],
@@ -26,6 +33,8 @@ class PushNotificationPusher
         send_notification(user, subscription, message)
       end
     end
+
+    message
   end
 
   def self.subscriptions(user)
diff --git a/spec/services/push_notification_pusher_spec.rb b/spec/services/push_notification_pusher_spec.rb
index ee542f41a0..e1b45b347b 100644
--- a/spec/services/push_notification_pusher_spec.rb
+++ b/spec/services/push_notification_pusher_spec.rb
@@ -30,17 +30,27 @@ RSpec.describe PushNotificationPusher do
       PushSubscription.create!(user_id: user.id, data: data)
     end
 
-    def execute_push
+    def execute_push(notification_type: 1)
       PushNotificationPusher.push(user, {
         topic_title: 'Topic',
         username: 'system',
         excerpt: 'description',
         topic_id: 1,
         post_url: "https://example.com/t/1/2",
-        notification_type: 1
+        notification_type: notification_type
       })
     end
 
+    it "correctly guesses an image if missing" do
+      message = execute_push(notification_type: -1)
+      expect(message[:icon]).to eq("/assets/push-notifications/discourse.png")
+    end
+
+    it "correctly finds image if exists" do
+      message = execute_push(notification_type: 1)
+      expect(message[:icon]).to eq("/assets/push-notifications/mentioned.png")
+    end
+
     it "sends notification in user's locale" do
       SiteSetting.allow_user_locale = true
       user.update!(locale: 'pt_BR')