matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-12-22 09:02:11 +03:00
Code Activity

Update MSC3827 implementation to not change the default behaviour (#8936)

Browse Source
This commit is contained in:
Šimon Brandner
2022-06-29 18:37:23 +02:00
committed by GitHub
parent 3c14d93237
commit 68c94c6400
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/dialogs/spotlight/SpotlightDialog.tsx
View File

@@ -103,12 +103,9 @@ function refIsForRecentlyViewed(ref: RefObject<HTMLElement>): boolean {
return ref.current?.id?.startsWith("mx_SpotlightDialog_button_recentlyViewed_") === true; return ref.current?.id?.startsWith("mx_SpotlightDialog_button_recentlyViewed_") === true;
} }
function getRoomTypes(showRooms: boolean, showSpaces: boolean): Set<RoomType | null> | null { function getRoomTypes(showRooms: boolean, showSpaces: boolean): Set<RoomType | null> {
const roomTypes = new Set<RoomType | null>(); const roomTypes = new Set<RoomType | null>();
// This is what servers not implementing MSC3827 are expecting
if (showRooms && !showSpaces) return null;
if (showRooms) roomTypes.add(null); if (showRooms) roomTypes.add(null);
if (showSpaces) roomTypes.add(RoomType.Space); if (showSpaces) roomTypes.add(RoomType.Space);

4
src/hooks/usePublicRoomDirectory.ts
View File

@@ -91,7 +91,9 @@ export const usePublicRoomDirectory = () => {
if (query || roomTypes) { if (query || roomTypes) {
opts.filter = { opts.filter = {
"generic_search_term": query, "generic_search_term": query,
"org.matrix.msc3827.room_types": roomTypes ? Array.from<RoomType | null>(roomTypes) : null, "org.matrix.msc3827.room_types": await MatrixClientPeg.get().doesServerSupportUnstableFeature(
"org.matrix.msc3827",
) ? Array.from<RoomType | null>(roomTypes) : null,
}; };
} }