+
+ {#if $notification}
+
+ {/if}
Active {formatTimestampRelative(lastActive)}
{/if}
diff --git a/src/app/notifications.ts b/src/app/notifications.ts
new file mode 100644
index 00000000..e559f8eb
--- /dev/null
+++ b/src/app/notifications.ts
@@ -0,0 +1,51 @@
+import {writable, derived} from "svelte/store"
+import {deriveEvents} from "@welshman/store"
+import {repository, pubkey} from "@welshman/app"
+import {prop, max, sortBy, assoc, lt, now} from "@welshman/lib"
+import type {Filter} from "@welshman/util"
+import {DIRECT_MESSAGE} from "@welshman/util"
+import {MESSAGE, THREAD, COMMENT, deriveEventsForUrl} from "@app/state"
+
+// Checked state
+
+export const checked = writable
>({})
+
+export const deriveChecked = (key: string) => derived(checked, prop(key))
+
+export const setChecked = (key: string, ts = now()) =>
+ checked.update(state => ({...state, [key]: ts}))
+
+// Filters for various routes
+
+export const CHAT_FILTERS: Filter[] = [{kinds: [DIRECT_MESSAGE]}]
+
+export const SPACE_FILTERS: Filter[] = [{kinds: [THREAD, MESSAGE, COMMENT]}]
+
+export const ROOM_FILTERS: Filter[] = [{kinds: [MESSAGE]}]
+
+export const THREAD_FILTERS: Filter[] = [
+ {kinds: [THREAD]},
+ {kinds: [COMMENT], "#K": [String(THREAD)]},
+]
+
+export const getNotificationFilters = (since: number): Filter[] =>
+ [...CHAT_FILTERS, ...SPACE_FILTERS, ...THREAD_FILTERS].map(assoc("since", since))
+
+export const getRoomFilters = (room: string): Filter[] => ROOM_FILTERS.map(assoc("#~", [room]))
+
+// Notification derivation
+
+export const deriveNotification = (path: string, filters: Filter[], url?: string) => {
+ const events = url ? deriveEventsForUrl(url, filters) : deriveEvents(repository, {filters})
+
+ return derived(
+ [pubkey, deriveChecked("*"), deriveChecked(path), events],
+ ([$pubkey, $allChecked, $checked, $events]) => {
+ const [latestEvent] = sortBy($e => -$e.created_at, $events)
+
+ return (
+ latestEvent?.pubkey !== $pubkey && lt(max([$allChecked, $checked]), latestEvent?.created_at)
+ )
+ },
+ )
+}
diff --git a/src/app/state.ts b/src/app/state.ts
index 89e9c271..e18f5385 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -1,10 +1,9 @@
import twColors from "tailwindcss/colors"
-import {get, derived, writable} from "svelte/store"
+import {get, derived} from "svelte/store"
import {nip19} from "nostr-tools"
import type {Maybe} from "@welshman/lib"
import {
ctx,
- now,
setContext,
remove,
assoc,
@@ -17,7 +16,6 @@ import {
nthEq,
shuffle,
parseJson,
- prop,
} from "@welshman/lib"
import {
getIdFilters,
@@ -253,6 +251,12 @@ export const deriveEvent = (idOrAddress: string, hints: string[] = []) => {
)
}
+export const getEventsForUrl = (url: string, filters: Filter[]) =>
+ sortBy(
+ e => -e.created_at,
+ repository.query(filters).filter(e => e.tags.find(nthEq(0, "~"))?.[2] === url),
+ )
+
export const deriveEventsForUrl = (url: string, filters: Filter[]) =>
derived(deriveEvents(repository, {filters}), $events =>
sortBy(
@@ -261,14 +265,6 @@ export const deriveEventsForUrl = (url: string, filters: Filter[]) =>
),
)
-// Last checked timestamps, notifications
-
-export const checked = writable>({})
-
-export const deriveChecked = (key: string) => derived(checked, prop(key))
-
-export const setChecked = (key: string, ts = now()) => checked.update(assoc(key, ts))
-
// Settings
export const SETTINGS = 38489
diff --git a/src/lib/components/PrimaryNavItem.svelte b/src/lib/components/PrimaryNavItem.svelte
index 7892c992..fa791b2c 100644
--- a/src/lib/components/PrimaryNavItem.svelte
+++ b/src/lib/components/PrimaryNavItem.svelte
@@ -5,6 +5,7 @@
export let title = ""
export let href = ""
export let prefix = ""
+ export let notification = false
$: active = $page.url?.pathname?.startsWith(prefix || href || "bogus")
@@ -16,6 +17,9 @@
class:bg-base-300={active}
class:tooltip={title}
data-tip={title}>
+ {#if !active && notification}
+
+ {/if}