OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `ScalarMessaging.ts`

pull/28466/head
Florian Duros 2024-11-14 17:59:52 +01:00
parent 6bf06da02c
commit de765bb51b
No known key found for this signature in database
GPG Key ID: A5BBB4041B493F15
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ScalarMessaging.ts
View File

@ -514,7 +514,7 @@ function getWidgets(event: MessageEvent<any>, roomId: string | null): void {
sendResponse(event, widgetStateEvents); sendResponse(event, widgetStateEvents);
} }
function getRoomEncState(event: MessageEvent<any>, roomId: string): void { async function getRoomEncState(event: MessageEvent<any>, roomId: string): Promise<void> {
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
if (!client) { if (!client) {
sendError(event, _t("widget|error_need_to_be_logged_in")); sendError(event, _t("widget|error_need_to_be_logged_in"));
@ -525,7 +525,7 @@ function getRoomEncState(event: MessageEvent<any>, roomId: string): void {
sendError(event, _t("scalar|error_room_unknown")); sendError(event, _t("scalar|error_room_unknown"));
return; return;
} }
const roomIsEncrypted = MatrixClientPeg.safeGet().isRoomEncrypted(roomId); const roomIsEncrypted = Boolean(await client.getCrypto()?.isEncryptionEnabledInRoom(roomId));
sendResponse(event, roomIsEncrypted); sendResponse(event, roomIsEncrypted);
} }
@ -841,7 +841,7 @@ async function readEvents(
} }
} }
const onMessage = function (event: MessageEvent<any>): void { const onMessage = async function (event: MessageEvent<any>): Promise<void> {
if (!event.origin) { if (!event.origin) {
// @ts-ignore - stupid chrome // @ts-ignore - stupid chrome
event.origin = event.originalEvent.origin; event.origin = event.originalEvent.origin;
@ -928,7 +928,7 @@ const onMessage = function (event: MessageEvent<any>): void {
getMembershipCount(event, roomId); getMembershipCount(event, roomId);
return; return;
} else if (event.data.action === Action.GetRoomEncryptionState) { } else if (event.data.action === Action.GetRoomEncryptionState) {
getRoomEncState(event, roomId); await getRoomEncState(event, roomId);
return; return;
} else if (event.data.action === Action.CanSendEvent) { } else if (event.data.action === Action.CanSendEvent) {
canSendEvent(event, roomId); canSendEvent(event, roomId);