Add handler for alerts

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]})

src/app/components/AlertAdd.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import {Capacitor} from "@capacitor/core"
   import {preventDefault} from "@lib/html"
   import {randomInt} from "@welshman/lib"
   import {displayRelayUrl, THREAD, MESSAGE, EVENT_TIME, COMMENT} from "@welshman/util"
@@ -11,15 +10,11 @@
   import Spinner from "@lib/components/Spinner.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {getMembershipUrls, getMembershipRoomsByUrl, userMembership} from "@app/state"
+  import {GENERAL, getMembershipUrls, getMembershipRoomsByUrl, userMembership} from "@app/state"
   import {loadAlertStatuses} from "@app/requests"
   import {publishAlert} from "@app/commands"
   import {pushToast} from "@app/toast"
 
-  const handler = Capacitor.isNativePlatform()
-    ? "https://app.flotilla.social"
-    : window.location.origin
-
   const timezone = new Date()
     .toString()
     .match(/GMT[^\s]+/)![0]
@@ -75,13 +70,18 @@
     }
 
     if (notifyChat) {
-      filters.push({kinds: [MESSAGE], "#h": getMembershipRoomsByUrl(relay, $userMembership)})
+      filters.push({
+        kinds: [MESSAGE],
+        "#h": [GENERAL, ...getMembershipRoomsByUrl(relay, $userMembership)],
+      })
     }
 
     loading = true
 
     try {
-      await publishAlert({cron, email, relay, handler, filters})
+      const thunk = await publishAlert({cron, email, relay, filters})
+
+      await thunk.result
       await loadAlertStatuses($pubkey!)
 
       pushToast({message: "Your alert has been successfully created!"})

src/app/components/ContentQuote.svelte

@@ -4,6 +4,7 @@
   import {ctx, nthEq} from "@welshman/lib"
   import {tracker, repository} from "@welshman/app"
   import {Address, DIRECT_MESSAGE, MESSAGE, THREAD, EVENT_TIME} from "@welshman/util"
+  import {scrollToEvent} from "@lib/html"
   import Button from "@lib/components/Button.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import NoteCard from "@app/components/NoteCard.svelte"
@@ -24,34 +25,12 @@
     ? nip19.neventEncode({id, relays: mergedRelays})
     : new Address(kind, pubkey, identifier, mergedRelays).toNaddr()
 
-  const scrollToEvent = (id: string) => {
-    const element = document.querySelector(`[data-event="${id}"]`) as any
-
-    if (element) {
-      element.scrollIntoView({behavior: "smooth"})
-      element.style =
-        "filter: brightness(1.5); transition-property: all; transition-duration: 400ms;"
-
-      setTimeout(() => {
-        element.style = "transition-property: all; transition-duration: 300ms;"
-      }, 800)
-
-      setTimeout(() => {
-        element.style = ""
-      }, 800 + 400)
-    }
-
-    return Boolean(element)
-  }
-
   const openMessage = (url: string, room: string, id: string) => {
     const event = repository.getEvent(id)
 
     if (event) {
       goto(makeRoomPath(url, room))
-
-      // TODO: if the event doesn't immediately load, this won't work. Scroll up until it's found
-      setTimeout(() => scrollToEvent(id), 300)
+      scrollToEvent(id)
     }
 
     return Boolean(event)