Skip to content
Open
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
35 changes: 35 additions & 0 deletions src/app/hooks/useRoomMembers.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { renderHook, waitFor } from '@testing-library/react';
import { describe, expect, it, vi } from 'vitest';
import type { MatrixClient, Room, RoomMember } from '$types/matrix-sdk';

const { hydrateAllRoomMembers } = vi.hoisted(() => ({
hydrateAllRoomMembers: vi.fn<() => Promise<void>>().mockResolvedValue(undefined),
}));

vi.mock('$client/roomMemberHydration', () => ({ hydrateAllRoomMembers }));

import { useRoomMembers } from './useRoomMembers';

describe('useRoomMembers', () => {
it('does not retry with a full roster request when the SDK member load fails', async () => {
const room = {
roomId: '!room:example.org',
getMembers: () => [] as RoomMember[],
loadMembersIfNeeded: vi
.fn<() => Promise<void>>()
.mockRejectedValue(new Error('NetworkError')),
} as unknown as Room;
const mx = {
getRoom: () => room,
on: vi.fn<() => void>(),
removeListener: vi.fn<() => void>(),
} as unknown as MatrixClient;

renderHook(() => useRoomMembers(mx, room.roomId));

await waitFor(() => expect(room.loadMembersIfNeeded).toHaveBeenCalledOnce());
await Promise.resolve();

expect(hydrateAllRoomMembers).not.toHaveBeenCalled();
});
});
6 changes: 4 additions & 2 deletions src/app/hooks/useRoomMembers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ export const useRoomMembers = (mx: MatrixClient, roomId: string, enabled = true)
loadingMembers = false;
if (disposed) return;
updateMemberList();
void hydrateAllRoomMembers(mx, roomId).then(() => updateMemberList());
};
room.loadMembersIfNeeded().then(stopLoading, stopLoading);
room.loadMembersIfNeeded().then(() => {
stopLoading();
void hydrateAllRoomMembers(mx, roomId).then(() => updateMemberList());
}, stopLoading);
}

const handleStateEvent = (event: MatrixEvent) => {
Expand Down
Loading