From 1261e3869d1f652be018783cdb5f29b1128218ff Mon Sep 17 00:00:00 2001 From: Jonathan Staab Date: Wed, 20 Sep 2023 14:19:38 -0700 Subject: [PATCH] Bump paravel --- package.json | 2 +- src/engine2/requests/notifications.ts | 8 +++++--- yarn.lock | Bin 281801 -> 283652 bytes 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3880d8fa..8b539896 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "marked": "^5.1.0", "nostr-tools": "^1.12.1", "npm-run-all": "^4.1.5", - "paravel": "^0.3.3", + "paravel": "^0.3.5", "qr-scanner": "^1.4.2", "qrcode": "^1.5.1", "ramda": "^0.28.0", diff --git a/src/engine2/requests/notifications.ts b/src/engine2/requests/notifications.ts index 0eafe59d..62e2dc81 100644 --- a/src/engine2/requests/notifications.ts +++ b/src/engine2/requests/notifications.ts @@ -5,7 +5,7 @@ import type {Event} from "src/engine2/model" import {EventKind} from "src/engine2/model" import {noteKinds, reactionKinds} from "src/util/nostr" import {env, sessions, events, notificationsLastChecked} from "src/engine2/state" -import {mergeHints, getPubkeyHints, nip28ChannelsForUser} from "src/engine2/queries" +import {mergeHints, isEventMuted, getPubkeyHints, nip28ChannelsForUser} from "src/engine2/queries" import {subscribe, subscribePersistent} from "./subscription" export const getNotificationKinds = () => @@ -37,7 +37,9 @@ export const loadNotifications = () => { shouldProject: false, relays: mergeHints(pubkeys.map(pk => getPubkeyHints(pk, "read"))), onEvent: (e: Event) => { - events.key(e.id).set(e) + if (!isEventMuted(e)) { + events.key(e.id).set(e) + } }, }) } @@ -69,7 +71,7 @@ export const listenForNotifications = async () => { {kinds: noteKinds, "#e": eventIds, limit: 1}, ], onEvent: (e: Event) => { - if (kinds.includes(e.kind)) { + if (kinds.includes(e.kind) && !isEventMuted(e)) { events.key(e.id).set(e) } }, diff --git a/yarn.lock b/yarn.lock index 894e06121d3fa0a071d2a65aaed18aca0597d58c..c570b0d2cefdba00d2bce96d497995daf5c55a5d 100644 GIT binary patch delta 1538 zcmZ9MOK2NM7{^&lDJ8X&7}svzBx>pgTx(}$AG4b@)Rwf8EbD3OVJ#)Fvk$FoJ=R*; zYw6JD5Xh~B7&_$ChPI@)l2Xv6m*$qzM=m`T0xi9@hXi^p?N~Mhx-2`($G3;y{{G+h z!%ZE7QGr2xG|9c7pH6aNdV7kSp&w3hFHX3I?=r>@#vKv*@1J8j z`uikzHj2g|vV&xcn2JM8jDVzI!L-?JBS%(&O$=a(2oga(0IBAxaYb7$c{sPLnQZ~A z*0g+bv$3|2+iE)t38<(WnetY0r4@ADisYIx(t-Nc>NZ}jmYXQuwuNFYl@wHvFtQRN zcD1+CbW0=a1ozjOkLS5bdh;qbPrrS}&5j;l<;c{li0NT$5&BgmeBdSNGbJ`pnx24| zmhs7~u$D0lMxtWa21Wu?AsqBnAX?T=CIRwZbFh|n*Xn7@>IuY~8yDc(~9SLimCj+f!vb_Ucuv*cG> zR>F0}A<-marbwmh2Kuli_X^TRwlAmCl}yE~?51_yhI-6PyLz@=Pw|^rD6DS}Xo(M> zp~LymxhpUAFx&$_jCafw_^hBrp%_JX9?pkG59h=Cr_Tk<;$iU`>)K_%soCvZiX4>a z^xNEJCiZ&ZvoHt#;$h$6nlX{68VZnYf-Hg!1T409Bxqv{RNEj7*_KW0jMq${#Zu7e zZ-|>_qgC8%B;&bETSvugf1PAd(Qe4)wwFnkiLIvedZ83g6s=r+hcCAQPg43;pm>Jf Y$<#$DBd(&N-pkgvmBvVZFT6kXA4hlD;Q#;t delta 475 zcmXAkJ!lj`7>1eKAQEz7P>&N4&bvb6UM};yI|HJ!F^Lj66V4nGL7AN&LnMcK`P)`W;LZoIF0-?w-^p65HmpSOpfz60As?q?DFaNm!C z-+uo%*gw6sTXbJ8g7YIaMlC~FXiJ6C&|q$2ixrDx95KvgM39D@#Kt}T1Im6d1ow-6 zPk=MPU%3P>A2|fQOu&Va8iAN0PK;!cK{&NkLlH@-73IprR7sfsAw>6{-7Wc#33&7O zXuV=qO=r35!25u2?G7dVIyO4i52K_(8nChaV53Hm6ijL;1*QgTtSAzaBO*Gt@1#yShhM3zlWbV+k$q_8#X&vr2lau?vR|1Tcvbudmyef5