From 3655790e5f37750e099d3a65ce3acd81703fafe4 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 24 Jun 2025 14:15:36 -0700
Subject: [PATCH] Add fcm push notifications

---
 android/app/capacitor.build.gradle       |   1 +
 android/app/src/main/AndroidManifest.xml |   1 +
 android/capacitor.settings.gradle        |   3 ++
 ios/App/App/AppDelegate.swift            |   9 ++++
 ios/App/App/Info.plist                   |   4 ++
 ios/App/Podfile                          |   1 +
 package.json                             |   1 +
 pnpm-lock.yaml                           | Bin 335780 -> 315937 bytes
 src/app/commands.ts                      |  17 ++++---
 src/app/components/AlertAdd.svelte       |  49 +++++++++++++++----
 src/app/components/AlertItem.svelte      |  17 +++----
 src/app/components/MenuSpace.svelte      |   4 +-
 src/app/push.ts                          |  59 ++++++++++++++++++++---
 src/app/requests.ts                      |   4 +-
 src/app/routes.ts                        |   6 +--
 src/app/state.ts                         |  23 ++++++++-
 src/routes/+layout.svelte                |   8 ++-
 src/routes/[bech32]/+page.svelte         |   2 +-
 src/service-worker.js                    |  47 +++++++++---------
 19 files changed, 189 insertions(+), 67 deletions(-)

diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
index 60f2508d..b02acc84 100644
--- a/android/app/capacitor.build.gradle
+++ b/android/app/capacitor.build.gradle
@@ -12,6 +12,7 @@ dependencies {
     implementation project(':capacitor-community-safe-area')
     implementation project(':capacitor-app')
     implementation project(':capacitor-keyboard')
+    implementation project(':capacitor-push-notifications')
     implementation project(':nostr-signer-capacitor-plugin')
 
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index ec92f268..65a9dbe7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -34,4 +34,5 @@
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 </manifest>
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
index 89572353..a9c2e179 100644
--- a/android/capacitor.settings.gradle
+++ b/android/capacitor.settings.gradle
@@ -11,5 +11,8 @@ project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacito
 include ':capacitor-keyboard'
 project(':capacitor-keyboard').projectDir = new File('../node_modules/.pnpm/@capacitor+keyboard@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/keyboard/android')
 
+include ':capacitor-push-notifications'
+project(':capacitor-push-notifications').projectDir = new File('../node_modules/.pnpm/@capacitor+push-notifications@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/push-notifications/android')
+
 include ':nostr-signer-capacitor-plugin'
 project(':nostr-signer-capacitor-plugin').projectDir = new File('../node_modules/.pnpm/nostr-signer-capacitor-plugin@0.0.4_@capacitor+core@7.2.0/node_modules/nostr-signer-capacitor-plugin/android')
diff --git a/ios/App/App/AppDelegate.swift b/ios/App/App/AppDelegate.swift
index c3cd83b5..eac186ae 100644
--- a/ios/App/App/AppDelegate.swift
+++ b/ios/App/App/AppDelegate.swift
@@ -46,4 +46,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
     }
 
+    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+      // Enable push notifications https://capacitorjs.com/docs/apis/push-notifications
+      NotificationCenter.default.post(name: .capacitorDidRegisterForRemoteNotifications, object: deviceToken)
+    }
+
+    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+      // Enable push notifications https://capacitorjs.com/docs/apis/push-notifications
+      NotificationCenter.default.post(name: .capacitorDidFailToRegisterForRemoteNotifications, object: error)
+    }
 }
diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
index e3674ac7..79214e9f 100644
--- a/ios/App/App/Info.plist
+++ b/ios/App/App/Info.plist
@@ -49,5 +49,9 @@
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 </dict>
 </plist>
diff --git a/ios/App/Podfile b/ios/App/Podfile
index 397e79d9..737c8d89 100644
--- a/ios/App/Podfile
+++ b/ios/App/Podfile
@@ -14,6 +14,7 @@ def capacitor_pods
   pod 'CapacitorCommunitySafeArea', :path => '../../node_modules/.pnpm/@capacitor-community+safe-area@7.0.0-alpha.1_@capacitor+core@7.2.0/node_modules/@capacitor-community/safe-area'
   pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/app'
   pod 'CapacitorKeyboard', :path => '../../node_modules/.pnpm/@capacitor+keyboard@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/keyboard'
+  pod 'CapacitorPushNotifications', :path => '../../node_modules/.pnpm/@capacitor+push-notifications@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/push-notifications'
   pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/.pnpm/nostr-signer-capacitor-plugin@0.0.4_@capacitor+core@7.2.0/node_modules/nostr-signer-capacitor-plugin'
 end
 
diff --git a/package.json b/package.json
index 112dbac9..46fdae66 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "@capacitor/core": "^7.0.1",
     "@capacitor/ios": "^7.0.0",
     "@capacitor/keyboard": "^7.0.0",
+    "@capacitor/push-notifications": "^7.0.1",
     "@poppanator/sveltekit-svg": "^4.2.1",
     "@sentry/browser": "^8.35.0",
     "@sveltejs/adapter-static": "^3.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8f03d2da473725fbed3292d086280d009f934eb5..17515a1151e13001c9a0736a347e73438286accd 100644
GIT binary patch
delta 2113
zcmb7EeN0<b9L>A;^3_tx#{*iBwF(mx24x^0BgQS63Ec*1CXnK`Y<rZ)D0FSt*CNH}
z)c6t5Ig{)7CE`Acu*pakmb%<PG|azdvW>(TmzX6+&D1%ZWYJC30p7N3hU_(g{@LF-
z=e~Q+`Q4FeF*K6({@%l$9@*z}w#!PL#%wO$@}lfgIuA;2i{$kd*O|-8ED!(jN{(*n
zfUHDDE3pob+b_HQ@$k#zl^nU<>G$}G563wpHeN~TkmYtI-XYQ9O1#V277xuwF)UPT
zNt!|Rnr_(-p)`_J5KqJ>yQCmUdLo+QLOcP#?9;%EmgGF9dWzya;Eo`6F5&Eabp-cG
z)_^yIh(=XF!0&XO-}5D+(@2xy4Je(ZZjayD;dDrTr^iiqW*TU@K<Kk5n~n*E;UavK
z)T;``f;C5fycP;)*O^^TcXwSpIDI|YVpARdANs2GmMQf6<g!Lp&4;B}wPcI|p#^ND
z&6(m3RoMsCS+#1E03kierC%da-OE_RRxQclurY%R4r${E@;dU$u39kK-bI{6?`!ka
zuN|%LS|nqA4=v(6x-V5!kH{A*{2D$q#-PKgaYA2SkTodA7|^i9L*J*16S@-Js<o&_
z2r#E720En^x2ZNMvWaVPG=dK==w5Ayi-Xu0u2II5@+JPxMxI8?Bb%(yg1!wc?k20!
z*yL-rwpMv<-K`sUbSiR9l_k*A)N9$^>}aho*(5brOV!m|d-^1owYqVuQr;=mZtp4S
z4U~6p>b2K8BwNX$rk2L8j;<<Ou(qP5_aNQxe-5twMe@T7efA2tKZ#SqdFOTubap}m
zrYW2iwoM!>2nT2SMLK=^D7`+Xfy+0r7`D%iCc?E}aW)-)&lJ9NPbYx)7EYoyN)i2V
z-bcs&9t?l;PbHyemp+1blLQ@HSs=O#e+q?Ku#03JZMb7%^;yElwV*F0x$x~Pf{9Hu
z2*bPJmovgSP})c~vyTZiyIFk#I*wQ%8Cms-F8)?@IN{VWVFP=|fSyNy28a;~_9GKJ
zosUMeFmZ(FVBE;n#HUd1I=U@A7cOc@B8UTMJsY&5aRZE=A?fgB2o<rUHuPgJ``|iq
zYuMD!Xbv&|Ep!31pMFQfRqW1s{E3(Gh^{8XUcf1tk46Ju0k*RvC-HB_sC#gE5|^^<
zDcr21!I=!0e+K73`Xo+-%_oSKeRc^4Gq{uKFmwWo;Qf@O!j<zRg}Hvf{E}bX!1E+x
zYcS$wA$Ktq(q{1<_SP(}6u6fnHox>Typ|*wqJA>RZ47$G4J8J~eZ2d$Hc~BROGR0E
zStaXgBWE9HyWSuT0{i?;@&bmoe$vmlWdoRTqlUB(>?vTQ$I06%j60LFnH{=Ga<uI9
YAH*iW;$3o;eRq#cJ;BC|3I8Vi2Tu$6`~Uy|

delta 12889
zcmdUWYp@&VdET6}5NVO3C`z<MiXwF=S~{elbFjPE#bTLC;^Kb4Eq1Yh8+8`I-mo|9
z4Zy;d7<D?CiJgw6!9?5f$W}BX*LIuO&al#n6<d~^NgcOMDmi}|H;Ejl?KqC>k$$B!
zjXPZc=iuBxnwhwh>G^feez*7gzW4IH&-<NMU%T(MZ=HVOnHz)Ef4_R;-`??~z=dbP
z&G066Y;F5zz?qh$YggB1pD$0|J$2su6*6%C!j;Rm+vlu~DfR7Z=w@^?eC6`cx)$Ap
zqMPuQ$@h<i&fjt>5Bd&pcJj}TuRnRqZkMmw{sL@2#EooDn~Jg_sjR?VgEt{$6TIwg
zz5zUT@yeAY{S--)_jOyj;t_8E_l2%po;FFm+q14A{%)Zwm;0t}ajImRy1AjUrrgzs
z+BIks3j2HU-u+#maOUz{j@?$!-!rr=fEW4>aBlMb<B$EKjxT>#@YcsS`Q}~0tG7P6
zTi#FT#Kx@`nBUJ=PORTfw<~wA|DtyOxw~&mu!l}QdK-e>c=4p$eXwn^l4hG67qVDQ
zvZXP%;h4%bY!jMPU%bpnPyy5QL}_HF+ya_VTP)vjp<#^{)0|jU$1QdYWuy|yVUnxl
zie#&XadMf)N><ijQ6r{wm4a#I2S}zZq$pacn&W73_~er}0Q)~4z44V#ny`152i&=W
zPl(T7sgE=v*@YRZBj6(m26OUIDa7sOkk?Z~B$t+*R=*x>C{`tb2(eISBoFF|C{J2C
zq4mXdOH6fJ%{*7lR^m=dX;f6mNrICqboQQSe0zYQ&G6bMKe_hQlThTweP1<JChvar
z#7cDX>g$)OUfjZ!ZWk*J$9;iGWcf%X94wg`5f533NW9t|W!zph8x%tkGf~o`QMVr(
zjm8K{C7f1fjGJM*G{#CHI;)YiPIql4nMEe=c<1guu<j?m_Iu}#vKHst4?KD2mCK9}
z(o{4hP;4kvjQ1dc2Jvw{S7(cne2mB#g%S>8O}c9E*f@^h!9=Hw#2`yYS`3IKc?hfz
z&4}h0&142oCj}wJ5J*ZDo_x}K?=|4zN$bUjZ}5NIJbiZ8Lv-{mx6xMg&fNZ|+oub)
zX0yeKQ3_@RzHa3ZQFmgvg?H$hja6zq%_2oM&Xt>aULVrsd{vBKE{*EC8YRXu&X~oD
zTp1<QqS~zx$;ybMo2kKYa`DYIPk#fr^F&8Cx%I1S&%m45COGkac=^8l^2|KZOcL4E
zL0HwshA?DUx7cxOM2OE+g?3OYs?};gYeSOR8usj@o@!Ylft9poDAGpBoLcLQsz``I
zOt=YWSlDW)<xWyAs5U|@B!Tuxa?JPS>xX@4SMN9~r`fww8N;N|uViy!LSVW{yH+=&
zQL&t8GqtV_Av7^8^kA$~Ck<{CLustWLOB<cstM7k4P$Yg(pB0W#;itjB$G};vdCIG
zi0__H__m}n^?t`OE#2IeE0q<|PPgLdmHeOurVTPLj*G3dG*Us7?Sw^AFvMah9&4!#
zgP^z(qq2B>kWfO-nADoMtj7{ufu_TmX3-WK)oOuc6nyuz4&U3E-Fp+*gW^!E6(o&#
z7*EwKap<cd#L$Y_C7A&yITnwOq&T8E9A8iwiyD=&<|u-VqCFA}(be{-Q7>d#ks8!Y
zHllsAU~8kaN*Ch3G=oc%-~8dx!@}%QYLPX&8*P(g_b4?H?L@U`Gzv*EBTP6}$&lJ&
zB%|nV+YF|JW>-K80@5pu+U+D;02`uPNC_O&ZYXKG-_9^8qdP#GO1DT6PNb&y!zr<}
zN2$TvxinF-Y~6HsZ!BbJ<xDjdPgZ!j9qzEMY;=Q`F;2!|VH5_F)mTU^VnI~Srm=X{
z#TbT7_fkZX^}9f$92N~%;Ut!(Wh6Ih6ocWC*dz<PnsoS(PVe5>E;g9?ynZuIjaxCn
z8f6D`x;}OqV7OBmM=Dv9(Ba6aua67^X@EHB6lpyVl0p-0pe~p-;@u%qbqjJ14(TN_
zRqDXW3f`k7DBjt*t&Q6`odpP)nLckB4UDTL;E|q)j9iRMnWYNR%{r|xCv^y<myaVT
z-Qn#JBfDTCr)N1)p<{)SRcZ6;Ak4#9GG^KpSwMrTRbb?TJI>vvGWS`N6->4-E^dly
zTUE}Y`@$eW!d!4@!h9dat7Xh=)cSDB=;Q`5mLD=?IA-D$S{#MBRMT`v$S{s|C{0vE
zYRI5{mDLGsoFxSs@3s=cWbMt1Gna_m&iV8ew!?|K(&hHp{AkSgG6Tnv+Z_>+&~gZM
zToTU1RiTt*i+L%+MbgPpy)Mv0E!E5OIaR0|92XATHkykYWY&%iY_g?LVUh_A`VyPf
z`QWWIXpgV9eP!A`Av2@7Xe6SgTNxt)jcbKr6^~WYDB1{>gIpp%q;g8IAese<ZuoI^
zKqz>%+LT7NKFa0GO(aU^5vY<Mj<|4JNHm3#6-tSV6FR=<guLh9@PpZZ{^9kH&hf70
z2m)u>KH%MzhG53YA((GwT>+K4QDKY<T$bmxm@T&qRzr&o4#v&29u}B7pU(uda@20L
zTU|{l(jw<}EGn)jrmH4uoP>;rc*39!c}JZO+0`Q+|8?NP4dt)CaO5s-;0FuqT6oh>
z1183I)*EKIgAfE&7n5ULWcwAH>|#S6wWVr)P`4el9mXJP#B}S9G0uu0VRmX(zg7Vy
zkd~ZafwAmt6&m9a8`7-GsE+Fj2u(wJ^)29$iTvEdH<CX-u>$z(O)mb=%Zw{Tl0gRy
z1zWuV8*DqBa5CEt!Z?!@kfCB5Scg=*2<01TG6ZQ9t&ZGrpNR+*lK|;xFKebj6Kiti
zG@WfXYx0QG^|<XrH1At)`G?;8o0n!Q5l>xaAf_^`fx)7{6dHV8!-crjLQx`9&NrY&
zDOkY=CRkysBFb`R4KEa`4At)ONg^fo)THX_%~XSMof2F$WDNm}EyR&~vFS=bcnf%J
z^1uJ)QvfvI6CEi;XjjeG$4$~q@<@prAPfr?;+edu)RksDR;(-4e9Gx|btpclc9JNZ
z1=S&6&atk;QE{x8bC@!hsduteBpO!6U9dwDH~K%x1nw10-L@5Oqsz5*N9%Cc(8<%E
zf1K(k#$?G+3|%Ml1G3bSEse%tO^)_4p=Ok#goQz5AC7AJ0Llt#CEsY5li4BB7{rQ6
zv|p*)ER!P!>2Mj*JD4A5s)%e%zWBj!e<ZY>`b`0Kvo6x9NFq*)L{z5IZjfciDZeLE
z#gb6n#fY%mPn9_^+sV<<a;S(xP#VXH28>8%-fW<ehK(R@8V^dnXo@xTm=B6$jISKe
zdawQgaK>wWEpXz7_Ti=D_YOJ55>-|UvHkwFS%Nyb_^a#J*({U`mCy{-Q`JGcRN~W8
zucMd|nJxE|@lK_fN{4I<=HMQPgb)pj>cw_0Ue2;LrxY#WcHgBfC=3!fS;5oYqEzKG
zA;MpNj-?ihc67~8N$vT<>sMzfv&mWd<j*dhyFQFZ%u+P3(>Y8cQfj&tDcBV*43oWl
zS&Q{**`Y%g!f7c*hLHp`lwxY3!I6yAlPw-3TihVs3w8ur4VA({-V{rY>>%ms85|IT
z>q>s~T`ohWWswD26vs@RO36Y{9Xi|q7l+wYg$|a-twh>o2l-^QiIjCdBGQEh*{&B=
z8qdpm#31{wm<#sNUW0`C&90nPq+X06mK+4nab4?>2+HKoFFkm@h7=PTUoI3fgPNKl
z(Ris7x5~9j!Ir^<-L0gVY8vefO*vylK`56<<|tmG!@YP0O<`oL19oBw8l}^$PQ@sW
z9>-*d>@Sf)k=lnPaO}zZm(EbF5jdhtLxU=ja8M_DLZ8Z~;Ciz&jBD+<>_o#ccnC|X
zs*K$zQfNo}={A=@8$zxxDP)_h^or(Kz?~{q?YYfbFFNXA3Gc<<S~>51=DVxMPp@BF
z=!C{?>%-)|OY7GYy}VdQ)PAC(mr6sM(6WN1g-|yy^5cwcSzIbKGNL(q&>iH^JXKKZ
zvSt@$yx<5>QD&(oi&e`p)k#=N6l*ACu9@b1Uvf|fOip3lCA**e#ig^?*%a90II5xH
zVX2lvGfu};QbUL|cnQiQMo{Og(I69RQiZxKm75K>ooELuP#EXSMyNE-CP}@X9g#(1
z+^d`9xRjy{pMO~*gzngW44+xyL1Q378bV6N`nX@SqnVyq7}`<`m!-I?*&#mR<jI~^
zvG~#uZ%6D9>lTu}fy7gh5y;@SGA4>tA0Ziw=fJK(;BvYRWjo6((vk%2CNj`vQmdc?
zwIz#&BSI|OZ(t^bTAZV`^<IZ>CU7t_V8Yo(L&_SFveLEuc+>4wDKR-fh62t@xEKkJ
z;|dk5w&Yku;fr;Cjww1mANI)AwdX)TIwA+`bBc|*`KkCS@z`}fiC2hXbubW!aSONf
znu=DFwSJK(CXfV@=9Mx7(L`2{2&5Wml%q*%<RWUiM<qgXL{?K}JB-_-mR0Wd1~eGw
zi>3n?mRyHpOUj|kP@GBWXAd%Zp6I|d6oo5sMZ<lX2uFq~ti)y1F-$dwlGBZa67dw3
z)`fh+9!o7P!ew=(fDveHpodwSvVyTTTcZdlDi^{iW#GN32sb|ccmE@L#816VuIv3w
zTnRFmk!u)PyFf%kbcI&(IVHtV!BR}oLx#&+VVuo%oMJr$bEfYbTgD)TmdTOOEuy0`
zpUYuo1jYpc&J+>MjSldNpHZ46-vYLJ=*s)86H`uSW5_D9f9YZGcl4Djequ`Hc}5_M
zMR{yTS`MQcY`^T7g><FD3%!VfJGB<3)Y7^#kU<xA^-d>@7P_5LK8{wZK30MgMMKhw
zDqPYV9kZTS)rjC-dtqhk=r#uO3~l8KrB;VQn3t<<qA;#vG+1o<SwmN2N@cEYR}d3a
zO86Kf2zD4}1cPI-c0%&`9-?VxV`i!w%8bAwT<(k`Bm_ZmHYHP?Ht0S7FIO)B(aq7;
z2QRFUA3rHsx~iLfQR-~?0T%UE{@mZ9>SViEYpmh!Fk!ijP|vb_-E?7#4r{I-I;aE}
zX>wh<3r#UJ*GCB}s~Gtp!|{!Nv+m~7D2IaK6g<j0by(?85i?HCH2LVzy1KUh`1;n<
zKUsNo^;p{{aUzHh`Y`Wzet%`XiJ5Ut;Y4r@$7M#$M6g^m4>j#E*oK=ycT}$wf}wml
zr?W69@)}(Yg+uj7Bb4WrW)^AJGBs8xaSTVnZMl@rh6j*NhLov4+xpX=u9Q#SD~R?+
zTUTrd@`1~g!!f-N{`G2*30IRkFG#U+1xbn)9?J%6a;wX<N;c_Qpl0PFyqo4oiAcv|
zR&kg~QwcJZt18WqRo5C84iRuk1WBA>cp^%=xDcuKovN=z7yr-7r&m9+!v%XQ`bw~w
zsF6wxPvq$ah;$H=>ZS+zJesOS+8lx^bqX(Hk({OpMup?j38OM>cEE9$N}9G+qKo#Z
z!U$A@_PIc&t;G?m<i<vFb7~#l(}}<ZPyNQq!>|9h)z^+6->_Lr-cbDP+46qnUEf&h
zqZHwzs+=aa;WFg}wXi$JYeff%57Rtb$D+};8OeyrgfeLGT`t!tP}WF>GQtpcbCM30
z8EZ7a`fj$O4wCUE)-JXc#}Ad>Tj{`g@8jQId3fvJ-L?9_g(Gv!;JtTh<%xRT2O*$}
zH7tfp5|TX{S4Bs|M3<<Ij2cnurL!bF#^bTJCdJc(dZ;muGz$WyQLd%Mgs`oWLa`;F
zsfNfVDns6nWNp&B`1<PkBR)GG@flVKxj3aZuJ5Kgk<G|<d0`1LHA~><JlZY$P4nuT
zcI&GLo0Ka%x9n4N$fi$|Zi}GlmThj>x~}-D|J<~w;Jv>E+<*6W4Z!a`tpa#ol>-mm
z;r|N5-l=}zqu#T>3mjc}#(P@~objIO1&%!Cw}tV=tOsfZ{w(uq!PYyEum0_s<D4m3
z9lbAge6Lmgwr|pdyi|?WYPPKSKF$mUb&eNdG#=(fx81kpOg`QsD@uova?S|0b14)}
zYsp?XMr#Ox3VGhZON|D@m?Jq88`2eu&wzS=xb?O8>IL@>pPt=>z4zFa$0&|V3h54<
zuq8@TP@>eeyU{^qXyb&y7Q325rL+of<0(`x4yaHn<Dl70O6mmrP`4JM$}x<gV3mR0
zOe0w8)cxc<5f@SKRcPfr5LtiL3%wjTv-MxUvC1Ahc_97pj8)%f#xN*^=x#3pNu>;!
z=i;ndaFVd8=AC*OZM*d{Ne`3pBAOzwx<p7sBS;zbd<#$394?L+1A(+{O6;lzq%!fa
zoHNo4HUnalmtQ{i5!+9D96^M=cfPn1+>*bu`u6JSSu%Z~Xfr<xDM8CMIMyQ!xt_37
z3@GA=OAnGTA&GHDNr6?YmSxCXrAF4!ELb6+deI?-NGg-+t43Wz?8+zywp}ou$0}4&
z(NcwUa!E4nBciRx{=@2<0Kg7dZ{_KgAO&}A#K<LSyO|xvbxG9A!3<9qN<l~JVp7}A
zYb~VTE2NO7;U>z%v{M0{db&`jv_VNG`Z#Qe;if9od|;yYMp_SbV-;fZmsc*F_94jn
z6Kh&u_5Ju$Px=Ki|L?6o{iD?{qrPvS73aJU*H_l5MA4KwlsZheDB27Li6p_njzkwR
zN-yI@f^HQP4v13KGD~H%pwbVH%i}_ULKs5~<py;_R$@>cagqg=t;F(fFA13lKUIVa
zlkflR_~gg@8Sj<90FDHwFl1(N;3l+fagNPzL^lSkB6V4to5_j#a>5?_#Ofo*+78ci
z=5(0HwpJfLv9GuHUSak8);|Y;FZD0pyr{DY`PTo5XSY6P1Ap?7E$La{Cug?{Fy6`p
zIPd-VCEz|k#)4kf17e=$0Vk$^Z9V4!?1?+K>lT}ltv`AV`2AB4?NW;eiV8cm$9Yi^
zyJP0xCO<v;sAs+bT)2P#xEY1BGs1iRLEysFCoaZ3^q7A(OPt|8mi`vQFW+SNemZ?;
zg5?sQ+m(1f?S1QEdk*LTLA^6>$#x%IF7I9@d1v%;VISBPc9-$p8M0)-N0u+RAZK@m
zE?w>3r{=ZrMbY@`+N^4PlhVq5o^@yDB|=?UF4RFrbZ3U8vh7v01#`JGV#%6Y|Kbhc
zhpT6nQj9ypmM(N=%O?Z>S709z=oQ}rJ{6d9g5H~N0oSG+ng_iEJna48o4}FH?c>^z
zY~LKGolt+j(;r{ar!NOWYS*vA`fWZTwuyRw`4;f}vDvS4>#ckXNUl71n8=#CifNC@
zzxm)1@5^rkcQ3dn@11V~k9z&D2TppQe+xL~{nj4<CuU^PMEmgQ)_-{$c;V!Ii$s0F
z80|i3ICqOD4c^+zz}jqI_%zDwi*CL&GY7WV-eQp%G2%DRlH%Qke(4qq`R@%5&*PID
zJG1z8{|7E@Pxx~R{AZ8M`^_r(XZMg4ew6f6^_>}K%@6Kro@dcJ&AVd%yeA)@yL;b?
z5A2z8>d$v3oUK>o9gExS`IyVE!f%4xTb8=*t82b5-h{V5SOZR(#)uh&+39uY0%qs$
zRXz;_r_WR7MBLii#@g=rY)`kbHna}p=le)J?}P6GA$WOY@x`Btx)a6r;YRO$(#L`C
zejB*M``g!nk9q(78^As2LJRg%bW5J89Cl#;_|I8>`dt9p7oi@#aPSq*G#vV8viBKI
zXjgUT0C>-%o!#hpV9?y#-1o#n>kkdxiGl|P-fFe(BJv#=w7uHK%~x9lzvUx0Z$5H2
z{v8<l#4XNcJLVl2@$<!8M41C4!CS1gC$bzEwY}aHM{IlOgV#L`E{6w+ZvYQnIxuFp
zaCNx<^!e2<Ef!f=$R7W8xbcwhI6b$$xmnG_$KoB>{{#ElKAU?FKN|D?gbaMl_lp0(
z$7A<j*}1djPUYxH-z56(%v(mLkMq3hQ^1w$OYq`6dEP$4jb(^(mNqXsED+7&%d)L3
zZ!G)vuPkk{Y#-MzZ5c@1aM3Wg^F?ar{n<Bwvmafk#GabMZUp+d5&HCE{2rD1M+}+&
z<nJ5l4=MXG+w{}Msg}duJ>Q>4xE=cB_9EP(GU5?I;QV#Ve_+FfrqrHqp8l+R$(R`|
zo0oe1#wljop-JW+r{Daq2SVtg=5fmxq1!b9@9~#``<Gu+=)~>g2YA0ga~HIaEuDih
zaQ98B_u=cn<DuKZ1bgZ!b40LAtG4y{79i(=T`;h#*K_POXXa;<|AWtB&ocKf1l?N+
z`Fq%pcjODeDFF9%?b$B?4^E-j;cXtUEaEo6=;28Y>A5#8qO4wB^PVRI4^93!aCGwI
zy?3pw9Y9vMb$xqEF29%)K6_#x4)s_IczlNOcGHRJe)e4IEK?wdmTyI~2hlsIagVm_
zImYed=~)|d#(ipL*y0WL&4R-G`;fJKuE%Fry!Y0C;7qE?i+^{)`@_?~>8;Pc3w-Z^
zJ7xtL@7iAh7rm3e;ip9UeLfE@o(Y_P>2rb8p7;uI^88*??=RTNsT@8y_hi(sbbjdv
zz-jL{{~9>rRsI?{w)Mpy0dFE+@O<E|m9TfuZwD^C^jzQp@1LFzoV|PJsfa(RpQm{r
zzOZs`>r>|gzkc!jJ_Ge1jr;7>9{YUfRN&mPX$4~bhTQXu5NEf7PY1A-J(Y+p>RNyY
zmX!*i&ji-ISHIvt5cqmL@acPZ_}=*o?-?QF6Y!q_PVM2{r?ku_wDo)Gz*ml+*oNuT
z6!iaVIN`m0D)7+k0oH<Fdi3FgaBhcY-wWRtFk}g`nBj)~Xnz|Qc~cD7nLFT{Xs{w3
zuIx;83tqUF1rXVxR_62FMD@KNZTV{ay)EF9r%8eQg?Z-#cw%Z4yASkzVSVa-ed|}r
zz~}G0bD`m${ykvL*W7a+{|a#Gj+q&FpZHwh+}7GJ2OfNSn>vTy2hMpPe>qU|e(hfc
zj(ck_`Kwoc!)F+@&jya{SW@<5(?`dC<#Ucmk!_>ySk}h0OgTL}-<mx372y8ebv}O2
zL2KLEd^zyQ@dx%13^PlCXDXceVxX~d|Lisw$jSFRyBqbUR<!^2A3weG9}ROZ#{Z`V
za1-}DIdJjZo|Zj!F}r9FQUV{nXQ#t-SJVH7@IL#c!1qr0kmTAFJ3up`_%8?Eeq@JV
N-g@Xi1@1WVe*qb)CVc<^

diff --git a/src/app/commands.ts b/src/app/commands.ts
index b1e5298b..0f388d52 100644
--- a/src/app/commands.ts
+++ b/src/app/commands.ts
@@ -1,6 +1,5 @@
 import * as nip19 from "nostr-tools/nip19"
 import {get} from "svelte/store"
-import {Capacitor} from "@capacitor/core"
 import {randomId, flatten, poll, uniq, equals, TIMEZONE, LOCALE} from "@welshman/lib"
 import type {Feed} from "@welshman/feeds"
 import type {TrustedEvent, EventContent} from "@welshman/util"
@@ -21,6 +20,7 @@ import {
   ALERT_ANDROID,
   isSignedEvent,
   makeEvent,
+  getAddress,
   displayProfile,
   normalizeRelayUrl,
   makeList,
@@ -62,8 +62,8 @@ import {
   NOTIFIER_PUBKEY,
   NOTIFIER_RELAY,
   userRoomsByUrl,
+  deviceAlertAddresses,
 } from "@app/state"
-import {getPushInfo} from "@app/push"
 
 // Utils
 
@@ -388,10 +388,10 @@ export type AlertParams = {
     auth: string
   }
   ios?: {
-    nothing: string
+    device_token: string
   }
   android?: {
-    nothing: string
+    device_token: string
   }
 }
 
@@ -433,5 +433,10 @@ export const makeAlert = async (params: AlertParams) => {
   })
 }
 
-export const publishAlert = async (params: AlertParams) =>
-  publishThunk({event: await makeAlert(params), relays: [NOTIFIER_RELAY]})
+export const publishAlert = async (params: AlertParams) => {
+  const event = await signer.get().sign(await makeAlert(params))
+
+  deviceAlertAddresses.update($addresses => [...$addresses, getAddress(event)])
+
+  return publishThunk({event, relays: [NOTIFIER_RELAY]})
+}
diff --git a/src/app/components/AlertAdd.svelte b/src/app/components/AlertAdd.svelte
index 58d56df8..697d0256 100644
--- a/src/app/components/AlertAdd.svelte
+++ b/src/app/components/AlertAdd.svelte
@@ -1,18 +1,28 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {preventDefault} from "@lib/html"
-  import {randomInt, displayList, TIMEZONE, identity} from "@welshman/lib"
-  import {displayRelayUrl, getTagValue, THREAD, MESSAGE, EVENT_TIME, COMMENT} from "@welshman/util"
+  import {ucFirst} from "@lib/util"
+  import {decrypt} from "@welshman/signer"
+  import {randomInt, parseJson, fromPairs, displayList, TIMEZONE, identity} from "@welshman/lib"
+  import {
+    displayRelayUrl,
+    getTagValue,
+    getAddress,
+    THREAD,
+    MESSAGE,
+    EVENT_TIME,
+    COMMENT,
+  } from "@welshman/util"
   import type {Filter} from "@welshman/util"
   import {makeIntersectionFeed, makeRelayFeed, feedFromFilters} from "@welshman/feeds"
-  import {pubkey} from "@welshman/app"
+  import {pubkey, signer, getThunkError} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import FieldInline from "@lib/components/FieldInline.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {alerts, getMembershipUrls, getMembershipRoomsByUrl, userMembership} from "@app/state"
+  import {alerts, getMembershipUrls, userMembership, NOTIFIER_PUBKEY} from "@app/state"
   import {loadAlertStatuses, requestRelayClaims} from "@app/requests"
   import {publishAlert} from "@app/commands"
   import type {AlertParams} from "@app/commands"
@@ -114,20 +124,41 @@
         try {
           // @ts-ignore
           params[platform] = await getPushInfo()
+          params.description = `${ucFirst(platform)} push notification ${description}.`
         } catch (e: any) {
           return pushToast({
             theme: "error",
             message: String(e),
           })
         }
-
-        params.description = `Push notification alert ${description}.`
       }
 
-      const thunk = await publishAlert(params)
+      // If we don't do this we'll get an event rejection
+      await Pool.get().get(NOTIFIER_RELAY).auth.attemptAuth()
 
-      await thunk.result
-      await loadAlertStatuses($pubkey!)
+      const thunk = await publishAlert(params)
+      const error = await getThunkError(thunk)
+
+      if (error) {
+        return pushToast({
+          theme: "error",
+          message: `Failed to send your alert to the notification server (${error}).`,
+        })
+      }
+
+      // Fetch our new status to make sure it's active
+      const address = getAddress(thunk.event)
+      const statusEvents = await loadAlertStatuses($pubkey!)
+      const statusEvent = statusEvents.find(event => getTagValue("d", event.tags) === address)
+      const statusTags = statusEvent
+        ? parseJson(await decrypt(signer.get(), NOTIFIER_PUBKEY, statusEvent.content))
+        : []
+      const {status = "error", message = "Your alert was not activated"}: Record<string, string> =
+        fromPairs(statusTags)
+
+      if (status === "error") {
+        return pushToast({theme: "error", message})
+      }
 
       pushToast({message: "Your alert has been successfully created!"})
       back()
diff --git a/src/app/components/AlertItem.svelte b/src/app/components/AlertItem.svelte
index de87f034..ce5bfa71 100644
--- a/src/app/components/AlertItem.svelte
+++ b/src/app/components/AlertItem.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import {parseJson, nthEq} from "@welshman/lib"
+  import {parseJson} from "@welshman/lib"
   import {displayFeeds} from "@welshman/feeds"
   import {getAddress, getTagValue, getTagValues} from "@welshman/util"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import AlertDelete from "@app/components/AlertDelete.svelte"
   import type {Alert} from "@app/state"
-  import {alertStatuses} from "@app/state"
+  import {deriveAlertStatus} from "@app/state"
   import {pushModal} from "@app/modal"
 
   type Props = {
@@ -15,8 +15,7 @@
 
   const {alert}: Props = $props()
 
-  const address = $derived(getAddress(alert.event))
-  const status = $derived($alertStatuses.find(s => s.event.tags.some(nthEq(1, address))))
+  const status = deriveAlertStatus(getAddress(alert.event))
   const cron = $derived(getTagValue("cron", alert.tags))
   const channel = $derived(getTagValue("channel", alert.tags))
   const feeds = $derived(getTagValues("feed", alert.tags))
@@ -39,24 +38,24 @@
     </Button>
     <div class="flex-inline gap-1">{description}</div>
   </div>
-  {#if status}
-    {@const statusText = getTagValue("status", status.tags) || "error"}
+  {#if $status}
+    {@const statusText = getTagValue("status", $status.tags) || "error"}
     {#if statusText === "ok"}
       <span
         class="tooltip tooltip-left cursor-pointer rounded-full border border-solid border-base-content px-3 py-1 text-sm"
-        data-tip={getTagValue("message", status.tags)}>
+        data-tip={getTagValue("message", $status.tags)}>
         Active
       </span>
     {:else if statusText === "pending"}
       <span
         class="tooltip tooltip-left cursor-pointer rounded-full border border-solid border-base-content border-yellow-500 px-3 py-1 text-sm text-yellow-500"
-        data-tip={getTagValue("message", status.tags)}>
+        data-tip={getTagValue("message", $status.tags)}>
         Pending
       </span>
     {:else}
       <span
         class="tooltip tooltip-left cursor-pointer rounded-full border border-solid border-error px-3 py-1 text-sm text-error"
-        data-tip={getTagValue("message", status.tags)}>
+        data-tip={getTagValue("message", $status.tags)}>
         {statusText.replace("-", " ").replace(/^(.)/, x => x.toUpperCase())}
       </span>
     {/if}
diff --git a/src/app/components/MenuSpace.svelte b/src/app/components/MenuSpace.svelte
index e8152817..1f8f5215 100644
--- a/src/app/components/MenuSpace.svelte
+++ b/src/app/components/MenuSpace.svelte
@@ -24,8 +24,8 @@
     memberships,
     deriveUserRooms,
     deriveOtherRooms,
+    deviceAlerts,
     hasNip29,
-    alerts,
   } from "@app/state"
   import {loadAlerts} from "@app/requests"
   import {notifications} from "@app/notifications"
@@ -40,7 +40,7 @@
   const calendarPath = makeSpacePath(url, "calendar")
   const userRooms = deriveUserRooms(url)
   const otherRooms = deriveOtherRooms(url)
-  const alert = $derived($alerts.find(a => getTagValue("feed", a.tags)?.includes(url)))
+  const alert = $derived($deviceAlerts.find(a => getTagValue("feed", a.tags)?.includes(url)))
 
   const openMenu = () => {
     showMenu = true
diff --git a/src/app/push.ts b/src/app/push.ts
index 582fdf10..95f97c3d 100644
--- a/src/app/push.ts
+++ b/src/app/push.ts
@@ -1,8 +1,28 @@
+import * as nip19 from "nostr-tools/nip19"
 import {Capacitor} from "@capacitor/core"
+import type {ActionPerformed, RegistrationError, Token} from "@capacitor/push-notifications"
+import {PushNotifications} from "@capacitor/push-notifications"
+import {sleep, parseJson} from "@welshman/lib"
+import {isSignedEvent} from "@welshman/util"
+import {goto} from "$app/navigation"
 import {VAPID_PUBLIC_KEY} from "@app/state"
 
 export const platform = Capacitor.getPlatform()
 
+export const initializePushNotifications = () => {
+  if (platform === "web") return
+
+  PushNotifications.addListener("pushNotificationActionPerformed", (action: ActionPerformed) => {
+    const event = parseJson(action.notification.data.event)
+    const parsedRelays = parseJson(action.notification.data.relays)
+    const relays = Array.isArray(parsedRelays) ? parsedRelays : []
+
+    if (isSignedEvent(event)) {
+      goto("/" + nip19.neventEncode({id: event.id, relays}))
+    }
+  })
+}
+
 export const canSendPushNotifications = () => ["web", "android", "ios"].includes(platform)
 
 export const getWebPushInfo = async () => {
@@ -36,7 +56,7 @@ export const getWebPushInfo = async () => {
     })
   }
 
-  const {endpoint, keys} = subscription.toJSON()
+  const {keys} = subscription.toJSON()
 
   if (!keys) {
     throw new Error(`Failed to get push info: no keys were returned`)
@@ -49,12 +69,36 @@ export const getWebPushInfo = async () => {
   }
 }
 
-export const getIosPushInfo = async () => {
-  return {}
-}
+export const getCapacitorPushInfo = async () => {
+  let status = await PushNotifications.checkPermissions()
 
-export const getAndroidPushInfo = async () => {
-  return {}
+  if (status.receive === "prompt") {
+    status = await PushNotifications.requestPermissions()
+  }
+
+  if (status.receive !== "granted") {
+    throw new Error("Failed to register for push notifications")
+  }
+
+  let device_token = ""
+  let error = "Failed to register for push notifications"
+
+  PushNotifications.addListener("registration", (token: Token) => {
+    device_token = token.value
+  })
+
+  PushNotifications.addListener("registrationError", (_error: RegistrationError) => {
+    error = _error.error
+  })
+
+  await PushNotifications.register()
+  await sleep(100)
+
+  if (!device_token) {
+    throw new Error(error)
+  }
+
+  return {device_token}
 }
 
 export const getPushInfo = (): Promise<Record<string, string>> => {
@@ -62,9 +106,8 @@ export const getPushInfo = (): Promise<Record<string, string>> => {
     case "web":
       return getWebPushInfo()
     case "ios":
-      return getIosPushInfo()
     case "android":
-      return getAndroidPushInfo()
+      return getCapacitorPushInfo()
     default:
       throw new Error(`Invalid push platform: ${platform}`)
   }
diff --git a/src/app/requests.ts b/src/app/requests.ts
index 8a9119ea..71b33281 100644
--- a/src/app/requests.ts
+++ b/src/app/requests.ts
@@ -367,7 +367,7 @@ export const listenForNotifications = () => {
 
   for (const [url, allRooms] of userRoomsByUrl.get()) {
     // Limit how many rooms we load at a time, since we have to send a separate filter
-    // for each one due to nip 29 breaking postel's law
+    // for each one due to relay29 being picky
     const rooms = shuffle(Array.from(allRooms)).slice(0, 30)
 
     load({
@@ -375,6 +375,7 @@ export const listenForNotifications = () => {
       relays: [url],
       filters: [
         {kinds: [THREAD], limit: 1},
+        {kinds: [MESSAGE], limit: 1},
         {kinds: [COMMENT], "#K": [String(THREAD)], limit: 1},
         ...rooms.map(room => ({kinds: [MESSAGE], "#h": [room], limit: 1})),
       ],
@@ -385,6 +386,7 @@ export const listenForNotifications = () => {
       relays: [url],
       filters: [
         {kinds: [THREAD], since: now()},
+        {kinds: [MESSAGE], since: now()},
         {kinds: [COMMENT], "#K": [String(THREAD)], since: now()},
         ...rooms.map(room => ({kinds: [MESSAGE], "#h": [room], since: now()})),
       ],
diff --git a/src/app/routes.ts b/src/app/routes.ts
index ffc41a6e..95d10299 100644
--- a/src/app/routes.ts
+++ b/src/app/routes.ts
@@ -69,7 +69,7 @@ export const goToEvent = async (event: TrustedEvent, options: Record<string, any
   const urls = Array.from(tracker.getRelays(event.id))
   const path = await getEventPath(event, urls)
 
-  if (path.includes('://')) {
+  if (path.includes("://")) {
     window.open(path)
   } else {
     goto(path, options)
@@ -94,7 +94,7 @@ export const getEventPath = async (event: TrustedEvent, urls: string[]) => {
     }
 
     if (event.kind === MESSAGE) {
-      return room ? makeRoomPath(url, room) : makeSpacePath(url, 'chat')
+      return room ? makeRoomPath(url, room) : makeSpacePath(url, "chat")
     }
 
     const kind = event.tags.find(nthEq(0, "K"))?.[1]
@@ -110,7 +110,7 @@ export const getEventPath = async (event: TrustedEvent, urls: string[]) => {
       }
 
       if (parseInt(kind) === MESSAGE) {
-        return room ? makeRoomPath(url, room) : makeSpacePath(url, 'chat')
+        return room ? makeRoomPath(url, room) : makeSpacePath(url, "chat")
       }
     }
   }
diff --git a/src/app/state.ts b/src/app/state.ts
index 73c2850f..ed34650e 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -23,7 +23,14 @@ import {
 } from "@welshman/lib"
 import type {Socket} from "@welshman/net"
 import {Pool, load, AuthStateEvent, SocketEvent} from "@welshman/net"
-import {collection, custom} from "@welshman/store"
+import {
+  collection,
+  custom,
+  deriveEvents,
+  deriveEventsMapped,
+  withGetter,
+  synced,
+} from "@welshman/store"
 import {
   getIdFilters,
   WRAP,
@@ -56,7 +63,9 @@ import {
   asDecryptedEvent,
   normalizeRelayUrl,
   getTag,
+  getTagValue,
   getTagValues,
+  getAddress,
 } from "@welshman/util"
 import type {TrustedEvent, SignedEvent, PublishedList, List, Filter} from "@welshman/util"
 import {Nip59, decrypt} from "@welshman/signer"
@@ -81,7 +90,6 @@ import {
   appContext,
 } from "@welshman/app"
 import type {Thunk, Relay} from "@welshman/app"
-import {deriveEvents, deriveEventsMapped, withGetter, synced} from "@welshman/store"
 
 export const fromCsv = (s: string) => (s || "").split(",").filter(identity)
 
@@ -341,6 +349,8 @@ export const {
 
 // Alerts
 
+export const deviceAlertAddresses = synced<string[]>("deviceAlertAddresses", [])
+
 export type Alert = {
   event: TrustedEvent
   tags: string[][]
@@ -356,6 +366,12 @@ export const alerts = deriveEventsMapped<Alert>(repository, {
   },
 })
 
+export const deviceAlerts = derived(
+  [deviceAlertAddresses, alerts],
+  ([$deviceAlertAddresses, $alerts]) =>
+    $alerts.filter(a => $deviceAlertAddresses.includes(getAddress(a.event))),
+)
+
 // Alert Statuses
 
 export type AlertStatus = {
@@ -373,6 +389,9 @@ export const alertStatuses = deriveEventsMapped<AlertStatus>(repository, {
   },
 })
 
+export const deriveAlertStatus = (address: string) =>
+  derived(alertStatuses, statuses => statuses.find(s => getTagValue("d", s.event.tags) === address))
+
 // Membership
 
 export const hasMembershipUrl = (list: List | undefined, url: string) =>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 8678579c..27cfb5ea 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -63,6 +63,7 @@
   } from "@app/state"
   import {loadUserData, listenForNotifications} from "@app/requests"
   import {theme} from "@app/theme"
+  import {initializePushNotifications} from "@app/push"
   import * as commands from "@app/commands"
   import * as requests from "@app/requests"
   import * as notifications from "@app/notifications"
@@ -73,6 +74,9 @@
     dropSession($session.pubkey)
   }
 
+  // Initialize push notification handler asap
+  initializePushNotifications()
+
   const {children} = $props()
 
   const ready = $state(defer<void>())
@@ -95,8 +99,8 @@
     })
 
     // Listen for navigation messages from service worker
-    navigator.serviceWorker?.addEventListener('message', (event) => {
-      if (event.data && event.data.type === 'NAVIGATE') {
+    navigator.serviceWorker?.addEventListener("message", event => {
+      if (event.data && event.data.type === "NAVIGATE") {
         goto(event.data.url)
       }
     })
diff --git a/src/routes/[bech32]/+page.svelte b/src/routes/[bech32]/+page.svelte
index 694eb4d7..4ffcd7fd 100644
--- a/src/routes/[bech32]/+page.svelte
+++ b/src/routes/[bech32]/+page.svelte
@@ -2,7 +2,7 @@
   import {onMount} from "svelte"
   import * as nip19 from "nostr-tools/nip19"
   import type {TrustedEvent} from "@welshman/util"
-  import {Address, getIdFilters, getTagValue} from "@welshman/util"
+  import {Address, getIdFilters} from "@welshman/util"
   import {LOCAL_RELAY_URL} from "@welshman/relay"
   import {load} from "@welshman/net"
   import {page} from "$app/stores"
diff --git a/src/service-worker.js b/src/service-worker.js
index b68c8b72..db2de812 100644
--- a/src/service-worker.js
+++ b/src/service-worker.js
@@ -1,24 +1,12 @@
-import * as nip19 from 'nostr-tools/nip19'
-import {parse, renderAsText} from '@welshman/content'
-import {MESSAGE, THREAD, COMMENT, EVENT_TIME} from '@welshman/util'
+/* global clients */
 
-const renderOptions = {
-  createElement: tag => ({
-    _text: "",
-    set innerText(text) {
-      this._text = text
-    },
-    get innerHTML() {
-      return this._text
-    },
-  })
-}
+import * as nip19 from "nostr-tools/nip19"
 
-self.addEventListener('install', event => {
+self.addEventListener("install", event => {
   self.skipWaiting()
 })
 
-self.addEventListener('activate', event => {
+self.addEventListener("activate", event => {
   event.waitUntil(self.clients.claim())
 })
 
@@ -26,26 +14,37 @@ self.addEventListener("push", e => {
   console.log("Service Worker: Push event received", e)
 
   let url = "/"
+  let title = "New activity"
   let body = "You have a new message"
 
   try {
-    const {event, relays = []} = e.data?.json() || {}
+    const data = e.data?.json()
 
-    if (event) {
-      url += nip19.neventEncode({id: event.id, relays})
-      body = renderAsText(parse(event), renderOptions).toString()
+    if (data?.event) {
+      url += nip19.neventEncode({
+        id: data.event.id,
+        relays: data.relays || []
+      })
+    }
+
+    if (data?.title) {
+      title = data.title
+    }
+
+    if (data?.body) {
+      body = data.body
     }
   } catch (e) {
     console.log("Service Worker: Failed to parse push data", e)
   }
 
   e.waitUntil(
-    self.registration.showNotification("New message", {
+    self.registration.showNotification(title, {
       body,
       data: {url},
       icon: "/pwa-192x192.png",
       badge: "/pwa-64x64.png",
-      tag: 'flotilla-notification',
+      tag: "flotilla-notification",
       requireInteraction: false,
     }),
   )
@@ -74,8 +73,8 @@ self.addEventListener("notificationclick", e => {
         for (const client of clientList) {
           if (client.url.includes(location.origin)) {
             client.postMessage({
-              type: 'NAVIGATE',
-              url: url
+              type: "NAVIGATE",
+              url: url,
             })
 
             return client.focus()