From 3a954201ce6765b9aa1ae99f1d0edf130cbcd0ee Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 23 Apr 2025 11:05:28 -0700
Subject: [PATCH] Tweak boot, stop saving alert events

---
 src/app/components/AlertAdd.svelte  |  9 +++------
 src/app/components/AlertItem.svelte | 20 +++++++++++---------
 src/app/requests.ts                 |  6 +++---
 src/routes/+layout.svelte           | 19 +++++--------------
 4 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/app/components/AlertAdd.svelte b/src/app/components/AlertAdd.svelte
index 8f313c8..4971164 100644
--- a/src/app/components/AlertAdd.svelte
+++ b/src/app/components/AlertAdd.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {preventDefault} from "@lib/html"
-  import {randomInt} from "@welshman/lib"
+  import {randomInt, TIMEZONE} from "@welshman/lib"
   import {displayRelayUrl, THREAD, MESSAGE, EVENT_TIME, COMMENT} from "@welshman/util"
   import type {Filter} from "@welshman/util"
   import type {Nip46ResponseWithResult} from "@welshman/signer"
@@ -18,11 +18,8 @@
   import {publishAlert} from "@app/commands"
   import {pushToast} from "@app/toast"
   import {pushModal} from "@app/modal"
-  const timezone = new Date()
-    .toString()
-    .match(/GMT[^\s]+/)![0]
-    .slice(3)
-  const timezoneOffset = parseInt(timezone) / 100
+
+  const timezoneOffset = parseInt(TIMEZONE.slice(3)) / 100
   const minute = randomInt(0, 59)
   const hour = (17 - timezoneOffset) % 24
   const WEEKLY = `0 ${minute} ${hour} * * 1`
diff --git a/src/app/components/AlertItem.svelte b/src/app/components/AlertItem.svelte
index 30301f5..3733705 100644
--- a/src/app/components/AlertItem.svelte
+++ b/src/app/components/AlertItem.svelte
@@ -45,15 +45,17 @@
 </script>
 
 <div class="flex items-start justify-between gap-4">
-  <Button class="py-1" onclick={startDelete}>
-    <Icon icon="trash-bin-2" />
-  </Button>
-  <div class="flex-inline gap-1">
-    {cron?.endsWith("1") ? "Weekly" : "Daily"} alert for
-    {displayList(types)} on
-    <Link class="link" href={makeSpacePath(relay)}>
-      {displayRelayUrl(relay)}
-    </Link>, sent via {channel}.
+  <div class="flex items-start gap-4">
+    <Button class="py-1" onclick={startDelete}>
+      <Icon icon="trash-bin-2" />
+    </Button>
+    <div class="flex-inline gap-1">
+      {cron?.endsWith("1") ? "Weekly" : "Daily"} alert for
+      {displayList(types)} on
+      <Link class="link" href={makeSpacePath(relay)}>
+        {displayRelayUrl(relay)}
+      </Link>, sent via {channel}.
+    </div>
   </div>
   {#if status}
     {@const statusText = getTagValue("status", status.tags) || "error"}
diff --git a/src/app/requests.ts b/src/app/requests.ts
index cb3d8cd..b99a4ef 100644
--- a/src/app/requests.ts
+++ b/src/app/requests.ts
@@ -9,7 +9,7 @@ import {
   int,
   YEAR,
   DAY,
-  insert,
+  insertAt,
   sortBy,
   assoc,
   now,
@@ -113,7 +113,7 @@ export const makeFeed = ({
     buffer.update($buffer => {
       for (let i = 0; i < $buffer.length; i++) {
         if ($buffer[i].id === event.id) return $buffer
-        if ($buffer[i].created_at < event.created_at) return insert(i, event, $buffer)
+        if ($buffer[i].created_at < event.created_at) return insertAt(i, event, $buffer)
       }
 
       return [...$buffer, event]
@@ -225,7 +225,7 @@ export const makeCalendarFeed = ({
     events.update($events => {
       for (let i = 0; i < $events.length; i++) {
         if ($events[i].id === event.id) return $events
-        if (getStart($events[i]) > start) return insert(i, event, $events)
+        if (getStart($events[i]) > start) return insertAt(i, event, $events)
       }
 
       return [...$events.filter(e => getAddress(e) !== address), event]
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index d659bd3..be01260 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -50,14 +50,7 @@
   import {setupAnalytics} from "@app/analytics"
   import {nsecDecode} from "@lib/util"
   import {theme} from "@app/theme"
-  import {
-    INDEXER_RELAYS,
-    ALERT,
-    ALERT_STATUS,
-    userMembership,
-    ensureUnwrapped,
-    canDecrypt,
-  } from "@app/state"
+  import {INDEXER_RELAYS, userMembership, ensureUnwrapped, canDecrypt} from "@app/state"
   import {loadUserData, listenForNotifications} from "@app/requests"
   import * as commands from "@app/commands"
   import * as requests from "@app/requests"
@@ -137,7 +130,7 @@
         }
       })
 
-      initStorage("flotilla", 8, {
+      await initStorage("flotilla", 8, {
         ...defaultStorageAdapters,
         events: new EventsStorageAdapter({
           name: "events",
@@ -145,17 +138,15 @@
           repository,
           rankEvent: (e: TrustedEvent) => {
             if ([PROFILE, FOLLOWS, MUTES, RELAYS, INBOX_RELAYS].includes(e.kind)) return 1
-            if ([EVENT_TIME, THREAD, MESSAGE, WRAP, ALERT, ALERT_STATUS].includes(e.kind))
-              return 0.9
+            if ([EVENT_TIME, THREAD, MESSAGE, WRAP].includes(e.kind)) return 0.9
 
             return 0
           },
         }),
-      }).then(async () => {
-        await sleep(300)
-        ready.resolve()
       })
 
+      sleep(300).then(() => ready.resolve())
+
       defaultSocketPolicies.push(
         makeSocketPolicyAuth({
           sign: (event: StampedEvent) => signer.get()?.sign(event),