Merge tag 'v4.12.2' into lotus

src/app/components/CallEmbedProvider.tsx

@@ -111,11 +111,14 @@ function IncomingCall({ dm, info, onIgnore, onAnswer, onReject }: IncomingCallPr
   const session = useCallSession(room);
   useCallMembersChange(
     session,
-    useCallback(() => {
-      if (session.memberships.length === 0) {
-        onIgnore();
-      }
-    }, [session, onIgnore]),
+    useCallback(
+      (members) => {
+        if (members.length === 0) {
+          onIgnore();
+        }
+      },
+      [onIgnore],
+    ),
   );
 
   const playSound = useCallback(() => {

src/app/features/call-status/CallStatus.tsx

@@ -22,7 +22,7 @@ export function CallStatus({ callEmbed }: CallStatusProps) {
   const { room } = callEmbed;
 
   const callSession = useCallSession(room);
-  const callMembers = useCallMembers(room, callSession);
+  const callMembers = useCallMembers(callSession);
   const screenSize = useScreenSize();
   const callJoined = useCallJoined(callEmbed);
   const speakers = useCallSpeakers(callEmbed);

src/app/features/call-status/LiveChip.tsx

@@ -82,7 +82,7 @@ export function LiveChip({ count, room, members }: LiveChipProps) {
 
                     return (
                       <MenuItem
-                        key={callMember.membershipID}
+                        key={callMember.memberId}
                         size="400"
                         variant="Surface"
                         radii="300"

src/app/features/call-status/MemberGlance.tsx

@@ -29,7 +29,7 @@ export function MemberGlance({ room, members, speakers, max = 6 }: MemberGlanceP
   return (
     <Box alignItems="Center">
       {visibleMembers.map((callMember) => {
-        const userId = callMember.sender;
+        const { userId } = callMember;
         if (!userId) return null;
         const name = getMemberDisplayName(room, userId) ?? getMxIdLocalPart(userId) ?? userId;
         const avatarMxc = getMemberAvatarMxc(room, userId);
@@ -39,7 +39,7 @@ export function MemberGlance({ room, members, speakers, max = 6 }: MemberGlanceP
 
         return (
           <StackedAvatar
-            key={callMember.membershipID}
+            key={callMember.memberId}
             className={speakers.has(callMember.sender) ? css.SpeakerAvatarOutline : undefined}
             title={name}
             as="button"

src/app/features/call/CallMemberCard.tsx

@@ -1,5 +1,4 @@
 import { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
-import { type SessionMembershipData } from 'matrix-js-sdk/lib/matrixrtc';
 import React, { useState } from 'react';
 import { Avatar, Box, Icon, Icons, Text } from 'folds';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
@@ -13,12 +12,6 @@ import { UserAvatar } from '../../components/user-avatar';
 import { getMouseEventCords } from '../../utils/dom';
 import * as css from './styles.css';
 
-interface MemberWithMembershipData {
-  membershipData?: SessionMembershipData & {
-    'm.call.intent': 'video' | 'audio';
-  };
-}
-
 type CallMemberCardProps = {
   member: CallMembership;
 };
@@ -29,7 +22,7 @@ export function CallMemberCard({ member }: CallMemberCardProps) {
 
   const openUserProfile = useOpenUserRoomProfile();
 
-  const userId = member.sender;
+  const { userId } = member;
   if (!userId) return null;
 
   const name = getMemberDisplayName(room, userId) ?? getMxIdLocalPart(userId) ?? userId;
@@ -38,13 +31,12 @@ export function CallMemberCard({ member }: CallMemberCardProps) {
     ? (mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96) ?? undefined)
     : undefined;
 
-  const audioOnly =
-    (member as unknown as MemberWithMembershipData).membershipData?.['m.call.intent'] === 'audio';
+  const audioOnly = member.callIntent === 'audio';
 
   return (
     <SequenceCard
       as="button"
-      key={member.membershipID}
+      key={member.memberId}
       className={css.CallMemberCard}
       variant="SurfaceVariant"
       radii="500"
@@ -93,7 +85,7 @@ export function CallMemberRenderer({
   return (
     <>
       {truncatedMembers.map((member) => (
-        <CallMemberCard key={member.membershipID} member={member} />
+        <CallMemberCard key={member.memberId} member={member} />
       ))}
       {members.length > max && (
         <SequenceCard

src/app/features/call/CallView.tsx

@@ -90,7 +90,7 @@ function CallPrescreen() {
   );
 
   const callSession = useCallSession(room);
-  const callMembers = useCallMembers(room, callSession);
+  const callMembers = useCallMembers(callSession);
   const hasParticipant = callMembers.length > 0;
 
   const callEmbed = useCallEmbed();

src/app/features/room-nav/RoomNavItem.tsx

@@ -282,7 +282,7 @@ function RoomNavItem_({
 
   const optionsVisible = hover || !!menuAnchor;
   const callSession = useCallSession(room);
-  const callMembers = useCallMembers(room, callSession);
+  const callMembers = useCallMembers(callSession);
   const startCall = useCallStart(direct);
   const callEmbed = useCallEmbed();
   const callPref = useAtomValue(useCallPreferencesAtom());

src/app/features/room/Room.tsx

@@ -27,7 +27,7 @@ export function Room() {
   const mx = useMatrixClient();
 
   const callSession = useCallSession(room);
-  const callMembers = useCallMembers(room, callSession);
+  const callMembers = useCallMembers(callSession);
   const callEmbed = useCallEmbed();
 
   const [isDrawer] = useSetting(settingsAtom, 'isPeopleDrawer');

src/app/features/room/RoomTimeline.tsx

@@ -26,7 +26,6 @@ import { HTMLReactParserOptions } from 'html-react-parser';
 import classNames from 'classnames';
 import { ReactEditor } from 'slate-react';
 import { Editor } from 'slate';
-import { type SessionMembershipData } from 'matrix-js-sdk/lib/matrixrtc';
 import to from 'await-to-js';
 import { useAtomValue, useSetAtom } from 'jotai';
 import {
@@ -1796,7 +1795,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
         const senderId = mEvent.getSender() ?? '';
         const senderName = getMemberDisplayName(room, senderId) || getMxIdLocalPart(senderId);
 
-        const content = mEvent.getContent<SessionMembershipData>();
+        const content = mEvent.getContent();
         const prevContent = mEvent.getPrevContent();
 
         const callJoined = content.application;

src/app/hooks/useCall.ts

@@ -2,6 +2,7 @@ import { Room } from 'matrix-js-sdk';
 import {
   MatrixRTCSession,
   MatrixRTCSessionEvent,
+  MatrixRTCSessionEventHandlerMap,
 } from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSession';
 import { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
 import { useEffect, useState } from 'react';
@@ -33,30 +34,27 @@ export const useCallSession = (room: Room): MatrixRTCSession => {
   return session;
 };
 
-export const useCallMembers = (room: Room, session: MatrixRTCSession): CallMembership[] => {
-  const [memberships, setMemberships] = useState<CallMembership[]>(session.memberships);
-
+export const useCallMembersChange = (
+  session: MatrixRTCSession,
+  callback: (members: CallMembership[]) => void,
+): void => {
   useEffect(() => {
-    const updateMemberships = () => {
-      setMemberships([...session.memberships]);
-    };
+    const handleMembershipsChange: MatrixRTCSessionEventHandlerMap[MatrixRTCSessionEvent.MembershipsChanged] =
+      (oldestMembership, newMemberships) => {
+        callback(newMemberships);
+      };
 
-    updateMemberships();
-
-    session.on(MatrixRTCSessionEvent.MembershipsChanged, updateMemberships);
+    session.on(MatrixRTCSessionEvent.MembershipsChanged, handleMembershipsChange);
     return () => {
-      session.removeListener(MatrixRTCSessionEvent.MembershipsChanged, updateMemberships);
-    };
-  }, [session, room]);
-
-  return memberships;
-};
-
-export const useCallMembersChange = (session: MatrixRTCSession, callback: () => void): void => {
-  useEffect(() => {
-    session.on(MatrixRTCSessionEvent.MembershipsChanged, callback);
-    return () => {
-      session.removeListener(MatrixRTCSessionEvent.MembershipsChanged, callback);
+      session.removeListener(MatrixRTCSessionEvent.MembershipsChanged, handleMembershipsChange);
     };
   }, [session, callback]);
 };
+
+export const useCallMembers = (session: MatrixRTCSession): CallMembership[] => {
+  const [memberships, setMemberships] = useState<CallMembership[]>(session.memberships);
+
+  useCallMembersChange(session, setMemberships);
+
+  return memberships;
+};

src/app/hooks/useCallSpeakers.ts

@@ -8,7 +8,7 @@ import { useCallJoined } from './useCallEmbed';
 export const useCallSpeakers = (callEmbed: CallEmbed): Set<string> => {
   const [speakers, setSpeakers] = useState(new Set<string>());
   const callSession = useCallSession(callEmbed.room);
-  const callMembers = useCallMembers(callEmbed.room, callSession);
+  const callMembers = useCallMembers(callSession);
   const joined = useCallJoined(callEmbed);
 
   const videoContainers = useMemo(() => {

src/app/plugins/call/CallWidgetDriver.ts

@@ -8,7 +8,6 @@ import {
   type IWidgetApiErrorResponseDataDetails,
   type ISearchUserDirectoryResult,
   type IGetMediaConfigResult,
-  type UpdateDelayedEventAction,
   OpenIDRequestState,
   SimpleObservable,
   IOpenIDUpdate,
@@ -56,14 +55,11 @@ export class CallWidgetDriver extends WidgetDriver {
     stateKey: string | null = null,
     targetRoomId: string | null = null,
   ): Promise<ISendEventDetails> {
-    const client = this.mx;
     const roomId = targetRoomId || this.inRoomId;
 
-    if (!client || !roomId) throw new Error('Not in a room or not attached to a client');
-
     let r: { event_id: string } | null;
     if (typeof stateKey === 'string') {
-      r = await client.sendStateEvent(
+      r = await this.mx.sendStateEvent(
         roomId,
         eventType as keyof StateEvents,
         content as StateEvents[keyof StateEvents],
@@ -71,9 +67,9 @@ export class CallWidgetDriver extends WidgetDriver {
       );
     } else if (eventType === EventType.RoomRedaction) {
       // special case: extract the `redacts` property and call redact
-      r = await client.redactEvent(roomId, content.redacts);
+      r = await this.mx.redactEvent(roomId, content.redacts);
     } else {
-      r = await client.sendEvent(
+      r = await this.mx.sendEvent(
         roomId,
         eventType as keyof TimelineEvents,
         content as TimelineEvents[keyof TimelineEvents],
@@ -91,11 +87,8 @@ export class CallWidgetDriver extends WidgetDriver {
     stateKey: string | null = null,
     targetRoomId: string | null = null,
   ): Promise<ISendDelayedEventDetails> {
-    const client = this.mx;
     const roomId = targetRoomId || this.inRoomId;
 
-    if (!client || !roomId) throw new Error('Not in a room or not attached to a client');
-
     let delayOpts;
     if (delay !== null) {
       delayOpts = {
@@ -113,7 +106,7 @@ export class CallWidgetDriver extends WidgetDriver {
     let r: SendDelayedEventResponse | null;
     if (stateKey !== null) {
       // state event
-      r = await client._unstable_sendDelayedStateEvent(
+      r = await this.mx._unstable_sendDelayedStateEvent(
         roomId,
         delayOpts,
         eventType as keyof StateEvents,
@@ -122,7 +115,7 @@ export class CallWidgetDriver extends WidgetDriver {
       );
     } else {
       // message event
-      r = await client._unstable_sendDelayedEvent(
+      r = await this.mx._unstable_sendDelayedEvent(
         roomId,
         delayOpts,
         null,
@@ -137,17 +130,6 @@ export class CallWidgetDriver extends WidgetDriver {
     };
   }
 
-  public async updateDelayedEvent(
-    delayId: string,
-    action: UpdateDelayedEventAction,
-  ): Promise<void> {
-    const client = this.mx;
-
-    if (!client) throw new Error('Not in a room or not attached to a client');
-
-    await client._unstable_updateDelayedEvent(delayId, action);
-  }
-
   public async cancelScheduledDelayedEvent(delayId: string): Promise<void> {
     await this.mx._unstable_cancelScheduledDelayedEvent(delayId);
   }
@@ -165,10 +147,8 @@ export class CallWidgetDriver extends WidgetDriver {
     encrypted: boolean,
     contentMap: { [userId: string]: { [deviceId: string]: object } },
   ): Promise<void> {
-    const client = this.mx;
-
     if (encrypted) {
-      const crypto = client.getCrypto();
+      const crypto = this.mx.getCrypto();
       if (!crypto) throw new Error('E2EE not enabled');
 
       // attempt to re-batch these up into a single request
@@ -193,11 +173,11 @@ export class CallWidgetDriver extends WidgetDriver {
             JSON.parse(stringifiedContent),
           );
 
-          await client.queueToDevice(batch);
+          await this.mx.queueToDevice(batch);
         }),
       );
     } else {
-      await client.queueToDevice({
+      await this.mx.queueToDevice({
         eventType,
         batch: Object.entries(contentMap).flatMap(([userId, userContentMap]) =>
           Object.entries(userContentMap).map(([deviceId, content]) => ({
@@ -277,7 +257,6 @@ export class CallWidgetDriver extends WidgetDriver {
     limit?: number,
     direction?: 'f' | 'b',
   ): Promise<IReadEventRelationsResult> {
-    const client = this.mx;
     const dir = direction as Direction;
     const targetRoomId = roomId ?? this.inRoomId ?? undefined;
 
@@ -285,7 +264,7 @@ export class CallWidgetDriver extends WidgetDriver {
       throw new Error('Error while reading the current room');
     }
 
-    const { events, nextBatch, prevBatch } = await client.relations(
+    const { events, nextBatch, prevBatch } = await this.mx.relations(
       targetRoomId,
       eventId,
       relationType ?? null,
@@ -304,9 +283,7 @@ export class CallWidgetDriver extends WidgetDriver {
     searchTerm: string,
     limit?: number,
   ): Promise<ISearchUserDirectoryResult> {
-    const client = this.mx;
-
-    const { limited, results } = await client.searchUserDirectory({ term: searchTerm, limit });
+    const { limited, results } = await this.mx.searchUserDirectory({ term: searchTerm, limit });
 
     return {
       limited,
@@ -319,15 +296,11 @@ export class CallWidgetDriver extends WidgetDriver {
   }
 
   public async getMediaConfig(): Promise<IGetMediaConfigResult> {
-    const client = this.mx;
-
-    return client.getMediaConfig();
+    return this.mx.getMediaConfig();
   }
 
   public async uploadFile(file: XMLHttpRequestBodyInit): Promise<{ contentUri: string }> {
-    const client = this.mx;
-
-    const uploadResult = await client.uploadContent(file);
+    const uploadResult = await this.mx.uploadContent(file);
 
     return { contentUri: uploadResult.content_uri };
   }