From e140a4ba64f54a4f897aa8ff8367c9047bffb091 Mon Sep 17 00:00:00 2001 From: Bruno Windels <274386+bwindels@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:06:06 +0100 Subject: [PATCH 1/3] element call puts string in terminated, not a boolean --- src/matrix/calls/group/GroupCall.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/matrix/calls/group/GroupCall.ts b/src/matrix/calls/group/GroupCall.ts index 0b8c7db5..d323f6b2 100644 --- a/src/matrix/calls/group/GroupCall.ts +++ b/src/matrix/calls/group/GroupCall.ts @@ -140,7 +140,7 @@ export class GroupCall extends EventEmitter<{change: never}> { get members(): BaseObservableMap { return this._members; } get isTerminated(): boolean { - return this.callContent?.["m.terminated"] === true; + return !!this.callContent?.["m.terminated"]; } get isRinging(): boolean { From 043ad988669842d8ea71d822714af0263fcb9a62 Mon Sep 17 00:00:00 2001 From: Bruno Windels <274386+bwindels@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:06:24 +0100 Subject: [PATCH 2/3] element call also terminates prompt calls, so do so too --- src/matrix/calls/group/GroupCall.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/matrix/calls/group/GroupCall.ts b/src/matrix/calls/group/GroupCall.ts index d323f6b2..6407584a 100644 --- a/src/matrix/calls/group/GroupCall.ts +++ b/src/matrix/calls/group/GroupCall.ts @@ -286,7 +286,7 @@ export class GroupCall extends EventEmitter<{change: never}> { const request = this.options.hsApi.sendState(this.roomId, EventType.GroupCallMember, this.options.ownUserId, memberContent, {log}); await request.response(); // our own user isn't included in members, so not in the count - if (this.intent === CallIntent.Ring && this._members.size === 0) { + if ((this.intent === CallIntent.Ring || this.intent === CallIntent.Prompt) && this._members.size === 0) { await this.terminate(log); } } else { From 7f422882dd0ed52e3df418318ed42f999fe252dc Mon Sep 17 00:00:00 2001 From: Bruno Windels <274386+bwindels@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:08:38 +0100 Subject: [PATCH 3/3] make call error view clickable above video elements --- src/platform/web/ui/css/themes/element/call.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/platform/web/ui/css/themes/element/call.css b/src/platform/web/ui/css/themes/element/call.css index c0f1550e..3efe3c56 100644 --- a/src/platform/web/ui/css/themes/element/call.css +++ b/src/platform/web/ui/css/themes/element/call.css @@ -25,11 +25,13 @@ limitations under the License. } .CallView_error { - color: red; - font-weight: bold; align-self: start; justify-self: center; margin: 16px; + /** Chrome (v100) requires this to make the buttons clickable + * where they overlap with the video element, even though + * the buttons come later in the DOM. */ + z-index: 1; } .CallView_members {