Make it possible in-code to hide rooms from the room list
Fixes https://github.com/vector-im/element-web/issues/15745 This was surprisingly easy given the number of errors I remember last time, but here it is. This also includes an over-engineered VisibilityProvider with the intention that it'll get used in the future for things like Spaces and other X as Rooms stuff.
This commit is contained in:
parent
1db130b8f0
commit
b9af446c1b
4 changed files with 112 additions and 1 deletions
45
src/customisations/RoomList.ts
Normal file
45
src/customisations/RoomList.ts
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2020 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Room } from "matrix-js-sdk/src/models/room";
|
||||||
|
|
||||||
|
// Populate this file with the details of your customisations when copying it.
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines if a room is visible in the room list or not. By default,
|
||||||
|
* all rooms are visible. Where special handling is performed by Element,
|
||||||
|
* those rooms will not be able to override their visibility in the room
|
||||||
|
* list - Element will make the decision without calling this function.
|
||||||
|
*
|
||||||
|
* This function should be as fast as possible to avoid slowing down the
|
||||||
|
* client.
|
||||||
|
* @param {Room} room The room to check the visibility of.
|
||||||
|
* @returns {boolean} True if the room should be visible, false otherwise.
|
||||||
|
*/
|
||||||
|
function isRoomVisible(room: Room): boolean {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// This interface summarises all available customisation points and also marks
|
||||||
|
// them all as optional. This allows customisers to only define and export the
|
||||||
|
// customisations they need while still maintaining type safety.
|
||||||
|
export interface IRoomListCustomisations {
|
||||||
|
isRoomVisible?: typeof isRoomVisible;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A real customisation module will define and export one or more of the
|
||||||
|
// customisation points that make up the interface above.
|
||||||
|
export const RoomListCustomisations: IRoomListCustomisations = {};
|
|
@ -34,6 +34,7 @@ import { MarkedExecution } from "../../utils/MarkedExecution";
|
||||||
import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
|
import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
|
||||||
import { NameFilterCondition } from "./filters/NameFilterCondition";
|
import { NameFilterCondition } from "./filters/NameFilterCondition";
|
||||||
import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
|
import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
|
||||||
|
import { VisibilityProvider } from "./filters/VisibilityProvider";
|
||||||
|
|
||||||
interface IState {
|
interface IState {
|
||||||
tagsEnabled?: boolean;
|
tagsEnabled?: boolean;
|
||||||
|
@ -544,7 +545,8 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
|
||||||
public async regenerateAllLists({trigger = true}) {
|
public async regenerateAllLists({trigger = true}) {
|
||||||
console.warn("Regenerating all room lists");
|
console.warn("Regenerating all room lists");
|
||||||
|
|
||||||
const rooms = this.matrixClient.getVisibleRooms();
|
const rooms = this.matrixClient.getVisibleRooms()
|
||||||
|
.filter(r => VisibilityProvider.instance.isRoomVisible(r));
|
||||||
const customTags = new Set<TagID>();
|
const customTags = new Set<TagID>();
|
||||||
if (this.state.tagsEnabled) {
|
if (this.state.tagsEnabled) {
|
||||||
for (const room of rooms) {
|
for (const room of rooms) {
|
||||||
|
|
|
@ -34,6 +34,7 @@ import { EffectiveMembership, getEffectiveMembership, splitRoomsByMembership } f
|
||||||
import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
|
import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
|
||||||
import { getListAlgorithmInstance } from "./list-ordering";
|
import { getListAlgorithmInstance } from "./list-ordering";
|
||||||
import SettingsStore from "../../../settings/SettingsStore";
|
import SettingsStore from "../../../settings/SettingsStore";
|
||||||
|
import { VisibilityProvider } from "../filters/VisibilityProvider";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fired when the Algorithm has determined a list has been updated.
|
* Fired when the Algorithm has determined a list has been updated.
|
||||||
|
@ -188,6 +189,10 @@ export class Algorithm extends EventEmitter {
|
||||||
// Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
|
// Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
|
||||||
// otherwise we risk duplicating rooms.
|
// otherwise we risk duplicating rooms.
|
||||||
|
|
||||||
|
if (val && !VisibilityProvider.instance.isRoomVisible(val)) {
|
||||||
|
val = null; // the room isn't visible - lie to the rest of this function
|
||||||
|
}
|
||||||
|
|
||||||
// Set the last sticky room to indicate that we're in a change. The code throughout the
|
// Set the last sticky room to indicate that we're in a change. The code throughout the
|
||||||
// class can safely handle a null room, so this should be safe to do as a backup.
|
// class can safely handle a null room, so this should be safe to do as a backup.
|
||||||
this._lastStickyRoom = this._stickyRoom || <IStickyRoom>{};
|
this._lastStickyRoom = this._stickyRoom || <IStickyRoom>{};
|
||||||
|
|
59
src/stores/room-list/filters/VisibilityProvider.ts
Normal file
59
src/stores/room-list/filters/VisibilityProvider.ts
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2020 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import {Room} from "matrix-js-sdk/src/models/room";
|
||||||
|
import { RoomListCustomisations } from "../../../customisations/RoomList";
|
||||||
|
|
||||||
|
export class VisibilityProvider {
|
||||||
|
private static internalInstance: VisibilityProvider;
|
||||||
|
|
||||||
|
private constructor() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static get instance(): VisibilityProvider {
|
||||||
|
if (!VisibilityProvider.internalInstance) {
|
||||||
|
VisibilityProvider.internalInstance = new VisibilityProvider();
|
||||||
|
}
|
||||||
|
return VisibilityProvider.internalInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public isRoomVisible(room: Room): boolean {
|
||||||
|
let isVisible = true; // Returned at the end of this function
|
||||||
|
let forced = false; // When true, this function won't bother calling the customisation points
|
||||||
|
|
||||||
|
// ------
|
||||||
|
// TODO: The `if` statements to control visibility of custom room types
|
||||||
|
// would go here. The remainder of this function assumes that the statements
|
||||||
|
// will be here.
|
||||||
|
|
||||||
|
// An example of how the `if` statements mentioned above would look follows.
|
||||||
|
// A real check would probably check for a `type` or something instead of the room ID.
|
||||||
|
// Note: the room ID here is intentionally invalid to prevent accidental hiding of someone's room.
|
||||||
|
// TODO: Remove this statement once we have a statement to replace it (just keeping the reference count up)
|
||||||
|
if (room.roomId === '~!JFmkoouJANxFGtmMYC:localhost') {
|
||||||
|
isVisible = false;
|
||||||
|
forced = true;
|
||||||
|
}
|
||||||
|
// ------
|
||||||
|
|
||||||
|
const isVisibleFn = RoomListCustomisations.isRoomVisible;
|
||||||
|
if (!forced && isVisibleFn) {
|
||||||
|
isVisible = isVisibleFn(room);
|
||||||
|
}
|
||||||
|
|
||||||
|
return isVisible;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue