Handle other notifications when marking as seen

This commit is contained in:
Jon Staab 2024-01-29 14:31:24 -08:00
parent 04b3772231
commit 2aa00e5bb6
2 changed files with 7 additions and 4 deletions

View File

@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import {find} from "ramda" import {find, concat} from "ramda"
import {onMount} from "svelte" import {onMount} from "svelte"
import {debounce} from 'throttle-debounce' import {debounce} from "throttle-debounce"
import {createScroller, formatTimestampAsDate} from "src/util/misc" import {createScroller, formatTimestampAsDate} from "src/util/misc"
import {noteKinds, reactionKinds} from "src/util/nostr" import {noteKinds, reactionKinds} from "src/util/nostr"
import Tabs from "src/partials/Tabs.svelte" import Tabs from "src/partials/Tabs.svelte"
@ -14,6 +14,7 @@
import {router} from "src/app/router" import {router} from "src/app/router"
import type {Event} from "src/engine" import type {Event} from "src/engine"
import { import {
derived,
markAsSeen, markAsSeen,
notifications, notifications,
otherNotifications, otherNotifications,
@ -60,7 +61,9 @@
onMount(() => { onMount(() => {
loadNotifications() 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 () => { const scroller = createScroller(async () => {
limit += 4 limit += 4

View File

@ -6,7 +6,7 @@ import {pubkey} from "src/engine/session/state"
import {user} from "src/engine/session/derived" import {user} from "src/engine/session/derived"
import type {Person} from "./model" import type {Person} from "./model"
import {people} from "./state" 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)) export const peopleWithName = people.derived(filter(personHasName))