OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove tag specificity from notification states 

We don't need this complexity now that we aren't doing per-tag logic.
pull/21833/head
Travis Ralston 2020-07-21 19:59:17 -06:00
parent 928acbdc11
commit 6a29cd33c1
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/stores/notifications/RoomNotificationStateStore.ts
View File

@ -22,15 +22,12 @@ import { FetchRoomFn, ListNotificationState } from "./ListNotificationState";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { RoomNotificationState } from "./RoomNotificationState"; import { RoomNotificationState } from "./RoomNotificationState";
const INSPECIFIC_TAG = "INSPECIFIC_TAG";
type INSPECIFIC_TAG = "INSPECIFIC_TAG";
interface IState {} interface IState {}
export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> { export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
private static internalInstance = new RoomNotificationStateStore(); private static internalInstance = new RoomNotificationStateStore();
private roomMap = new Map<Room, Map<TagID | INSPECIFIC_TAG, RoomNotificationState>>(); private roomMap = new Map<Room, RoomNotificationState>();
private constructor() { private constructor() {
super(defaultDispatcher, {}); super(defaultDispatcher, {});
@ -49,7 +46,7 @@ export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
// TODO: Update if/when invites move out of the room list. // TODO: Update if/when invites move out of the room list.
const useTileCount = tagId === DefaultTagID.Invite; const useTileCount = tagId === DefaultTagID.Invite;
const getRoomFn: FetchRoomFn = (room: Room) => { const getRoomFn: FetchRoomFn = (room: Room) => {
return this.getRoomState(room, tagId); return this.getRoomState(room);
}; };
return new ListNotificationState(useTileCount, tagId, getRoomFn); return new ListNotificationState(useTileCount, tagId, getRoomFn);
} }
@ -59,22 +56,13 @@ export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
* attempt to destroy the returned state as it may be shared with other * attempt to destroy the returned state as it may be shared with other
* consumers. * consumers.
* @param room The room to get the notification state for. * @param room The room to get the notification state for.
* @param inTagId Optional tag ID to scope the notification state to.
* @returns The room's notification state. * @returns The room's notification state.
*/ */
public getRoomState(room: Room, inTagId?: TagID): RoomNotificationState { public getRoomState(room: Room): RoomNotificationState {
if (!this.roomMap.has(room)) { if (!this.roomMap.has(room)) {
this.roomMap.set(room, new Map<TagID | INSPECIFIC_TAG, RoomNotificationState>()); this.roomMap.set(room, new RoomNotificationState(room));
} }
return this.roomMap.get(room);
const targetTag = inTagId ? inTagId : INSPECIFIC_TAG;
const forRoomMap = this.roomMap.get(room);
if (!forRoomMap.has(targetTag)) {
forRoomMap.set(inTagId ? inTagId : INSPECIFIC_TAG, new RoomNotificationState(room));
}
return forRoomMap.get(targetTag);
} }
public static get instance(): RoomNotificationStateStore { public static get instance(): RoomNotificationStateStore {
@ -82,10 +70,8 @@ export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
} }
protected async onNotReady(): Promise<any> { protected async onNotReady(): Promise<any> {
for (const roomMap of this.roomMap.values()) { for (const roomState of this.roomMap.values()) {
for (const roomState of roomMap.values()) { roomState.destroy();
roomState.destroy();
}
} }
} }