mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1002 from vector-im/bwindels/calls-terminate-fixes

Browse Source 
calls terminate fixes
This commit is contained in:
Bruno Windels 2023-01-26 09:47:51 +01:00 committed by GitHub
commit f8a8e65908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/matrix/calls/group/GroupCall.ts
View File

@ -140,7 +140,7 @@ export class GroupCall extends EventEmitter<{change: never}> {
get members(): BaseObservableMap<string, Member> { return this._members; } get members(): BaseObservableMap<string, Member> { return this._members; }
get isTerminated(): boolean { get isTerminated(): boolean {
return this.callContent?.["m.terminated"] === true; return !!this.callContent?.["m.terminated"];
} }
get isRinging(): boolean { get isRinging(): boolean {
@ -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}); const request = this.options.hsApi.sendState(this.roomId, EventType.GroupCallMember, this.options.ownUserId, memberContent, {log});
await request.response(); await request.response();
// our own user isn't included in members, so not in the count // 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); await this.terminate(log);
} }
} else { } else {

6
src/platform/web/ui/css/themes/element/call.css
View File

@ -25,11 +25,13 @@ limitations under the License.
} }
.CallView_error { .CallView_error {
color: red;
font-weight: bold;
align-self: start; align-self: start;
justify-self: center; justify-self: center;
margin: 16px; 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 { .CallView_members {