1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00

Move things we can into a switch statement

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-08-03 09:31:06 +02:00
parent f4e985b5cc
commit 7e0aeb425d

View File

@@ -220,17 +220,6 @@ export class CallEventHandler {
} else { } else {
this.client.emit("Call.incoming", call); this.client.emit("Call.incoming", call);
} }
} else if (event.getType() === EventType.CallAnswer) {
if (!call) {
return;
}
if (event.getSender() === this.client.credentials.userId) {
if (call.state === CallState.Ringing) {
call.onAnsweredElsewhere(content);
}
} else {
call.onAnswerReceived(event);
}
} else if (event.getType() === EventType.CallCandidates) { } else if (event.getType() === EventType.CallCandidates) {
if (event.getSender() === this.client.credentials.userId) { if (event.getSender() === this.client.credentials.userId) {
return; return;
@@ -267,48 +256,40 @@ export class CallEventHandler {
this.calls.delete(content.call_id); this.calls.delete(content.call_id);
} }
} }
} else if (event.getType() === EventType.CallSelectAnswer) {
if (!call) return;
if (event.getContent().party_id === call.ourPartyId) {
// Ignore remote echo
return;
} }
// The following events need a call
if (!call) return;
// Ignore remote echo
if (event.getContent().party_id === call.ourPartyId) return;
switch (event.getType()) {
case EventType.CallAnswer:
if (event.getSender() === this.client.credentials.userId) {
if (call.state === CallState.Ringing) {
call.onAnsweredElsewhere(content);
}
} else {
call.onAnswerReceived(event);
}
break;
case EventType.CallSelectAnswer:
call.onSelectAnswerReceived(event); call.onSelectAnswerReceived(event);
} else if (event.getType() === EventType.CallNegotiate) { break;
if (!call) return;
if (event.getContent().party_id === call.ourPartyId) {
// Ignore remote echo
return;
}
case EventType.CallNegotiate:
call.onNegotiateReceived(event); call.onNegotiateReceived(event);
} else if ( break;
event.getType() === EventType.CallAssertedIdentity ||
event.getType() === EventType.CallAssertedIdentityPrefix
) {
if (!call) return;
if (event.getContent().party_id === call.ourPartyId) {
// Ignore remote echo (not that we send asserted identity, but still...)
return;
}
case EventType.CallAssertedIdentity:
case EventType.CallAssertedIdentityPrefix:
call.onAssertedIdentityReceived(event); call.onAssertedIdentityReceived(event);
} else if ( break;
event.getType() === EventType.CallSDPStreamMetadataChanged ||
event.getType() === EventType.CallSDPStreamMetadataChangedPrefix
) {
if (!call) return;
if (event.getContent().party_id === call.ourPartyId) {
// Ignore remote echo
return;
}
case EventType.CallSDPStreamMetadataChanged:
case EventType.CallSDPStreamMetadataChangedPrefix:
call.onSDPStreamMetadataChangedReceived(event); call.onSDPStreamMetadataChangedReceived(event);
break;
} }
} }
} }