use correct event type

Signed-off-by: Timo K <[email protected]>

Author: toger5

src/@types/event.ts

@@ -151,6 +151,7 @@ export enum EventType {
     GroupCallMemberPrefix = "org.matrix.msc3401.call.member",
 
     // MatrixRTC events
+    RTCMembership = "org.matrix.msc4143.rtc.member",
     CallNotify = "org.matrix.msc4075.call.notify",
     RTCNotification = "org.matrix.msc4075.rtc.notification",
     RTCDecline = "org.matrix.msc4310.rtc.decline",
@@ -368,12 +369,8 @@ export interface StateEvents {
 
     // MSC3401
     [EventType.GroupCallPrefix]: IGroupCallRoomState;
-    [EventType.GroupCallMemberPrefix]:
-        | IGroupCallRoomMemberState
-        | SessionMembershipData
-        | RtcMembershipData
-        | EmptyObject;
-
+    [EventType.GroupCallMemberPrefix]: IGroupCallRoomMemberState | SessionMembershipData | EmptyObject;
+    [EventType.RTCMembership]: RtcMembershipData | EmptyObject;
     // MSC3089
     [UNSTABLE_MSC3089_BRANCH.name]: MSC3089EventContent;
 

src/matrixrtc/MembershipManager.ts

@@ -463,7 +463,7 @@ export class MembershipManager
                 {
                     delay: this.delayedLeaveEventDelayMs,
                 },
-                EventType.GroupCallMemberPrefix,
+                this.useRtcMemberFormat ? EventType.RTCMembership : EventType.GroupCallMemberPrefix,
                 {}, // leave event
                 this.memberId,
             )
@@ -650,7 +650,7 @@ export class MembershipManager
         return await this.client
             .sendStateEvent(
                 this.room.roomId,
-                EventType.GroupCallMemberPrefix,
+                this.useRtcMemberFormat ? EventType.RTCMembership : EventType.GroupCallMemberPrefix,
                 this.makeMyMembership(this.membershipEventExpiryMs),
                 this.memberId,
             )
@@ -696,7 +696,7 @@ export class MembershipManager
         return await this.client
             .sendStateEvent(
                 this.room.roomId,
-                EventType.GroupCallMemberPrefix,
+                this.useRtcMemberFormat ? EventType.RTCMembership : EventType.GroupCallMemberPrefix,
                 this.makeMyMembership(this.membershipEventExpiryMs * nextExpireUpdateIteration),
                 this.memberId,
             )
@@ -722,7 +722,12 @@ export class MembershipManager
     }
     private async sendFallbackLeaveEvent(): Promise<ActionUpdate> {
         return await this.client
-            .sendStateEvent(this.room.roomId, EventType.GroupCallMemberPrefix, {}, this.memberId)
+            .sendStateEvent(
+                this.room.roomId,
+                this.useRtcMemberFormat ? EventType.RTCMembership : EventType.GroupCallMemberPrefix,
+                {},
+                this.memberId,
+            )
             .then(() => {
                 this.resetRateLimitCounter(MembershipActionType.SendLeaveEvent);
                 this.state.hasMemberStateEvent = false;