Replace deprecated CallMembership.sender with userId

2025-10-14 12:07:51 -04:00
parent bcbf7a90f0
commit 13636b78d9
16 changed files with 61 additions and 63 deletions
--- a/src/reactions/ReactionsReader.test.tsx
+++ b/src/reactions/ReactionsReader.test.tsx
@@ -47,7 +47,7 @@ test("handles a hand raised reaction", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: EventType.Reaction,
              origin_server_ts: localTimestamp.getTime(),
              content: {
@@ -67,7 +67,7 @@ test("handles a hand raised reaction", () => {
      expectObservable(raisedHands$).toBe("ab", {
        a: {},
        b: {
-          [`${localRtcMember.sender}:${localRtcMember.deviceId}`]: {
+          [`${localRtcMember.userId}:${localRtcMember.deviceId}`]: {
            reactionEventId,
            membershipEventId: localRtcMember.eventId,
            time: localTimestamp,
@@ -95,7 +95,7 @@ test("handles a redaction", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: EventType.Reaction,
              origin_server_ts: localTimestamp.getTime(),
              content: {
@@ -117,7 +117,7 @@ test("handles a redaction", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: EventType.RoomRedaction,
              redacts: reactionEventId,
            }),
@@ -129,7 +129,7 @@ test("handles a redaction", () => {
      expectObservable(raisedHands$).toBe("abc", {
        a: {},
        b: {
-          [`${localRtcMember.sender}:${localRtcMember.deviceId}`]: {
+          [`${localRtcMember.userId}:${localRtcMember.deviceId}`]: {
            reactionEventId,
            membershipEventId: localRtcMember.eventId,
            time: localTimestamp,
@@ -156,7 +156,7 @@ test("handles waiting for event decryption", () => {
          const encryptedEvent = new MatrixEvent({
            room_id: rtcSession.room.roomId,
            event_id: reactionEventId,
-            sender: localRtcMember.sender,
+            sender: localRtcMember.userId,
            type: EventType.Reaction,
            origin_server_ts: localTimestamp.getTime(),
            content: {
@@ -183,7 +183,7 @@ test("handles waiting for event decryption", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: EventType.Reaction,
              origin_server_ts: localTimestamp.getTime(),
              content: {
@@ -199,7 +199,7 @@ test("handles waiting for event decryption", () => {
      expectObservable(raisedHands$).toBe("a-c", {
        a: {},
        c: {
-          [`${localRtcMember.sender}:${localRtcMember.deviceId}`]: {
+          [`${localRtcMember.userId}:${localRtcMember.deviceId}`]: {
            reactionEventId,
            membershipEventId: localRtcMember.eventId,
            time: localTimestamp,
@@ -227,7 +227,7 @@ test("hands rejecting events without a proper membership", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: EventType.Reaction,
              origin_server_ts: localTimestamp.getTime(),
              content: {
@@ -270,7 +270,7 @@ test("handles a reaction", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {
                emoji: reaction.emoji,
@@ -295,7 +295,7 @@ test("handles a reaction", () => {
        {
          a: {},
          b: {
-            [`${localRtcMember.sender}:${localRtcMember.deviceId}`]: {
+            [`${localRtcMember.userId}:${localRtcMember.deviceId}`]: {
              reactionOption: reaction,
              expireAfter: new Date(REACTION_ACTIVE_TIME_MS),
            },
@@ -327,7 +327,7 @@ test("ignores bad reaction events", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {},
            }),
@@ -342,7 +342,7 @@ test("ignores bad reaction events", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {
                emoji: reaction.emoji,
@@ -363,7 +363,7 @@ test("ignores bad reaction events", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: aliceRtcMember.sender,
+              sender: aliceRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {
                emoji: reaction.emoji,
@@ -384,7 +384,7 @@ test("ignores bad reaction events", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {
                name: reaction.name,
@@ -404,7 +404,7 @@ test("ignores bad reaction events", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {
                emoji: " ",
@@ -448,7 +448,7 @@ test("that reactions cannot be spammed", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {
                emoji: reactionA.emoji,
@@ -470,7 +470,7 @@ test("that reactions cannot be spammed", () => {
            new MatrixEvent({
              room_id: rtcSession.room.roomId,
              event_id: reactionEventId,
-              sender: localRtcMember.sender,
+              sender: localRtcMember.userId,
              type: ElementCallReactionEventType,
              content: {
                emoji: reactionB.emoji,
@@ -495,7 +495,7 @@ test("that reactions cannot be spammed", () => {
        {
          a: {},
          b: {
-            [`${localRtcMember.sender}:${localRtcMember.deviceId}`]: {
+            [`${localRtcMember.userId}:${localRtcMember.deviceId}`]: {
              reactionOption: reactionA,
              expireAfter: new Date(REACTION_ACTIVE_TIME_MS),
            },
--- a/src/reactions/ReactionsReader.ts
+++ b/src/reactions/ReactionsReader.ts
@@ -130,7 +130,7 @@ export class ReactionsReader {
  private onMembershipsChanged = (oldMemberships: CallMembership[]): void => {
    // Remove any raised hands for users no longer joined to the call.
    for (const identifier of Object.keys(this.raisedHandsSubject$.value).filter(
-      (rhId) => oldMemberships.find((u) => u.sender == rhId),
+      (rhId) => oldMemberships.find((u) => u.userId == rhId),
    )) {
      this.removeRaisedHand(identifier);
    }
@@ -138,10 +138,10 @@ export class ReactionsReader {
    // For each member in the call, check to see if a reaction has
    // been raised and adjust.
    for (const m of this.rtcSession.memberships) {
-      if (!m.sender || !m.eventId) {
+      if (!m.userId || !m.eventId) {
        continue;
      }
-      const identifier = `${m.sender}:${m.deviceId}`;
+      const identifier = `${m.userId}:${m.deviceId}`;
      if (
        this.raisedHandsSubject$.value[identifier] &&
        this.raisedHandsSubject$.value[identifier].membershipEventId !==
@@ -151,13 +151,13 @@ export class ReactionsReader {
        // was raised, reset.
        this.removeRaisedHand(identifier);
      }
-      const reaction = this.getLastReactionEvent(m.eventId, m.sender);
+      const reaction = this.getLastReactionEvent(m.eventId, m.userId);
      if (reaction) {
        const eventId = reaction?.getId();
        if (!eventId) {
          continue;
        }
-        this.addRaisedHand(`${m.sender}:${m.deviceId}`, {
+        this.addRaisedHand(`${m.userId}:${m.deviceId}`, {
          membershipEventId: m.eventId,
          reactionEventId: eventId,
          time: new Date(reaction.localTimestamp),
@@ -219,7 +219,7 @@ export class ReactionsReader {

      const membershipEventId = content?.["m.relates_to"]?.event_id;
      const membershipEvent = this.rtcSession.memberships.find(
-        (e) => e.eventId === membershipEventId && e.sender === sender,
+        (e) => e.eventId === membershipEventId && e.userId === sender,
      );
      // Check to see if this reaction was made to a membership event (and the
      // sender of the reaction matches the membership)
@@ -229,7 +229,7 @@ export class ReactionsReader {
        );
        return;
      }
-      const identifier = `${membershipEvent.sender}:${membershipEvent.deviceId}`;
+      const identifier = `${membershipEvent.userId}:${membershipEvent.deviceId}`;

      if (!content.emoji) {
        logger.warn(`Reaction had no emoji from ${reactionEventId}`);
@@ -278,7 +278,7 @@ export class ReactionsReader {
      // Check to see if this reaction was made to a membership event (and the
      // sender of the reaction matches the membership)
      const membershipEvent = this.rtcSession.memberships.find(
-        (e) => e.eventId === membershipEventId && e.sender === sender,
+        (e) => e.eventId === membershipEventId && e.userId === sender,
      );
      if (!membershipEvent) {
        logger.warn(
@@ -289,7 +289,7 @@ export class ReactionsReader {

      if (content?.["m.relates_to"].key === "🖐️") {
        this.addRaisedHand(
-          `${membershipEvent.sender}:${membershipEvent.deviceId}`,
+          `${membershipEvent.userId}:${membershipEvent.deviceId}`,
          {
            reactionEventId,
            membershipEventId,
--- a/src/reactions/useReactionsSender.tsx
+++ b/src/reactions/useReactionsSender.tsx
@@ -65,7 +65,7 @@ export const ReactionsSenderProvider = ({
  const myMembershipEvent = useMemo(
    () =>
      memberships.find(
-        (m) => m.sender === myUserId && m.deviceId === myDeviceId,
+        (m) => m.userId === myUserId && m.deviceId === myDeviceId,
      )?.eventId,
    [memberships, myUserId, myDeviceId],
  );