Default intentional mentions (#11602)

* Default intentional mentions * wait for autocomplete to settle before submitting edit * lint * Update strings --------- Co-authored-by: Kerry Archibald <[email protected]>
matrix-org · Sep 14, 2023 · 3608d52 · 3608d52
1 parent 237038a
commit 3608d52
Show file tree

Hide file tree

Showing 9 changed files with 266 additions and 333 deletions.
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
@@ -90,10 +90,9 @@ export function attachMentions(
     replyToEvent: MatrixEvent | undefined,
     editedContent: IContent | null = null,
 ): void {
-    // If this feature is disabled, do nothing.
-    if (!SettingsStore.getValue("feature_intentional_mentions")) {
-        return;
-    }
+    // We always attach the mentions even if the home server doesn't yet support
+    // intentional mentions. This is safe because m.mentions is an additive change
+    // that should simply be ignored by incapable home servers.
 
     // The mentions property *always* gets included to disable legacy push rules.
     const mentions: IMentions = (content["m.mentions"] = {});

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1151,7 +1151,6 @@
         "voice_broadcast": "Voice broadcast",
         "rust_crypto": "Rust cryptography implementation",
         "hidebold": "Hide notification dot (only display counters badges)",
-        "intentional_mentions": "Enable intentional mentions",
         "ask_to_join": "Enable ask to join",
         "new_room_decoration_ui": "New room header & details interface",
         "beta_feature": "This is a beta feature",

diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -531,20 +531,6 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         labsGroup: LabGroup.Rooms,
         default: false,
     },
-    // MSC3952 intentional mentions support.
-    "feature_intentional_mentions": {
-        isFeature: true,
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        displayName: _td("labs|intentional_mentions"),
-        labsGroup: LabGroup.Rooms,
-        default: false,
-        controller: new ServerSupportUnstableFeatureController(
-            "feature_intentional_mentions",
-            defaultWatchManager,
-            [["org.matrix.msc3952_intentional_mentions"]],
-            "v1.7",
-        ),
-    },
     "feature_ask_to_join": {
         default: false,
         displayName: _td("labs|ask_to_join"),

diff --git a/test/ContentMessages-test.ts b/test/ContentMessages-test.ts
@@ -23,7 +23,6 @@ import ContentMessages, { UploadCanceledError, uploadFile } from "../src/Content
 import { doMaybeLocalRoomAction } from "../src/utils/local-room";
 import { createTestClient, mkEvent } from "./test-utils";
 import { BlurhashEncoder } from "../src/BlurhashEncoder";
-import SettingsStore from "../src/settings/SettingsStore";
 
 jest.mock("matrix-encrypt-attachment", () => ({ encryptAttachment: jest.fn().mockResolvedValue({}) }));
 
@@ -278,10 +277,6 @@ describe("ContentMessages", () => {
         });
 
         it("properly handles replies", async () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(
-                (settingName) => settingName === "feature_intentional_mentions",
-            );
-
             mocked(client.uploadContent).mockResolvedValue({ content_uri: "mxc://server/file" });
             const file = new File([], "fileName", { type: "image/jpeg" });
             const replyToEvent = mkEvent({

diff --git a/test/components/structures/ThreadView-test.tsx b/test/components/structures/ThreadView-test.tsx
@@ -112,6 +112,7 @@ describe("ThreadView", () => {
                 "rel_type": RelationType.Thread,
             },
             "msgtype": MsgType.Text,
+            "m.mentions": {},
         };
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,6 +112,7 @@ describe("ThreadView", () => { @@
                     "rel_type": RelationType.Thread,
                 },
                 "msgtype": MsgType.Text,
+                "m.mentions": {},
             };
         }
@@ Expand Down @@