Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/stable-mutual-rooms-endpoint.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Add support for stable mutual rooms endpoint.
9 changes: 7 additions & 2 deletions src/app/components/user-profile/UserChips.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ import { copyToClipboard } from '$utils/dom';
import { getExploreServerPath } from '$pages/pathUtils';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { factoryRoomIdByAtoZ } from '$utils/sort';
import { useMutualRooms, useMutualRoomsSupport } from '$hooks/useMutualRooms';
import {
useMutualRooms,
useMutualRoomsSupport,
useUnstableMutualRoomsSupport,
} from '$hooks/useMutualRooms';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { useDirectRooms } from '$pages/client/direct/useDirectRooms';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
Expand Down Expand Up @@ -352,6 +356,7 @@ export function MutualRoomsChip({
const menuItemBg = chipFillColor ?? cardColor;
const mx = useMatrixClient();
const mutualRoomSupported = useMutualRoomsSupport();
const mutualRoomUnstable = useUnstableMutualRoomsSupport();
const mutualRoomsState = useMutualRooms(userId);
const { navigateRoom, navigateSpace } = useRoomNavigate();
const closeUserRoomProfile = useCloseUserRoomProfile();
Expand Down Expand Up @@ -398,7 +403,7 @@ export function MutualRoomsChip({

if (
userId === mx.getSafeUserId() ||
!mutualRoomSupported ||
(!mutualRoomSupported && !mutualRoomUnstable) ||
mutualRoomsState.status === AsyncStatus.Error
) {
return null;
Expand Down
58 changes: 52 additions & 6 deletions src/app/hooks/useMutualRooms.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { useCallback } from 'react';
import type { MatrixClient } from '$types/matrix-sdk';
import { Method } from '$types/matrix-sdk';
import { useMatrixClient } from './useMatrixClient';
import type { AsyncState } from './useAsyncCallback';
import { useAsyncCallbackValue } from './useAsyncCallback';
import { useSpecVersions } from './useSpecVersions';

export const useMutualRoomsSupport = (): boolean => {
export const useUnstableMutualRoomsSupport = (): boolean => {
const { unstable_features: unstableFeatures } = useSpecVersions();

const supported =
Expand All @@ -15,16 +17,60 @@ export const useMutualRoomsSupport = (): boolean => {
return !!supported;
};

export const useMutualRoomsSupport = (): boolean => {
const { unstable_features: unstableFeatures, versions } = useSpecVersions();

const supported =
versions.includes('v1.19') ||
!!unstableFeatures?.['uk.half-shot.msc2666.query_mutual_rooms.stable'];

return supported;
};

type MutualRoomsOK = {
joined: string[];
next_batch?: string;
count: number;
};

const fetchAllMutualRooms = async (mx: MatrixClient, userId: string): Promise<string[]> => {
const mutualRooms: Set<string> = new Set();

const collectFrom = async (nextBatch?: string): Promise<void> => {
const result = await mx.http.authedRequest<MutualRoomsOK>(
Method.Get,
'/mutual_rooms',
{
user_id: userId,
from: nextBatch,
},
undefined,
{
prefix: '/_matrix/client/v1',
}
);
result.joined.forEach((r) => mutualRooms.add(r));
if (typeof result.next_batch === 'string') {
await collectFrom(result.next_batch);
}
};

await collectFrom();
return Array.from(mutualRooms);
};

export const useMutualRooms = (userId: string): AsyncState<string[]> => {
const mx = useMatrixClient();

const supported = useMutualRoomsSupport();
const unstableSupport = useUnstableMutualRoomsSupport();
const support = useMutualRoomsSupport();

const [mutualRoomsState] = useAsyncCallbackValue(
useCallback(
() => (supported ? mx._unstable_getSharedRooms(userId) : Promise.resolve([])),
[mx, userId, supported]
)
useCallback(() => {
if (support) return fetchAllMutualRooms(mx, userId);
if (unstableSupport) return mx._unstable_getSharedRooms(userId);
return Promise.resolve([]);
}, [mx, userId, unstableSupport, support])
);

return mutualRoomsState;
Expand Down
Loading