about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-07-28 18:13:42 +0200
committerGitHub <noreply@github.com>2017-07-28 18:13:42 +0200
commit13bb1ddc7f5f5e3a7fc57396427c750f40d80603 (patch)
tree8c103288ee315ba210f5fa5cb3b994c2c7c4aee7
parentfdb65dcbee6d441c8073b3552e145057e3dc4c46 (diff)
Use consistent icons for web push notifications, same as web UI (#4426)
-rw-r--r--app/models/web/push_subscription.rb6
-rw-r--r--public/web-push-icon_expand.pngbin0 -> 1380 bytes
-rw-r--r--public/web-push-icon_favourite.pngbin0 -> 1046 bytes
-rw-r--r--public/web-push-icon_reblog.pngbin0 -> 851 bytes
4 files changed, 3 insertions, 3 deletions
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index 7356ed882..b343cf044 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -118,7 +118,7 @@ class Web::PushSubscription < ApplicationRecord
       when :mention then [
         {
           title: translate('push_notifications.mention.action_favourite'),
-          icon: full_asset_url('emoji/2b50.png', skip_pipeline: true),
+          icon: full_asset_url('web-push-icon_favourite.png', skip_pipeline: true),
           todo: 'request',
           method: 'POST',
           action: "/api/v1/statuses/#{notification.target_status.id}/favourite",
@@ -131,11 +131,11 @@ class Web::PushSubscription < ApplicationRecord
     can_boost = notification.type.equal?(:mention) && !notification.target_status.nil? && !notification.target_status.hidden?
 
     if should_hide
-      actions.insert(0, title: translate('push_notifications.mention.action_expand'), icon: full_asset_url('emoji/1f441.png'), todo: 'expand', action: 'expand')
+      actions.insert(0, title: translate('push_notifications.mention.action_expand'), icon: full_asset_url('web-push-icon_expand.png', skip_pipeline: true), todo: 'expand', action: 'expand')
     end
 
     if can_boost
-      actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('emoji/1f504.png'), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" }
+      actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('web-push-icon_boost.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" }
     end
 
     actions
diff --git a/public/web-push-icon_expand.png b/public/web-push-icon_expand.png
new file mode 100644
index 000000000..972c28886
--- /dev/null
+++ b/public/web-push-icon_expand.png
Binary files differdiff --git a/public/web-push-icon_favourite.png b/public/web-push-icon_favourite.png
new file mode 100644
index 000000000..ef36b8898
--- /dev/null
+++ b/public/web-push-icon_favourite.png
Binary files differdiff --git a/public/web-push-icon_reblog.png b/public/web-push-icon_reblog.png
new file mode 100644
index 000000000..0f555ed09
--- /dev/null
+++ b/public/web-push-icon_reblog.png
Binary files differ