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

Use a Set instead of an Array 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-06-01 16:28:57 +02:00
parent 9db280bbe6
commit 6b9e2042c3
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/structures/CallEventGrouper.ts
View File

@ -39,7 +39,7 @@ export enum CustomCallState {
} }
export default class CallEventGrouper extends EventEmitter { export default class CallEventGrouper extends EventEmitter {
events: Array<MatrixEvent> = []; events: Set<MatrixEvent> = new Set<MatrixEvent>();
call: MatrixCall; call: MatrixCall;
state: CallState | CustomCallState; state: CallState | CustomCallState;
@ -50,7 +50,7 @@ export default class CallEventGrouper extends EventEmitter {
} }
private get invite(): MatrixEvent { private get invite(): MatrixEvent {
return this.events.find((event) => event.getType() === EventType.CallInvite); return [...this.events].find((event) => event.getType() === EventType.CallInvite);
} }
public answerCall = () => { public answerCall = () => {
@ -65,7 +65,7 @@ export default class CallEventGrouper extends EventEmitter {
defaultDispatcher.dispatch({ defaultDispatcher.dispatch({
action: 'place_call', action: 'place_call',
type: this.isVoice ? CallType.Voice : CallType.Video, type: this.isVoice ? CallType.Voice : CallType.Video,
room_id: this.events[0]?.getRoomId(), room_id: [...this.events][0]?.getRoomId(),
}); });
} }
@ -89,14 +89,14 @@ export default class CallEventGrouper extends EventEmitter {
} }
public getHangupReason(): string | null { public getHangupReason(): string | null {
return this.events.find((event) => event.getType() === EventType.CallHangup)?.getContent()?.reason; return [...this.events].find((event) => event.getType() === EventType.CallHangup)?.getContent()?.reason;
} }
/** /**
* Returns true if there are only events from the other side - we missed the call * Returns true if there are only events from the other side - we missed the call
*/ */
private wasThisCallMissed(): boolean { private wasThisCallMissed(): boolean {
return !this.events.some((event) => event.sender?.userId === MatrixClientPeg.get().getUserId()); return ![...this.events].some((event) => event.sender?.userId === MatrixClientPeg.get().getUserId());
} }
private setCallListeners() { private setCallListeners() {
@ -108,7 +108,7 @@ export default class CallEventGrouper extends EventEmitter {
if (SUPPORTED_STATES.includes(this.call?.state)) { if (SUPPORTED_STATES.includes(this.call?.state)) {
this.state = this.call.state; this.state = this.call.state;
} else { } else {
const lastEvent = this.events[this.events.length - 1]; const lastEvent = [...this.events][this.events.size - 1];
const lastEventType = lastEvent.getType(); const lastEventType = lastEvent.getType();
if (this.wasThisCallMissed()) this.state = CustomCallState.Missed; if (this.wasThisCallMissed()) this.state = CustomCallState.Missed;
@ -120,7 +120,7 @@ export default class CallEventGrouper extends EventEmitter {
} }
private setCall = () => { private setCall = () => {
const callId = this.events[0].getContent().call_id; const callId = [...this.events][0].getContent().call_id;
if (!this.call) { if (!this.call) {
this.call = CallHandler.sharedInstance().getCallById(callId); this.call = CallHandler.sharedInstance().getCallById(callId);
this.setCallListeners(); this.setCallListeners();
@ -129,7 +129,7 @@ export default class CallEventGrouper extends EventEmitter {
} }
public add(event: MatrixEvent) { public add(event: MatrixEvent) {
this.events.push(event); this.events.add(event);
this.setState(); this.setState();
} }
} }