Split MatrixLivekitMembers more verbosely into two types

src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts

@@ -21,30 +21,44 @@ import { generateItemsWithEpoch } from "../../../utils/observable";
 
 const logger = rootLogger.getChild("[MatrixLivekitMembers]");
 
-/**
- * A dynamic participant value with a static tag to tell what kind of
- * participant it can be (local vs. remote).
- */
+interface LocalTaggedParticipant {
+  type: "local";
+  value$: Behavior<LocalParticipant | null>;
+}
+interface RemoteTaggedParticipant {
+  type: "remote";
+  value$: Behavior<RemoteParticipant | null>;
+}
 export type TaggedParticipant =
-  | { type: "local"; value$: Behavior<LocalParticipant | null> }
-  | { type: "remote"; value$: Behavior<RemoteParticipant | null> };
+  | LocalTaggedParticipant
+  | RemoteTaggedParticipant;
 
-/**
- * Represents a Matrix call member and their associated LiveKit participation.
- * `livekitParticipant` can be undefined if the member is not yet connected to the livekit room
- * or if it has no livekit transport at all.
- */
-export interface MatrixLivekitMember<
-  ParticipantType extends TaggedParticipant["type"],
-> {
+interface MatrixLivekitMember {
   membership$: Behavior<CallMembership>;
-  participant: TaggedParticipant & { type: ParticipantType };
   connection$: Behavior<Connection | null>;
   // participantId: string; We do not want a participantId here since it will be generated by the jwt
   // TODO decide if we can also drop the userId. Its in the matrix membership anyways.
   userId: string;
 }
 
+/**
+ * Represents the local Matrix call member and their associated LiveKit participation.
+ * `livekitParticipant` can be null if the member is not yet connected to the livekit room
+ * or if it has no livekit transport at all.
+ */
+export interface LocalMatrixLivekitMember extends MatrixLivekitMember {
+  participant: LocalTaggedParticipant;
+}
+
+/**
+ * Represents a remote Matrix call member and their associated LiveKit participation.
+ * `livekitParticipant` can be null if the member is not yet connected to the livekit room
+ * or if it has no livekit transport at all.
+ */
+export interface RemoteMatrixLivekitMember extends MatrixLivekitMember {
+  participant: RemoteTaggedParticipant;
+}
+
 interface Props {
   scope: ObservableScope;
   membershipsWithTransport$: Behavior<
@@ -66,7 +80,7 @@ export function createMatrixLivekitMembers$({
   scope,
   membershipsWithTransport$,
   connectionManager,
-}: Props): Behavior<Epoch<MatrixLivekitMember<"remote">[]>> {
+}: Props): Behavior<Epoch<RemoteMatrixLivekitMember[]>> {
   /**
    * Stream of all the call members and their associated livekit data (if available).
    */