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

sonar cubes coaching ;)

Browse Source 
Signed-off-by: Timo K <toger5@hotmail.de>
This commit is contained in:
Timo K
2025-10-07 18:31:38 +02:00
parent 383b219f94
commit 3c2f9b48b0
9 changed files with 151 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/matrixrtc/MatrixRTCSession.ts
View File

@@ -349,37 +349,40 @@ export class MatrixRTCSession extends TypedEventEmitter<
const callMemberEvents = roomState.getStateEvents(EventType.GroupCallMemberPrefix);
const callMemberships: CallMembership[] = [];
const createMembership = async (memberEvent: MatrixEvent): Promise<CallMembership | undefined> => {
const relatedEventId = memberEvent.relationEventId;
const fetchRelatedEvent = async (): Promise<MatrixEvent | undefined> => {
const eventData = await client
.fetchRoomEvent(room.roomId, relatedEventId!)
.catch((e) => logger.error(`Could not get related event ${relatedEventId} for call membership`, e));
return eventData ? new MatrixEvent(eventData) : undefined;
};
const relatedEvent = relatedEventId
? (room.findEventById(relatedEventId) ?? (await fetchRelatedEvent()))
: undefined;
let membership = undefined;
try {
membership = new CallMembership(memberEvent, relatedEvent);
} catch (e) {
logger.warn("Couldn't construct call membership: ", e);
return undefined;
}
// static check for newly created memberships
if (!deepCompare(membership.slotDescription, slotDescription)) {
logger.info(
`Ignoring membership of user ${membership.sender} for a different session: ${JSON.stringify(membership.slotDescription)}`,
);
return undefined;
}
return membership;
};
for (const memberEvent of callMemberEvents) {
let membership = existingMemberships?.find((m) => m.eventId === memberEvent.getId());
if (!membership) {
const relatedEventId = memberEvent.relationEventId;
const getRelatedMatrixEvent = async (): Promise<MatrixEvent | undefined> => {
const eventData = await client
.fetchRoomEvent(room.roomId, relatedEventId!)
.catch((e) =>
logger.error(`Could not get related event ${relatedEventId} for call membership`, e),
);
return eventData ? new MatrixEvent(eventData) : undefined;
};
const relatedEvent = relatedEventId
? (room.findEventById(relatedEventId) ?? (await getRelatedMatrixEvent()))
: undefined;
try {
membership = new CallMembership(memberEvent, relatedEvent);
} catch (e) {
logger.warn("Couldn't construct call membership: ", e);
continue;
}
// static check for newly created memberships
if (!deepCompare(membership.slotDescription, slotDescription)) {
logger.info(
`Ignoring membership of user ${membership.sender} for a different session: ${JSON.stringify(membership.slotDescription)}`,
);
continue;
}
}
if (!membership) membership = await createMembership(memberEvent);
if (!membership) continue;
// Dynamic checks for all (including existing) memberships
if (membership.isExpired()) {
@@ -394,7 +397,7 @@ export class MatrixRTCSession extends TypedEventEmitter<
}
callMemberships.sort((a, b) => a.createdTs() - b.createdTs());
if (callMemberships.length > 1) {
if (callMemberships.length >= 1) {
logger.debug(
`Call memberships in room ${room.roomId}, in order: `,
callMemberships.map((m) => [m.createdTs(), m.sender]),
@@ -814,7 +817,7 @@ export class MatrixRTCSession extends TypedEventEmitter<
*
* This function should be called when the room members or call memberships might have changed.
*/
private recalculateSessionMembers = async (): Promise<void> => {
private async recalculateSessionMembers(): Promise<void> {
const oldMemberships = this.memberships;
const newMemberships = await MatrixRTCSession.sessionMembershipsForSlot(
this.room,
@@ -863,5 +866,5 @@ export class MatrixRTCSession extends TypedEventEmitter<
void this.encryptionManager?.onMembershipsUpdate(oldMemberships);
this.setExpiryTimer();
};
}
}