aboutsummaryrefslogtreecommitdiffstats
path: root/src/features
diff options
context:
space:
mode:
Diffstat (limited to 'src/features')
-rw-r--r--src/features/ark.js6
-rw-r--r--src/features/messages.js47
-rw-r--r--src/features/nwc.js16
3 files changed, 63 insertions, 6 deletions
diff --git a/src/features/ark.js b/src/features/ark.js
index 4693336..8913dc3 100644
--- a/src/features/ark.js
+++ b/src/features/ark.js
@@ -481,12 +481,13 @@ export function arkFeature(ctx) {
// connections/offer belong to the nwc feature; when it isn't the caller
// (an auto-withdraw setting changed, say) carry forward what's mirrored
// rather than blanking someone's wallet connections.
- async function writeBgMirror(connections, offer) {
+ async function writeBgMirror(connections, offer, prefs) {
const cfg = getArkConfig();
if (!cfg || !ark || !ark.info || !ark.state) return;
const prev = await loadBg(wallet._cacheKey());
if (connections === undefined) connections = (prev && prev.connections) || [];
if (offer === undefined) offer = (prev && prev.offer) || null;
+ if (prefs === undefined) prefs = (prev && prev.prefs) || undefined;
const rec = buildBg({
ark: { arkUrl: cfg.ark, esploraUrl: cfg.esplora, network: getNetwork(), serverPubkey: ark.info.serverPubkey },
mgrState: ark.state,
@@ -496,6 +497,7 @@ export function arkFeature(ctx) {
autowithdraw: await awMirror(prev),
});
if (prev) rec.spends = prev.spends; // the worker's log survives rewrites
+ if (prefs) rec.prefs = prefs; // notification choices the worker honours
await saveBg(wallet._cacheKey(), rec);
}
@@ -2056,7 +2058,7 @@ export function arkFeature(ctx) {
arkBgReady() { return !!(ark && ark.info && ark.state); },
// nwc.js calls this (with its connections) whenever the mirror should
// refresh: on enable, on connection changes, after payments, on a timer.
- async arkBgWrite(connections, offer) { return writeBgMirror(connections, offer); },
+ async arkBgWrite(connections, offer, prefs) { return writeBgMirror(connections, offer, prefs); },
async arkBgSpendableSat() {
const rec = await loadBg(wallet._cacheKey());
return ((rec && rec.mgr && rec.mgr.vtxos) || [])
diff --git a/src/features/messages.js b/src/features/messages.js
index a27a6b7..c6d8a62 100644
--- a/src/features/messages.js
+++ b/src/features/messages.js
@@ -603,14 +603,19 @@ export function messagesFeature(ctx) {
// off by default: a busy room would otherwise buzz a phone all day for
// conversations that aren't addressed to anyone in particular.
function pushWatch() {
- const on = st().notify;
+ const s = st();
+ const on = s.notify;
const authors = [];
for (const jm of communities()) {
if (!on[jm.community_id]) continue;
const root = hexToBytes(jm.community_root);
for (const c of (jm.channels || []).slice(0, 8)) authors.push(channelKey(root, c.id, EPOCH).pk);
}
- return { ptags: myPubkeys(), authors };
+ // per-category opt-outs travel with the registration so the notifier
+ // never sends what the user turned off (a suppressed-but-delivered push
+ // would earn Chrome's generic "updated in background" nag instead)
+ const reasons = { payment: s.reasons?.payment !== false, dm: s.reasons?.dm !== false };
+ return { ptags: myPubkeys(), authors, reasons };
}
const roomNotify = (cid) => !!st().notify[cid];
@@ -631,6 +636,43 @@ export function messagesFeature(ctx) {
}
}
+ // Settings → Notifications: the master switch for this device plus the
+ // per-category choices the registration carries to the notifier.
+ function notifyCard() {
+ const supported = typeof Notification !== 'undefined'
+ && typeof navigator !== 'undefined' && 'serviceWorker' in navigator
+ && typeof window !== 'undefined' && 'PushManager' in window;
+ const perm = supported ? Notification.permission : 'unsupported';
+ const s = st();
+ const on = (k) => s.reasons?.[k] !== false;
+ const flip = async (k) => {
+ const s2 = st();
+ s2.reasons = { ...(s2.reasons || {}), [k]: !on(k) };
+ save(s2); render();
+ const ok = await registerPush({ interactive: true });
+ if (!ok) toast(t('msgPushFailed'));
+ };
+ const rowT = (label, k) => h('div', { class: 'row between' },
+ h('span', { class: 'small' }, label),
+ h('button', { class: 'btn-sm', onClick: () => flip(k) }, on(k) ? t('nwcOn') : t('nwcOff')));
+ return h('div', { class: 'card col', style: 'gap:10px' },
+ h('h3', { style: 'margin:0' }, t('notifTitle')),
+ !supported
+ ? h('div', { class: 'small faint' }, t('nwcNoPush'))
+ : perm === 'denied'
+ ? h('div', { class: 'notice err' }, t('nwcNotifBlocked'))
+ : perm !== 'granted' || !s.push
+ ? h('button', { class: 'btn-primary btn-block', onClick: async () => {
+ const ok = await registerPush({ interactive: true });
+ toast(ok ? t('notifEnabled') : t('msgPushFailed'));
+ render();
+ } }, t('notifEnable'))
+ : h('div', { class: 'small faint' }, t('notifOnDevice')),
+ rowT(t('notifPayRecv'), 'payment'),
+ rowT(t('notifDm'), 'dm'),
+ h('div', { class: 'small faint' }, t('notifChatHint')));
+ }
+
// Hand the service worker what it needs to tell a friend's DM from a
// stranger's: our key (only if we actually hold one), who we follow, and the
// names we already know. See dm-inbox.js for the threat model — a remote
@@ -1816,6 +1858,7 @@ export function messagesFeature(ctx) {
},
// Conversations waiting on us, for the header's message button.
unreadMessages() { return unreadCount(); },
+ notifySettingsCards() { return [notifyCard()]; },
screenView() {
if (ui.screen !== 'wallet') return null;
if (ui.profilePk) return profileScreen();
diff --git a/src/features/nwc.js b/src/features/nwc.js
index d6bfdea..90ccb84 100644
--- a/src/features/nwc.js
+++ b/src/features/nwc.js
@@ -216,13 +216,14 @@ export function nwcFeature(ctx) {
// worker — surface it the same way. A visible tab already shows it live.
async function notifySent(c, amountSat, feeSat) {
try {
+ if (load().paySentNotify === false) return;
if (typeof document === 'undefined' || !document.hidden) return;
if (typeof Notification === 'undefined' || Notification.permission !== 'granted') return;
const reg = await navigator.serviceWorker.ready;
await reg.showNotification(t('nwcPaidTitle'), {
body: t('nwcPaidBody', { amount: amountSat.toLocaleString(), name: c.name || 'app' })
+ (feeSat ? ` (+${feeSat} fee)` : ''),
- icon: 'icon-192.png', badge: 'icon-192.png',
+ icon: 'icon-192.png', badge: 'badge-96.png',
tag: 'nwc-sent', renotify: true, data: { url: './' },
});
} catch {}
@@ -699,7 +700,8 @@ export function nwcFeature(ctx) {
bgTimer = setTimeout(async () => {
try {
if (!hook('arkBgReady')) return;
- await hook('arkBgWrite', conns(), load().offer || null);
+ await hook('arkBgWrite', conns(), load().offer || null,
+ { paySent: load().paySentNotify !== false });
} catch (e) { console.warn('nwc: could not write background state', e.message); }
}, 1500);
}
@@ -850,5 +852,15 @@ export function nwcFeature(ctx) {
init() { listen(); startWatchdog(); refreshRegistration(); reconcileBg(); ensureBackground(false); },
stop() { stop(); if (watchdog) { clearInterval(watchdog); watchdog = null; } },
nostrSettingsCards() { return [nwcCard()]; },
+ notifySettingsCards() {
+ const on = load().paySentNotify !== false;
+ return [h('div', { class: 'card col', style: 'gap:10px' },
+ h('div', { class: 'row between' },
+ h('span', { class: 'small' }, t('notifPaySent')),
+ h('button', { class: 'btn-sm', onClick: () => {
+ const s = load(); s.paySentNotify = !on; save(s); writeBg(); render();
+ } }, on ? t('nwcOn') : t('nwcOff'))),
+ h('div', { class: 'small faint' }, t('notifPaySentHint')))];
+ },
};
}
generated by cgit v1.2.3 (git 2.51.0) at 2026-10-15 13:33:08 +0000