mastofe

commit: 13bb1ddc7f5f5e3a7fc57396427c750f40d80603
parent: fdb65dcbee6d441c8073b3552e145057e3dc4c46
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 28 Jul 2017 18:13:42 +0200

Use consistent icons for web push notifications, same as web UI (#4426)


Diffstat:
M
app/models/web/push_subscription.rb
6
+++---
A
public/web-push-icon_expand.png
0

A
public/web-push-icon_favourite.png
0

A
public/web-push-icon_reblog.png
0

4 files changed, 3 insertions(+), 3 deletions(-)
diff --git 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
Binary files differ.
diff --git a/public/web-push-icon_favourite.png b/public/web-push-icon_favourite.png
Binary files differ.
diff --git a/public/web-push-icon_reblog.png b/public/web-push-icon_reblog.png
Binary files differ.