diff --git a/package-lock.json b/package-lock.json index a82bacba..f6fc3cf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "flotilla", - "version": "0.2.12", + "version": "0.2.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "flotilla", - "version": "0.2.12", + "version": "0.2.13", "dependencies": { "@capacitor/android": "^7.0.0", "@capacitor/app": "^7.0.0", @@ -23,7 +23,7 @@ "@vite-pwa/assets-generator": "^0.2.6", "@vite-pwa/sveltekit": "^0.6.6", "@welshman/app": "^0.0.43", - "@welshman/content": "^0.1.0", + "@welshman/content": "^0.1.1", "@welshman/dvm": "^0.0.15", "@welshman/editor": "^0.1.0", "@welshman/feeds": "^0.1.0", @@ -4776,9 +4776,9 @@ } }, "node_modules/@welshman/content": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@welshman/content/-/content-0.1.0.tgz", - "integrity": "sha512-l+r3JgBf6raPcwsAsNiM3N4Ms0X88uKPMuPltQLOMv0whaDCUVpu/w7llQBX6fH7v9RgSq0imgkUCWw9puYNlQ==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@welshman/content/-/content-0.1.1.tgz", + "integrity": "sha512-pzyH79/XCMAssT7QNCOkaIvknAW7Eek+l6cuL6c2s8ZO0wX4sTu55qmPzZHpjqg5l6VzW+6nCWDO/Tb8m62CMw==", "license": "MIT", "dependencies": { "@braintree/sanitize-url": "^7.0.2", diff --git a/package.json b/package.json index 14a0b48a..c90e9ad3 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@vite-pwa/assets-generator": "^0.2.6", "@vite-pwa/sveltekit": "^0.6.6", "@welshman/app": "^0.0.43", - "@welshman/content": "^0.1.0", + "@welshman/content": "^0.1.1", "@welshman/dvm": "^0.0.15", "@welshman/editor": "^0.1.0", "@welshman/feeds": "^0.1.0", diff --git a/src/app/commands.ts b/src/app/commands.ts index 97c877d4..f351250b 100644 --- a/src/app/commands.ts +++ b/src/app/commands.ts @@ -465,12 +465,15 @@ export type AlertParams = { cron: string email: string relay: string - handler: string filters: Filter[] } -export const makeAlert = async ({cron, email, handler, relay, filters}: AlertParams) => - createEvent(ALERT, { +export const makeAlert = async ({cron, email, relay, filters}: AlertParams) => { + const handler = + "31990:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:1737058597050" + const handlerRelay = "wss://relay.nostr.band/" + + return createEvent(ALERT, { content: await signer .get() .nip44.encrypt( @@ -479,8 +482,8 @@ export const makeAlert = async ({cron, email, handler, relay, filters}: AlertPar ["cron", cron], ["email", email], ["relay", relay], - ["handler", handler], ["channel", "email"], + ["handler", handler, handlerRelay, "web"], ...unionFilters(filters).map(filter => ["filter", JSON.stringify(filter)]), ]), ), @@ -489,6 +492,7 @@ export const makeAlert = async ({cron, email, handler, relay, filters}: AlertPar ["p", NOTIFIER_PUBKEY], ], }) +} export const publishAlert = async (params: AlertParams) => publishThunk({event: await makeAlert(params), relays: [NOTIFIER_RELAY]}) diff --git a/src/app/components/AlertAdd.svelte b/src/app/components/AlertAdd.svelte index 288e55a0..53b6ef70 100644 --- a/src/app/components/AlertAdd.svelte +++ b/src/app/components/AlertAdd.svelte @@ -1,5 +1,4 @@ + + diff --git a/src/routes/settings/profile/+page.svelte b/src/routes/settings/profile/+page.svelte index d76734cd..894e9082 100644 --- a/src/routes/settings/profile/+page.svelte +++ b/src/routes/settings/profile/+page.svelte @@ -12,6 +12,7 @@ import ProfileEdit from "@app/components/ProfileEdit.svelte" import ProfileDelete from "@app/components/ProfileDelete.svelte" import InfoKeys from "@app/components/InfoKeys.svelte" + import Alerts from "@app/components/Alerts.svelte" import {PLATFORM_NAME} from "@app/state" import {pushModal} from "@app/modal" import {clip} from "@app/toast" @@ -129,6 +130,7 @@ {/if} +