Do not show membership/profile events in public rooms

bxdxnn · bxdxnn · commit 01cd27e5fef1 · 2026-06-04T15:58:54.000Z
diff --git a/apps/web/src/components/structures/RoomView.tsx b/apps/web/src/components/structures/RoomView.tsx
@@ -269,9 +269,6 @@ export interface IRoomState {
     showHiddenEvents: boolean;
     showReadReceipts: boolean;
     showRedactions: boolean;
-    showJoinLeaves: boolean;
-    showAvatarChanges: boolean;
-    showDisplaynameChanges: boolean;
     matrixClientIsReady: boolean;
     showUrlPreview: boolean;
     e2eStatus?: E2EStatus;
@@ -499,9 +496,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             showHiddenEvents: SettingsStore.getValue("showHiddenEventsInTimeline"),
             showReadReceipts: true,
             showRedactions: true,
-            showJoinLeaves: true,
-            showAvatarChanges: true,
-            showDisplaynameChanges: true,
             // Default to false to avoid any accidental leakage.
             showUrlPreview: false,
             matrixClientIsReady: context.client?.isInitialSyncComplete(),
@@ -656,9 +650,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             shouldPeek: shouldPeek,
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
             showRedactions: SettingsStore.getValue("showRedactions", roomId),
-            showJoinLeaves: SettingsStore.getValue("showJoinLeaves", roomId),
-            showAvatarChanges: SettingsStore.getValue("showAvatarChanges", roomId),
-            showDisplaynameChanges: SettingsStore.getValue("showDisplaynameChanges", roomId),
             wasContextSwitch: wasContextSwitch,
             mainSplitContentType: room ? this.getMainSplitContentType(room) : undefined,
             initialEventId: undefined, // default to clearing this, will get set later in the method if needed
@@ -723,15 +714,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             SettingsStore.watchSetting("showRedactions", roomId, (...[, , , value]) =>
                 this.setState({ showRedactions: value as boolean }),
             ),
-            SettingsStore.watchSetting("showJoinLeaves", roomId, (...[, , , value]) =>
-                this.setState({ showJoinLeaves: value as boolean }),
-            ),
-            SettingsStore.watchSetting("showAvatarChanges", roomId, (...[, , , value]) =>
-                this.setState({ showAvatarChanges: value as boolean }),
-            ),
-            SettingsStore.watchSetting("showDisplaynameChanges", roomId, (...[, , , value]) =>
-                this.setState({ showDisplaynameChanges: value as boolean }),
-            ),
         ]);
 
         if (!initial && this.state.shouldPeek && !newState.shouldPeek) {
diff --git a/apps/web/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/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",
diff --git a/apps/web/src/contexts/RoomContext.ts b/apps/web/src/contexts/RoomContext.ts
@@ -62,9 +62,6 @@ const RoomContext = createContext<RoomContextType>({
     showHiddenEvents: false,
     showReadReceipts: true,
     showRedactions: true,
-    showJoinLeaves: true,
-    showAvatarChanges: true,
-    showDisplaynameChanges: true,
     matrixClientIsReady: false,
     showUrlPreview: false,
     timelineRenderingType: TimelineRenderingType.Room,
diff --git a/apps/web/src/settings/Settings.tsx b/apps/web/src/settings/Settings.tsx
@@ -252,9 +252,6 @@ export interface Settings {
     "Notifications.tac_only_notifications": IBaseSetting<boolean>;
     "useCompactLayout": IBaseSetting<boolean>;
     "showRedactions": IBaseSetting<boolean>;
-    "showJoinLeaves": IBaseSetting<boolean>;
-    "showAvatarChanges": IBaseSetting<boolean>;
-    "showDisplaynameChanges": IBaseSetting<boolean>;
     "showReadReceipts": IBaseSetting<boolean>;
     "showTwelveHourTimestamps": IBaseSetting<boolean>;
     "alwaysShowTimestamps": IBaseSetting<boolean>;
@@ -819,24 +816,6 @@ export const SETTINGS: Settings = {
         default: true,
         invertedSettingName: "hideRedactions",
     },
-    "showJoinLeaves": {
-        supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
-        displayName: _td("settings|show_join_leave"),
-        default: true,
-        invertedSettingName: "hideJoinLeaves",
-    },
-    "showAvatarChanges": {
-        supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
-        displayName: _td("settings|show_avatar_changes"),
-        default: true,
-        invertedSettingName: "hideAvatarChanges",
-    },
-    "showDisplaynameChanges": {
-        supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
-        displayName: _td("settings|show_displayname_changes"),
-        default: true,
-        invertedSettingName: "hideDisplaynameChanges",
-    },
     "showReadReceipts": {
         supportedLevels: LEVELS_ROOM_SETTINGS,
         displayName: _td("settings|show_read_receipts"),
diff --git a/apps/web/src/settings/handlers/AccountSettingsHandler.ts b/apps/web/src/settings/handlers/AccountSettingsHandler.ts
@@ -135,14 +135,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
         }
 
         const settings = this.getSettings();
-        let preferredValue = settings?.[settingName];
-
-        if (preferredValue === null || preferredValue === undefined) {
-            // Honour the old setting on read only
-            if (settingName === "hideAvatarChanges" || settingName === "hideDisplaynameChanges") {
-                preferredValue = settings?.["hideAvatarDisplaynameChanges"];
-            }
-        }
+        const preferredValue = settings?.[settingName];
 
         return preferredValue;
     }
diff --git a/apps/web/src/shouldHideEvent.ts b/apps/web/src/shouldHideEvent.ts
@@ -6,9 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
  */
 
-import { type MatrixEvent, EventType, RelationType, M_POLL_END } from "matrix-js-sdk/src/matrix";
+import { type MatrixEvent, EventType, JoinRule, RelationType, M_POLL_END } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 
+import { MatrixClientPeg } from "./MatrixClientPeg";
 import SettingsStore from "./settings/SettingsStore";
 import { type IRoomState } from "./components/structures/RoomView";
 import { type SettingKey } from "./settings/Settings.tsx";
@@ -70,9 +71,13 @@ export default function shouldHideEvent(ev: MatrixEvent, ctx?: IRoomState): bool
     const eventDiff = memberEventDiff(ev);
 
     if (eventDiff.isMemberEvent) {
-        if ((eventDiff.isJoin || eventDiff.isPart) && !isEnabled("showJoinLeaves")) return true;
-        if (eventDiff.isAvatarChange && !isEnabled("showAvatarChanges")) return true;
-        if (eventDiff.isDisplaynameChange && !isEnabled("showDisplaynameChanges")) return true;
+        const cli = MatrixClientPeg.get();
+        const room = cli?.getRoom(ev.getRoomId());
+        const isInviteOnly = room?.getJoinRule() === JoinRule.Invite;
+
+        if ((eventDiff.isJoin || eventDiff.isPart) && isInviteOnly) return true;
+        if (eventDiff.isAvatarChange && isInviteOnly) return true;
+        if (eventDiff.isDisplaynameChange && isInviteOnly) return true;
     }
 
     return false;
diff --git a/apps/web/test/test-utils/room.ts b/apps/web/test/test-utils/room.ts
@@ -72,9 +72,6 @@ export function getRoomContext(room: Room, override: Partial<RoomContextType>):
         showHiddenEvents: false,
         showReadReceipts: true,
         showRedactions: true,
-        showJoinLeaves: true,
-        showAvatarChanges: true,
-        showDisplaynameChanges: true,
         showUrlPreview: false,
         matrixClientIsReady: false,
         timelineRenderingType: TimelineRenderingType.Room,
diff --git a/apps/web/test/unit-tests/components/structures/MessagePanel-test.tsx b/apps/web/test/unit-tests/components/structures/MessagePanel-test.tsx
@@ -87,9 +87,6 @@ describe("MessagePanel", function () {
         canSendMessages: true,
         showReadReceipts: true,
         showRedactions: false,
-        showJoinLeaves: false,
-        showAvatarChanges: false,
-        showDisplaynameChanges: true,
         showHiddenEvents: false,
     } as unknown as RoomContextType;
 
@@ -101,10 +98,6 @@ describe("MessagePanel", function () {
 
     beforeEach(function () {
         jest.clearAllMocks();
-        // HACK: We assume all settings want to be disabled
-        jest.spyOn(SettingsStore, "getValue").mockImplementation((arg) => {
-            return arg === "showDisplaynameChanges";
-        });
 
         sdkContext = new SdkContextClass();
 
diff --git a/apps/web/test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx b/apps/web/test/unit-tests/components/views/rooms/SendMessageComposer-test.tsx
@@ -65,9 +65,6 @@ describe("<SendMessageComposer/>", () => {
         showHiddenEvents: false,
         showReadReceipts: true,
         showRedactions: true,
-        showJoinLeaves: true,
-        showAvatarChanges: true,
-        showDisplaynameChanges: true,
         showUrlPreview: false,
         matrixClientIsReady: false,
         timelineRenderingType: TimelineRenderingType.Room,

Original file line number	Diff line number	Diff line change
`@@ -135,14 +135,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`const settings = this.getSettings();`
`138`		`- let preferredValue = settings?.[settingName];`
`139`		`-`
`140`		`- if (preferredValue === null \|\| preferredValue === undefined) {`
`141`		`- // Honour the old setting on read only`
`142`		`- if (settingName === "hideAvatarChanges" \|\| settingName === "hideDisplaynameChanges") {`
`143`		`- preferredValue = settings?.["hideAvatarDisplaynameChanges"];`
`144`		`- }`
`145`		`- }`
	`138`	`+ const preferredValue = settings?.[settingName];`
`146`	`139`
`147`	`140`	`return preferredValue;`
`148`	`141`	`}`