imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show error when searching public rooms fails (#11378)

Browse source 
* Show error when searching public rooms fails

* Fix types

* Improve test coverage

* Improve coverage
This commit is contained in:
Michael Telatynski 2023-08-08 15:08:17 +01:00 • committed by GitHub
parent b5bfc5be21
commit 2b17fc3221
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 63 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/hooks/usePublicRoomDirectory.ts
View file

@ -51,6 +51,7 @@ export const usePublicRoomDirectory = (): {
config?: IPublicRoomDirectoryConfig | null;
setConfig(config: IPublicRoomDirectoryConfig | null): void;
search(opts: IPublicRoomsOpts): Promise<boolean>;
error?: Error | true; // true if an unknown error is encountered
} => {
const [publicRooms, setPublicRooms] = useState<IPublicRoomsChunkRoom[]>([]);
@ -60,6 +61,7 @@ export const usePublicRoomDirectory = (): {
const [ready, setReady] = useState(false);
const [loading, setLoading] = useState(false);
const [error, setError] = useState<Error | true | undefined>();
const [updateQuery, updateResult] = useLatestResult<IRoomDirectoryOptions, IPublicRoomsChunkRoom[]>(setPublicRooms);
@ -112,12 +114,14 @@ export const usePublicRoomDirectory = (): {
}
updateQuery(opts);
setLoading(true);
setError(undefined);
try {
setLoading(true);
const { chunk } = await MatrixClientPeg.safeGet().publicRooms(opts);
updateResult(opts, showNsfwPublicRooms ? chunk : chunk.filter(cheapNsfwFilter));
return true;
} catch (e) {
setError(e instanceof Error ? e : true);
console.error("Could not fetch public rooms for params", opts, e);
updateResult(opts, []);
return false;
@ -183,5 +187,6 @@ export const usePublicRoomDirectory = (): {
config,
search,
setConfig,
error,
} as const;
};