imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle local events for voice broadcasts (#9561)

Browse source
This commit is contained in:
Michael Weimann 2022-11-09 12:17:54 +01:00 • committed by GitHub
parent 848adfdc10
commit 7fbdd8bb5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/voice-broadcast/models/VoiceBroadcastPlayback.ts
View file

@ -129,12 +129,8 @@ export class VoiceBroadcastPlayback
}
private addChunkEvent = async (event: MatrixEvent): Promise<boolean> => {
const eventId = event.getId();
if (!eventId
|| eventId.startsWith("~!") // don't add local events
|| event.getContent()?.msgtype !== MsgType.Audio // don't add non-audio event
) {
if (event.getContent()?.msgtype !== MsgType.Audio) {
// skip non-audio event
return false;
}

12
src/voice-broadcast/utils/VoiceBroadcastChunkEvents.ts
View file

@ -50,9 +50,12 @@ export class VoiceBroadcastChunkEvents {
}
public includes(event: MatrixEvent): boolean {
return !!this.events.find(e => e.getId() === event.getId());
return !!this.events.find(e => this.equalByTxnIdOrId(event, e));
}
/**
* @returns {number} Length in milliseconds
*/
public getLength(): number {
return this.events.reduce((length: number, event: MatrixEvent) => {
return length + this.calculateChunkLength(event);
@ -93,11 +96,16 @@ export class VoiceBroadcastChunkEvents {
}
private addOrReplaceEvent = (event: MatrixEvent): boolean => {
this.events = this.events.filter(e => e.getId() !== event.getId());
this.events = this.events.filter(e => !this.equalByTxnIdOrId(event, e));
this.events.push(event);
return true;
};
private equalByTxnIdOrId(eventA: MatrixEvent, eventB: MatrixEvent): boolean {
return eventA.getTxnId() && eventB.getTxnId() && eventA.getTxnId() === eventB.getTxnId()
|| eventA.getId() === eventB.getId();
}
/**
* Sort by sequence, if available for all events.
* Else fall back to timestamp.