From 3a2c56f0fa145cbe29012a333ef72b83ae6732d2 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 27 May 2019 14:01:02 -0700
Subject: [PATCH] fix: various push notification fixes (#1245)

---
 src/service-worker.js           |  18 +++++++++++-------
 static/icon-push-fa-retweet.png | Bin 0 -> 505 bytes
 static/icon-push-fa-star.png    | Bin 0 -> 905 bytes
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 static/icon-push-fa-retweet.png
 create mode 100644 static/icon-push-fa-star.png

diff --git a/src/service-worker.js b/src/service-worker.js
index b1fbed43..31c27c7d 100644
--- a/src/service-worker.js
+++ b/src/service-worker.js
@@ -162,13 +162,15 @@ async function showRichNotification (data, notification) {
     case 'mention':
       const isPublic = ['public', 'unlisted'].includes(notification.status.visibility)
       const actions = [
-        {
-          action: 'favourite',
-          title: 'Favorite'
-        },
         isPublic && {
           action: 'reblog',
+          icon: '/icon-push-fa-retweet.png', // generated manually from font-awesome-svg
           title: 'Boost'
+        },
+        {
+          action: 'favourite',
+          icon: '/icon-push-fa-star.png', // generated manually from font-awesome-svg
+          title: 'Favorite'
         }
       ].filter(Boolean)
 
@@ -191,10 +193,12 @@ async function showRichNotification (data, notification) {
 const cloneNotification = notification => {
   const clone = {}
 
-  // Object.assign() does not work with notifications
   for (let k in notification) {
-    // intentionally not doing a hasOwnProperty check
-    clone[k] = notification[k]
+    // deliberately not doing a hasOwnProperty check, but skipping
+    // functions and null props like onclick and onshow and showTrigger
+    if (typeof notification[k] !== 'function' && notification[k] !== null) {
+      clone[k] = notification[k]
+    }
   }
 
   return clone
diff --git a/static/icon-push-fa-retweet.png b/static/icon-push-fa-retweet.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf9e5773dab02b0d7be4fde3dc3ba7feb4f0e342
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005NNkl<ZcmeI2
z0Y?Nu6vw9%Bocs#K!7uIce`r|ONao-AqYTU;{piuB?2KpfN~Jk7YMrBlOTX1uHFF2
zoV~}sp2z>kpXHdj{oU<*yEE$m00000000000Gb#K28aEA|2ZZey9Lnaca(39^m@Iq
zlYj;<C?CHji^qjaKwsisO8{l=+9rgsMFZD~$zHQ8+jf8O-tW+7Z(0&uo0Mg_*6@oy
zb-Ug5#6M<_@@ZYb3SH}$OH6v@oa-bmg%i^P=mgFf6OR_uj&qX&XrLp?oKt*A*l}X0
z4*iR+Z3swId|uL>p(u)t|LhC`6~7^=&LD`GfON&@C*2wJ1+XeUKk3e(AwaI;^D{Cb
zfKGnMsrby!FjNr09&jdDm1h<NOa%o@EL;Ky@rz2Fd>mUrfZYip00JNY0%GA5>P*u(
zwt@g_ZCPJHEhwPY7odM@t}j6U;Y?qE{^Pm60R06TeF6GQbbJAVdGy|IN-WY^5fF1z
zRn@BCGCd!K9o`G6jT$`x{G7J1RcBhjR|sLhh0R*C0%G3tJm2MS*S8F(_z2{I{lbR8
vZRuE1z-_}TI}^%FJa$U}000000000#%bPLiGI2At00000NkvXXu0mjfk0#Y&

literal 0
HcmV?d00001

diff --git a/static/icon-push-fa-star.png b/static/icon-push-fa-star.png
new file mode 100644
index 0000000000000000000000000000000000000000..78dfdcee6efb52b862ab88387631971b2831923c
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009}Nkl<ZcmeI2
z1I%PG6ouEeZF@UfJ6=0jJNCrM+O}=mwr$(C_uOQEcktLg+~ka>?RQ?=Y40?dpm4+Q
z_viF@Jlnip@79_%YvypA0RUeH1OAfevD4tI1N;xc$EbSs>R!hf0N`~5ok(k)a`h_#
z_BY3XKj;NjonXLf0_KS^w#wG<KA*25|LVu;4@{_H=dr(nKqF|mE#Wb~EAXy9NA#J>
zwljb+wv+&))Dm04SF2X7G@yPdFyI$d&Q4>0kplRb)!{<Bbp28Q`bkg<^$RAHwZqk)
zPe3X)&+70cIagnaeqq;G#>xiF)c_we7tFEh?|xAL{2&O8`hgW>2}{9OsZu2)XY6ay
zd@55a$chy!rlBhXHDQePMkB}Lekbm4$E^4a&>QF!>REvMAk+?zJ%*Xnph1IFi6DnT
z8wrxXun{UU=aARyogUvDq}$R*%bNmUYKa2I;)`4G_-4!uZgCOAO=2Q8s0Fd|7A%A4
z3l7l$UZP^UQw$*1P(NF*9bmw7%xQ(gWouvB89rjh2_Gnr4?eLW{4+|(Mw_@Si!VH~
z5&RR%NU2F;JhTD)eW;|C_55uM!{61sk3b<spqmziza9t#3h9;4&xZmpSqT0rdT#-}
zcX)YF@C6INUxD%`Ga@QiuAJTL^`4X%{w$Qs=oEK0RB}v0_|tUg!mLzRR`i4;60Pk|
z(kT-WS)bh!7;vz5?b?||roNtwT-ysxm7xKtq3;3>_(7>T(WgEBiWHqW5NSY1(FQQa
zI*1$s17%2Wi8NrX1O}`TX}~QB47e!@J_Gby0t0>v`6=`vM1l)HWy%=qCW`@ROIHy?
zV3b4~p^+jC*d~zy+e8@fNMpA>jA^7k?rZ3<sd{KCJS9dnH1-12jx(t?(UNR2bvw)$
ztE(nY2f)s;|IG3uIm&K^&z@INejPKre?J8cdq8Ik=&XT)DpF7{QJ9kNYvv|sQWOn(
z2?YV3PRl8j{|7UkMlq*MG;;{-3)7g7&@klWv*?_72|{nf)VtTrA@GdTfX^^yxRH|)
zl}&X}U7Y$Kn`ywq_*offO3WV-W(3tmbtXE7cf-sf&;dG(N+*jv!$)<K5!4o_m9lTU
f;f5P-xZ%b>e|A#4g}Dix00000NkvXXu0mjf5LliV

literal 0
HcmV?d00001