From 2aa00e5bb68abcf3f986b7108dc43cd84d5ca288 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 29 Jan 2024 14:31:24 -0800
Subject: [PATCH] Handle other notifications when marking as seen

---
 src/app/views/Notifications.svelte | 9 ++++++---
 src/engine/people/derived.ts       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/views/Notifications.svelte b/src/app/views/Notifications.svelte
index 5d25258e..726a23a2 100644
--- a/src/app/views/Notifications.svelte
+++ b/src/app/views/Notifications.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import {find} from "ramda"
+  import {find, concat} from "ramda"
   import {onMount} from "svelte"
-  import {debounce} from 'throttle-debounce'
+  import {debounce} from "throttle-debounce"
   import {createScroller, formatTimestampAsDate} from "src/util/misc"
   import {noteKinds, reactionKinds} from "src/util/nostr"
   import Tabs from "src/partials/Tabs.svelte"
@@ -14,6 +14,7 @@
   import {router} from "src/app/router"
   import type {Event} from "src/engine"
   import {
+    derived,
     markAsSeen,
     notifications,
     otherNotifications,
@@ -60,7 +61,9 @@
   onMount(() => {
     loadNotifications()
 
-    const unsub = unreadNotifications.subscribe(debounce(1000, markAsSeen))
+    const unsub = derived([unreadNotifications, unreadOtherNotifications], groups =>
+      groups.reduce(concat, []),
+    ).subscribe(debounce(1000, markAsSeen))
 
     const scroller = createScroller(async () => {
       limit += 4
diff --git a/src/engine/people/derived.ts b/src/engine/people/derived.ts
index 9d0dc6b5..fcabc148 100644
--- a/src/engine/people/derived.ts
+++ b/src/engine/people/derived.ts
@@ -6,7 +6,7 @@ import {pubkey} from "src/engine/session/state"
 import {user} from "src/engine/session/derived"
 import type {Person} from "./model"
 import {people} from "./state"
-import {personHasName, getFollowsWhoFollow, primeWotCaches, getWotScore, getMutes, getFollows, getNetwork} from "./utils"
+import {personHasName, primeWotCaches, getWotScore, getMutes, getFollows, getNetwork} from "./utils"
 
 export const peopleWithName = people.derived(filter(personHasName))