Make the existing option the default and remove it

Author: bxdxnn

apps/web/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx

@@ -153,10 +153,7 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
         "showTypingNotifications",
         "showRedactions",
         "showReadReceipts",
-        "showJoinLeaves",
-        "showDisplaynameChanges",
         "showChatEffects",
-        "showAvatarChanges",
         "Pill.shouldShowPillAvatar",
         "TextualBody.enableBigEmoji",
         "scrollToBottomOnMessageSent",

apps/web/src/shouldHideEvent.ts

@@ -57,6 +57,12 @@ function isPublicRoom(ev: MatrixEvent, client?: MatrixClient): boolean {
     return room?.getJoinRule() === JoinRule.Public;
 }
 
+function isInviteRoom(ev: MatrixEvent, client?: MatrixClient): boolean {
+    const mxClient = client ?? MatrixClientPeg.get();
+    const room = mxClient?.getRoom(ev.getRoomId());
+    return room?.getJoinRule() === JoinRule.Invite;
+}
+
 /**
  * Determines whether the given event should be hidden from timelines.
  * @param ev The event
@@ -90,6 +96,16 @@ export default function shouldHideEvent(ev: MatrixEvent, ctx?: IRoomState, clien
     if (eventDiff.isMemberEvent) {
         if (isPublicRoom(ev, client)) return true;
 
+        if (isInviteRoom(ev, client)) {
+            const content = ev.getContent();
+            const isMembershipChanged = content.membership !== ev.getPrevContent().membership;
+            const isJoin = isMembershipChanged && content.membership === KnownMembership.Join;
+            const isLeave = isMembershipChanged && content.membership === KnownMembership.Leave;
+            if (isJoin || isLeave) return true;
+            if (eventDiff.isAvatarChange) return true;
+            if (eventDiff.isDisplaynameChange) return true;
+        }
+
         if ((eventDiff.isJoin || eventDiff.isPart) && !isEnabled("showJoinLeaves")) return true;
         if (eventDiff.isAvatarChange && !isEnabled("showAvatarChanges")) return true;
         if (eventDiff.isDisplaynameChange && !isEnabled("showDisplaynameChanges")) return true;

apps/web/test/unit-tests/shouldHideEvent-test.ts

@@ -15,23 +15,29 @@ describe("shouldHideEvent", () => {
     let client: MatrixClient;
     let publicRoom: Room;
     let privateRoom: Room;
+    let inviteRoom: Room;
 
     beforeEach(() => {
         client = {
             getRoom: jest.fn().mockImplementation((roomId: string) => {
                 if (roomId === "!public:server") return publicRoom;
                 if (roomId === "!private:server") return privateRoom;
+                if (roomId === "!invite:server") return inviteRoom;
                 return null;
             }),
         } as unknown as MatrixClient;
 
         publicRoom = new SDKRoom("!public:server", client, "@user:server");
         privateRoom = new SDKRoom("!private:server", client, "@user:server");
+        inviteRoom = new SDKRoom("!invite:server", client, "@user:server");
 
         (publicRoom as unknown as { getJoinRule: jest.Mock }).getJoinRule = jest.fn().mockReturnValue(JoinRule.Public);
         (privateRoom as unknown as { getJoinRule: jest.Mock }).getJoinRule = jest
             .fn()
             .mockReturnValue(JoinRule.Private);
+        (inviteRoom as unknown as { getJoinRule: jest.Mock }).getJoinRule = jest
+            .fn()
+            .mockReturnValue(JoinRule.Invite);
     });
 
     function makeMemberEvent(
@@ -105,5 +111,97 @@ describe("shouldHideEvent", () => {
             const event = makeTopicEvent("!private:server");
             expect(shouldHideEvent(event, undefined, client)).toBe(false);
         });
+
+        it("should show display name changes in private rooms", () => {
+            const event = mkEvent({
+                type: EventType.RoomMember,
+                room: "!private:server",
+                user: "@user:server",
+                content: {
+                    membership: KnownMembership.Join,
+                    displayname: "New Name",
+                    avatar_url: "mxc://avatar",
+                },
+                prev_content: {
+                    membership: KnownMembership.Join,
+                    displayname: "Old Name",
+                    avatar_url: "mxc://avatar",
+                },
+                event: true,
+            });
+            expect(shouldHideEvent(event, undefined, client)).toBe(false);
+        });
+
+        it("should show avatar changes in private rooms", () => {
+            const event = mkEvent({
+                type: EventType.RoomMember,
+                room: "!private:server",
+                user: "@user:server",
+                content: {
+                    membership: KnownMembership.Join,
+                    displayname: "User",
+                    avatar_url: "mxc://new_avatar",
+                },
+                prev_content: {
+                    membership: KnownMembership.Join,
+                    displayname: "User",
+                    avatar_url: "mxc://old_avatar",
+                },
+                event: true,
+            });
+            expect(shouldHideEvent(event, undefined, client)).toBe(false);
+        });
+    });
+
+    describe("invite room events", () => {
+        it("should hide member join events in invite-only rooms", () => {
+            const event = makeMemberEvent("!invite:server", KnownMembership.Join, KnownMembership.Invite);
+            expect(shouldHideEvent(event, undefined, client)).toBe(true);
+        });
+
+        it("should hide member leave events in invite-only rooms", () => {
+            const event = makeMemberEvent("!invite:server", KnownMembership.Leave, KnownMembership.Join);
+            expect(shouldHideEvent(event, undefined, client)).toBe(true);
+        });
+
+        it("should hide display name changes in invite-only rooms", () => {
+            const event = mkEvent({
+                type: EventType.RoomMember,
+                room: "!invite:server",
+                user: "@user:server",
+                content: {
+                    membership: KnownMembership.Join,
+                    displayname: "New Name",
+                    avatar_url: "mxc://avatar",
+                },
+                prev_content: {
+                    membership: KnownMembership.Join,
+                    displayname: "Old Name",
+                    avatar_url: "mxc://avatar",
+                },
+                event: true,
+            });
+            expect(shouldHideEvent(event, undefined, client)).toBe(true);
+        });
+
+        it("should hide avatar changes in invite-only rooms", () => {
+            const event = mkEvent({
+                type: EventType.RoomMember,
+                room: "!invite:server",
+                user: "@user:server",
+                content: {
+                    membership: KnownMembership.Join,
+                    displayname: "User",
+                    avatar_url: "mxc://new_avatar",
+                },
+                prev_content: {
+                    membership: KnownMembership.Join,
+                    displayname: "User",
+                    avatar_url: "mxc://old_avatar",
+                },
+                event: true,
+            });
+            expect(shouldHideEvent(event, undefined, client)).toBe(true);
+        });
     });
 });