Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show a dialog when Jitsi encounters an error #8701

Merged
merged 3 commits into from
May 26, 2022
Merged

Show a dialog when Jitsi encounters an error #8701

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1905108
Show a dialog when Jitsi encounters an error
robintown May 25, 2022
881c4d7
Capitalize 'Meet'
robintown May 25, 2022
72b0260
Revise copy to not mention Jitsi
robintown May 26, 2022
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
2 changes: 2 additions & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,8 @@
"The person who invited you has already left.": "The person who invited you has already left.",
"The person who invited you has already left, or their server is offline.": "The person who invited you has already left, or their server is offline.",
"Failed to join": "Failed to join",
"Connection lost": "Connection lost",
"Jitsi Meet encountered an error: %(message)s": "Jitsi Meet encountered an error: %(message)s",
"All rooms": "All rooms",
"Home": "Home",
"Favourites": "Favourites",
Expand Down
6 changes: 6 additions & 0 deletions src/stores/widgets/ElementWidgetActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ export enum ElementWidgetActions {
ViewRoom = "io.element.view_room",
}

export interface IHangupCallApiRequest extends IWidgetApiRequest {
data: {
errorMessage?: string;
};
}

/**
* @deprecated Use MSC2931 instead
*/
Expand Down
20 changes: 19 additions & 1 deletion src/stores/widgets/StopGapWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
import { logger } from "matrix-js-sdk/src/logger";
import { ClientEvent } from "matrix-js-sdk/src/client";

import { _t } from "../../languageHandler";
import { StopGapWidgetDriver } from "./StopGapWidgetDriver";
import { WidgetMessagingStore } from "./WidgetMessagingStore";
import { RoomViewStore } from "../RoomViewStore";
Expand All @@ -50,7 +51,7 @@ import ActiveWidgetStore from "../ActiveWidgetStore";
import { objectShallowClone } from "../../utils/objects";
import defaultDispatcher from "../../dispatcher/dispatcher";
import { Action } from "../../dispatcher/actions";
import { ElementWidgetActions, IViewRoomApiRequest } from "./ElementWidgetActions";
import { ElementWidgetActions, IHangupCallApiRequest, IViewRoomApiRequest } from "./ElementWidgetActions";
import { ModalWidgetStore } from "../ModalWidgetStore";
import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
import { getCustomTheme } from "../../theme";
Expand All @@ -60,6 +61,8 @@ import { getUserLanguage } from "../../languageHandler";
import { WidgetVariableCustomisations } from "../../customisations/WidgetVariables";
import { arrayFastClone } from "../../utils/arrays";
import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
import Modal from "../../Modal";
import ErrorDialog from "../../components/views/dialogs/ErrorDialog";

// TODO: Destroy all of this code

Expand Down Expand Up @@ -367,6 +370,21 @@ export class StopGapWidget extends EventEmitter {
},
);
}

if (WidgetType.JITSI.matches(this.mockWidget.type)) {
this.messaging.on(`action:${ElementWidgetActions.HangupCall}`,
(ev: CustomEvent<IHangupCallApiRequest>) => {
if (ev.detail.data?.errorMessage) {
Modal.createTrackedDialog("Connection lost", "", ErrorDialog, {
title: _t("Connection lost"),
description: _t("Jitsi Meet encountered an error: %(message)s", {
message: ev.detail.data.errorMessage,
}),
});
}
},
);
}
}

public async prepare(): Promise<void> {
Expand Down