From 63d95706e9fe20b8ce5dbc30abada716efcfa79a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 19 Feb 2021 12:58:23 +0000 Subject: [PATCH] Create setHasDiff helper and use it The usage here is identical to how it'll work in Spaces --- .../filters/CommunityFilterCondition.ts | 15 ++++---- src/utils/sets.ts | 34 +++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 src/utils/sets.ts diff --git a/src/stores/room-list/filters/CommunityFilterCondition.ts b/src/stores/room-list/filters/CommunityFilterCondition.ts index 924a85e86a..fbdfefb983 100644 --- a/src/stores/room-list/filters/CommunityFilterCondition.ts +++ b/src/stores/room-list/filters/CommunityFilterCondition.ts @@ -19,17 +19,17 @@ import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondi import { Group } from "matrix-js-sdk/src/models/group"; import { EventEmitter } from "events"; import GroupStore from "../../GroupStore"; -import { arrayHasDiff } from "../../../utils/arrays"; import { IDestroyable } from "../../../utils/IDestroyable"; import DMRoomMap from "../../../utils/DMRoomMap"; +import { setHasDiff } from "../../../utils/sets"; /** * A filter condition for the room list which reveals rooms which * are a member of a given community. */ export class CommunityFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable { - private roomIds: string[] = []; - private userIds: string[] = []; + private roomIds = new Set(); + private userIds = new Set(); constructor(private community: Group) { super(); @@ -45,19 +45,18 @@ export class CommunityFilterCondition extends EventEmitter implements IFilterCon } public isVisible(room: Room): boolean { - return this.roomIds.includes(room.roomId) || - this.userIds.includes(DMRoomMap.shared().getUserIdForRoomId(room.roomId)); + return this.roomIds.has(room.roomId) || this.userIds.has(DMRoomMap.shared().getUserIdForRoomId(room.roomId)); } private onStoreUpdate = async (): Promise => { // We don't actually know if the room list changed for the community, so just check it again. const beforeRoomIds = this.roomIds; - this.roomIds = (await GroupStore.getGroupRooms(this.community.groupId)).map(r => r.roomId); + this.roomIds = new Set((await GroupStore.getGroupRooms(this.community.groupId)).map(r => r.roomId)); const beforeUserIds = this.userIds; - this.userIds = (await GroupStore.getGroupMembers(this.community.groupId)).map(u => u.userId); + this.userIds = new Set((await GroupStore.getGroupMembers(this.community.groupId)).map(u => u.userId)); - if (arrayHasDiff(beforeRoomIds, this.roomIds) || arrayHasDiff(beforeUserIds, this.userIds)) { + if (setHasDiff(beforeRoomIds, this.roomIds) || setHasDiff(beforeUserIds, this.userIds)) { this.emit(FILTER_CHANGED); } }; diff --git a/src/utils/sets.ts b/src/utils/sets.ts new file mode 100644 index 0000000000..e5427b2e94 --- /dev/null +++ b/src/utils/sets.ts @@ -0,0 +1,34 @@ +/* +Copyright 2021 The Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +/** + * Determines if two sets are different through a shallow comparison. + * @param a The first set. Must be defined. + * @param b The second set. Must be defined. + * @returns True if they are different, false otherwise. + */ +export function setHasDiff(a: Set, b: Set): boolean { + if (a.size === b.size) { + // When the lengths are equal, check to see if either set is missing an element from the other. + if (Array.from(b).some(i => !a.has(i))) return true; + if (Array.from(a).some(i => !b.has(i))) return true; + + // if all the keys are common, say so + return false; + } else { + return true; // different lengths means they are naturally diverged + } +}