n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

web/statestore: fix clearing unread count after accepting invite

Browse source
This commit is contained in:
Tulir Asokan 2025-01-01 01:22:33 +02:00
parent 43f25727e6
commit 59e1b760d6
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
web/src/api/statestore/main.ts
View file

@ -73,6 +73,7 @@ export class StateStore {
readonly rooms: Map<RoomID, RoomStateStore> = new Map()
readonly inviteRooms: Map<RoomID, InvitedRoomStore> = new Map()
readonly roomList = new NonNullCachedEventDispatcher<RoomListEntry[]>([])
readonly roomListEntries = new Map<RoomID, RoomListEntry>()
readonly topLevelSpaces = new NonNullCachedEventDispatcher<RoomID[]>([])
readonly spaceEdges: Map<RoomID, SpaceEdgeStore> = new Map()
readonly spaceOrphans = new SpaceOrphansSpace(this)
@ -212,11 +213,11 @@ export class StateStore {
const changedRoomListEntries = new Map<RoomID, RoomListEntry | null>()
for (const data of sync.invited_rooms ?? []) {
const room = new InvitedRoomStore(data, this)
const oldEntry = this.inviteRooms.get(room.room_id)
this.inviteRooms.set(room.room_id, room)
if (!resyncRoomList) {
changedRoomListEntries.set(room.room_id, room)
this.#applyUnreadModification(room, oldEntry)
this.#applyUnreadModification(room, this.roomListEntries.get(room.room_id))
this.roomListEntries.set(room.room_id, room)
}
if (this.activeRoomID === room.room_id) {
this.switchRoom?.(room.room_id)
@ -239,8 +240,12 @@ export class StateStore {
if (roomListEntryChanged) {
const entry = this.#makeRoomListEntry(data, room)
changedRoomListEntries.set(roomID, entry)
this.#applyUnreadModification(entry, room.roomListEntry)
room.roomListEntry = entry
this.#applyUnreadModification(entry, this.roomListEntries.get(roomID))
if (entry) {
this.roomListEntries.set(roomID, entry)
} else {
this.roomListEntries.delete(roomID)
}
}
if (!resyncRoomList) {
// When we join a valid replacement room, hide the tombstoned room.
@ -289,7 +294,7 @@ export class StateStore {
updatedRoomList.sort((r1, r2) => r1.sorting_timestamp - r2.sorting_timestamp)
for (const entry of updatedRoomList) {
this.#applyUnreadModification(entry, undefined)
this.rooms.get(entry.room_id)!.roomListEntry = entry
this.roomListEntries.set(entry.room_id, entry)
}
} else if (changedRoomListEntries.size > 0) {
updatedRoomList = this.roomList.current.filter(entry => !changedRoomListEntries.has(entry.room_id))

3
web/src/api/statestore/room.ts
View file

@ -42,7 +42,7 @@ import {
UserID,
roomStateGUIDToString,
} from "../types"
import type { RoomListEntry, StateStore } from "./main.ts"
import type { StateStore } from "./main.ts"
function arraysAreEqual<T>(arr1?: T[], arr2?: T[]): boolean {
if (!arr1 || !arr2) {
@ -126,7 +126,6 @@ export class RoomStateStore {
readUpToRow = -1
hasMoreHistory = true
hidden = false
roomListEntry: RoomListEntry | undefined | null
constructor(meta: DBRoom, private parent: StateStore) {
this.roomID = meta.room_id

2
web/src/ui/roomlist/RoomList.tsx
View file

@ -50,7 +50,7 @@ const RoomList = ({ activeRoomID }: RoomListProps) => {
directSetSpace(space)
client.store.currentRoomListFilter = space
if (client.store.activeRoomID && space) {
const entry = client.store.rooms.get(client.store.activeRoomID)?.roomListEntry
const entry = client.store.roomListEntries.get(client.store.activeRoomID)
if (entry && !space.include(entry)) {
mainScreen.setActiveRoom(null)
}