From 13bb1ddc7f5f5e3a7fc57396427c750f40d80603 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 28 Jul 2017 18:13:42 +0200
Subject: [PATCH] Use consistent icons for web push notifications, same as web
 UI (#4426)

---
 app/models/web/push_subscription.rb |   6 +++---
 public/web-push-icon_expand.png     | Bin 0 -> 1380 bytes
 public/web-push-icon_favourite.png  | Bin 0 -> 1046 bytes
 public/web-push-icon_reblog.png     | Bin 0 -> 851 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 public/web-push-icon_expand.png
 create mode 100644 public/web-push-icon_favourite.png
 create mode 100644 public/web-push-icon_reblog.png

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 0000000000000000000000000000000000000000..972c2888641579bba190afd0d63a7bf877ebfb7f
GIT binary patch
literal 1380
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz_>QRC&U%V)zC2?MMEM4Dto3h
z10$@jB*-tAfsu)sg_Vt+gOiJwk6%zoSX4}0LQ+avPF_J-MO95*SKrXc*u>P#+``hz
z+Sbm|$=Suz%iG7-&p#kAC^{xKE<Q0SIVCMUBReNIzqGufuBo}Ttz+V(Dbr`nnmu>k
zf<=p$tysNw{f13jw(s1vXWxN?M~|O4b?*Gd%U5sSx^wTrqbJW^ynOxk{m0K=zyJLG
z_iE)+cLoNg8=fwXArg{r5B_x)E|p>b@csLaY~|_E9;z=KF3E*Ortv%X^l+Uy)qcjo
zdx?U3;}qA8oJ))=cWk`-JOAD1yKnbN-@d!>Z^WLs8{6O4AKaA7{lDv#W$DZ3Mz2rV
z$JVTNf5>UEGum|9%Dbm5D{TG-_ZZyl-^;6OeC)k*$Myfx-wU?$Uwo5)<JG_8d;2y$
zzws<fT#0Ae%_Q~p3uM!Fvq!cB#&5p**Q93s=F8z+vU60g>B`+-sG+_vmCb$I%`L@$
z_+E?2Z1G$hSnQwFv*;SL!`|Ho&Ey~YPQUev@y(}0W?P+@vL-(YW{71iyTKsz`O3C=
z?%i9wb7dUtTeF#8nK^%9wD3Rcd${74V(WLdBkdyB8TK4DSS+Bv()Nv8bMT@SybizT
zC2<_M&tuG-dtkA~%@1dTuk<Z=C+Es$aU#I=N~&!a(<`?XdpYi#xeA>yx*}GizJk|z
ziEY>Bj1>VX4K~g@Gk!E2vgTM}uc0Owv3y6h$@ZfG*&H#;Bf=_XFG^7~I2~cHkZ^ag
zMXPF;v%xXR*TNEeManmL7IFDT9<yp%_FBa}P~qj$#1&l0JGk7ADMudg7IEc1#(L}r
zPh03B3&u0SF|8BV7+vyXI%e9%)Q~q_i9fkz;wOVP%{zG=GFxSOZuc0lKQ_%;zbJ3g
zEd?gOi3|U25tLYB#yWqiL!fP&!=@tw+MFzXS2e_RO>SskX%j5qdh=m%?*YjyZL^*y
z%vs`zbJiA3e<dj~eZ|z>7atvv+PYMP>EwBB6D@HejwN*qzlC${w(!1^_5NT0v+(BE
zQ&0VRbEKi^V_om9_5KTczv{jg<5zThuk?D~<_noq_DP>tayrlZ>zrap+RS~e(|2E3
z_<AbquW7~|3y$4*aCXi)4GFE{s$<EAXE<%SVlvz7^7P~G?#K20r{6I7%k${#y_BBW
z=M(c+cJj8}vYCJAabWxYh}79v^?!@Zb5WYT-zdB$WUZanx!9BPz6tmD{ohv4FyYxr
V&R?7@JAt{6!PC{xWt~$(69Dfc1Ev4~

literal 0
HcmV?d00001

diff --git a/public/web-push-icon_favourite.png b/public/web-push-icon_favourite.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef36b8898c336b2dbe8d18db130df27fc3b60d86
GIT binary patch
literal 1046
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz*rvO6XFWwp6X{AMRX2<_D>)D
zfk9tW666=mz{teR!pg?Z$<4#ZFCZu+EFvl<E+Hi&E3craq^zo@uA!x)tEX>ZXk=z?
zVQpjQ<m~C??c?Vk5EK#?9uXNG8yBCHoRXQHUszsQT~k-z(A?48KXKBOsk7$JTefQb
zhAmsS@7j0Z@bOdU&R@KG^VXe5&tANK|MBzJ?>~S4m2uQO1WXE-JY5_^BqYxs><#x$
zWMF@Ae{SxI6^5-7#AZ+GTo`26b;>-trN&=UaM77t@B7Q&?R<Xg?%waU_kZvEZgKqc
z1Nqs{oR3UYjCA19_o!>z$&*_tQSEnIea5SWk6CzZ7e7`$^Jb|wyRvu5)r2JeXtu-$
zhS7Eo@#1^g7UWKh)4p)^WSRTIm50jSFI?VS_xD23vUpLeGUFEli@d`nzLcq737R>1
z^3$nohfTA)!`nA!ws@93*Sov^nxt#;)*8$Co(Hc+@A_Od`PZwf?2rF4oa%WjyWyP0
zHr+XiGR6#f7w#zESa<PCtc6<UGqV`+j3h?g=PTZ;?diHwD*M)LMLJhq<tqvIfORKN
zoKrrtG1twct)N}HX9>r|eOAg6jW-(OL$n;8S%m62X}M43^zaQ_%Cu5FB(nL6)l?l1
zl@-@mJM&iYIzAG)y3QeKT9)^Oh-J6JJ#q}1SXw6aEMj+xWV<3^z_T#$*PfTI&x3!R
zamtvN8`ghd+k4g9I?gXdZLhUGu!>lEoULWskL%kne~?<SQI)gNB-Z|z&JU4&7pAs4
z$je3xbGB&IEl(C<O3(alyP5gnnoIt-o+$(<-P|*^DI#f?UlAjd?Ci7EyA`I-S#AE!
j`N*aPX^}tn|6%l9lUdRl`)&m=l`(j_`njxgN@xNA<KEEm

literal 0
HcmV?d00001

diff --git a/public/web-push-icon_reblog.png b/public/web-push-icon_reblog.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f555ed09fc89386be9f11d86a4d8b3bb034733d
GIT binary patch
literal 851
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz^D-56XFWwYEQU1ig1O%R`GyP
zU>L=h1o;IsFfuW-u(ES-a&hwt3W<n{Nl41bDXXY!YU%13n_5`fJ9-5Kg@lI1B_^e3
zW)~FKG_<z$^z~1iGJV$Ux$_n*TCr;FmaTjC9XNRS=<ze>uHL+J@4=I2FJ8WV|MBzJ
z@4x@D)W!Y+MoY7&i(^Q{;kVOnh8=R?X=~r4)g}Gzksj9~jXVvlMG@j5F<f0tpa11A
zOyOcWd*jSS>)-LdpVaSXs$1Hoo|&lZUcYWe;S0g#xp|9K*Vz9{eG*%6XFGGsgnt|s
znikb^ISj|I{W~~o!!$*%un@+&#V>swY*ukx$cwt?E}tTHmEon?=ZoAcbwwT492Q+%
zF!wU!M7?VFJ=bpRaFrCfAah{*qD`^h2@LZSYma!cHk9@5N!~i2&!gDKKTa#bwdlNf
zNP{Bd2L-_brI+=WI~e>w>0A%ExaFSWskf~!l0~9Sb?5$F@}Gy}P24Nqsb^Mkxm2mS
zu!^W0*4y3Duq)?ojf+FfrFw^bM}oKf4^w8oQ|?iJa=pQ^dEwsmxgMGPZaU(Y-R~R=
zZ!OaNxa4!}-`78s5~~Cc-+JRAXK2+B-&uQd+fuGsTnFZC|GjUj2Kx-5hV_nt`Nbk%
z6PIy3Fb)tkTWq<EX9cgrO(qu3lrw?S4E18Ao_+rxY$&+OHo=_Ryhr5M!LlbOF24W5
ZnKkuzPhn^JDqzerc)I$ztaD0e0st{&h$8?1

literal 0
HcmV?d00001