1 files changed, 13 insertions, 19 deletions

diff --git a/src/sw-nwc.js b/src/sw-nwc.js
index 3a48cff..a4e4e56 100644
--- a/src/sw-nwc.js
+++ b/src/sw-nwc.js
@@ -9,6 +9,7 @@ import { withRequestLock, withWorkLock } from './nwc-lock.js';
 import { appendBgLog, takeLease } from './nwc-bg.js';
 import { bgAutoWithdraw } from './bg-autowithdraw.js';
 import { allInboxes, classifyDm, shouldNotifyDm, classifyCall } from './dm-inbox.js';
+import { notifyText } from './notify-text.js';
 
 const NOTIFIER = 'https://nwcpush.coinos.io';
 // The worker's diary (nwc-bg.js): every line also lands in IndexedDB as it is
@@ -108,8 +109,11 @@ self.addEventListener('push', (e) => {
         await cache.put('/__pending-call', new Response(JSON.stringify({ offer: ring.offer, at: Date.now() }), { headers: { 'content-type': 'application/json' } }));
       } catch (_) {}
       for (const c of clients) { try { c.postMessage({ type: 'call-offer', offer: ring.offer }); } catch (_) {} }
-      await show((ring.name || 'Someone') + ' is calling', {
-        body: ring.type === 'video' ? 'Video call. Tap to answer.' : 'Voice call. Tap to answer.',
+      // the words are measured against Chrome's spam model (notify-text.js):
+      // "<name> is calling" is hidden behind a warning, "Calling" / "<name>" shows
+      const [callTitle, callBody] = notifyText('call', { name: ring.name });
+      await show(callTitle, {
+        body: callBody,
         icon: 'icon-192.png', badge: 'badge-96.png',
         tag: 'call', renotify: true, requireInteraction: true, vibrate: [400, 200, 400, 200, 400],
         data: { url: './?open=call', view: 'call' },
@@ -141,24 +145,15 @@ self.addEventListener('push', (e) => {
           if (verdict && verdict.name) dmName = verdict.name;
         } catch (err) { console.warn('[sw-dm] could not classify:', err && err.message); }
       }
-      // A reaction names who, when this device knows them, and is dropped
-      // when they are muted here — the notifier can't know either.
-      let who = null;
+      // A reaction from someone muted on this device is dropped — the
+      // notifier can't know. (It no longer names who: a name in the line
+      // is what tips Chrome's spam model over, see notify-text.js.)
       if (data.reason === 'reaction' && data.from) {
         const boxes = await allInboxes().catch(() => []);
         if (boxes.some((b) => (b.muted || []).includes(data.from))) return;
-        who = boxes.map((b) => b.names && b.names[data.from]).find(Boolean) || null;
       }
       const emoji = !data.emoji || data.emoji === '+' ? '\u2764\ufe0f' : /^:[\w-]+:$/.test(data.emoji) ? data.emoji : data.emoji.slice(0, 8);
-      const T = {
-        payment: ['Payment received', data.amountSat ? `+${Number(data.amountSat).toLocaleString()} sats. Open coinos to see it.` : 'Open coinos to see it.'],
-        dm: dmName ? [dmName, 'sent you a message.'] : ['New message', 'You have a new private message.'],
-        chat: ['New chat activity', 'There are new messages in your communities.'],
-        mention: [data.reply ? 'New reply to your post' : 'You were mentioned', data.text || 'Open coinos to see it.'],
-        zap: ['Zap received', data.amountSat ? `+${Number(data.amountSat).toLocaleString()} sats. Open coinos to see it.` : 'Someone zapped you. Open coinos to see it.'],
-        reaction: [who ? `${who} reacted ${emoji}` : `New reaction ${emoji}`, 'to your post. Open coinos to see it.'],
-      };
-      const [title, body] = T[data.reason] || T.chat;
+      const [title, body] = notifyText(data.reason, { amountSat: data.amountSat, name: dmName, reply: data.reply, emoji });
       // a reply lands you in the Notifications list, where it is
       const target = data.reason === 'mention' || data.reason === 'reaction' ? { url: './?open=notifs', view: 'notifs' } : { url: './' };
       await show(title, {
@@ -254,10 +249,9 @@ self.addEventListener('push', (e) => {
       // mint an invoice) — "an app wants to pay" would read as the opposite.
       const incoming = data.event && data.event.kind === 21001;
       diary(incoming ? 'waking the user: incoming payment' : 'waking the user: payment request');
-      await show(incoming ? 'Incoming payment' : 'Payment request', {
-        body: incoming
-          ? 'Someone is trying to send you money. Open coinos so your wallet can receive it.'
-          : 'An app is asking your wallet to pay. Open Coinos to approve.',
+      const [reqTitle, reqBody] = notifyText(incoming ? 'incoming' : 'spend');
+      await show(reqTitle, {
+        body: reqBody,
         icon: 'icon-192.png', badge: 'badge-96.png',
         tag: 'nwc-' + (data.servicePubkey || 'req'), renotify: false,
         data: { url: './' },