From 72a2773629d8105dc67fea13e73495204d549bec Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 18 Nov 2024 11:25:36 +0100
Subject: [PATCH] Start sending stable `m.marked_unread` events (#28478)

* Start sending stable `m.marked_unread` events

* Update tests
---
 src/utils/notifications.ts                                  | 5 +----
 .../views/context_menus/RoomGeneralContextMenu-test.tsx     | 2 +-
 test/unit-tests/stores/RoomViewStore-test.ts                | 2 +-
 .../stores/notifications/RoomNotificationState-test.ts      | 2 +-
 test/unit-tests/utils/notifications-test.ts                 | 6 +++---
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index a131c3e55b..30d2948380 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -151,10 +151,7 @@ export async function setMarkedUnreadState(room: Room, client: MatrixClient, unr
     const currentState = getMarkedUnreadState(room);
 
     if (Boolean(currentState) !== unread) {
-        // Assuming MSC2867 passes FCP with no changes, we should update to start writing
-        // the flag to the stable prefix (or both) and then ultimately use only the
-        // stable prefix.
-        await client.setRoomAccountData(room.roomId, MARKED_UNREAD_TYPE_UNSTABLE, { unread });
+        await client.setRoomAccountData(room.roomId, MARKED_UNREAD_TYPE_STABLE, { unread });
     }
 }
 
diff --git a/test/unit-tests/components/views/context_menus/RoomGeneralContextMenu-test.tsx b/test/unit-tests/components/views/context_menus/RoomGeneralContextMenu-test.tsx
index 10de3996e6..9fc32dda29 100644
--- a/test/unit-tests/components/views/context_menus/RoomGeneralContextMenu-test.tsx
+++ b/test/unit-tests/components/views/context_menus/RoomGeneralContextMenu-test.tsx
@@ -150,7 +150,7 @@ describe("RoomGeneralContextMenu", () => {
 
         await sleep(0);
 
-        expect(mockClient.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "com.famedly.marked_unread", {
+        expect(mockClient.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "m.marked_unread", {
             unread: true,
         });
         expect(onFinished).toHaveBeenCalled();
diff --git a/test/unit-tests/stores/RoomViewStore-test.ts b/test/unit-tests/stores/RoomViewStore-test.ts
index 7d397397dc..c9b80553e5 100644
--- a/test/unit-tests/stores/RoomViewStore-test.ts
+++ b/test/unit-tests/stores/RoomViewStore-test.ts
@@ -338,7 +338,7 @@ describe("RoomViewStore", function () {
         });
         dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
         await untilDispatch(Action.ActiveRoomChanged, dis);
-        expect(mockClient.setRoomAccountData).toHaveBeenCalledWith(roomId, "com.famedly.marked_unread", {
+        expect(mockClient.setRoomAccountData).toHaveBeenCalledWith(roomId, "m.marked_unread", {
             unread: false,
         });
     });
diff --git a/test/unit-tests/stores/notifications/RoomNotificationState-test.ts b/test/unit-tests/stores/notifications/RoomNotificationState-test.ts
index 5ebbe3f1ad..396bb06ec6 100644
--- a/test/unit-tests/stores/notifications/RoomNotificationState-test.ts
+++ b/test/unit-tests/stores/notifications/RoomNotificationState-test.ts
@@ -91,7 +91,7 @@ describe("RoomNotificationState", () => {
         const listener = jest.fn();
         roomNotifState.addListener(NotificationStateEvents.Update, listener);
         const accountDataEvent = {
-            getType: () => "com.famedly.marked_unread",
+            getType: () => "m.marked_unread",
             getContent: () => {
                 return { unread: true };
             },
diff --git a/test/unit-tests/utils/notifications-test.ts b/test/unit-tests/utils/notifications-test.ts
index 67948ed217..8e33575fec 100644
--- a/test/unit-tests/utils/notifications-test.ts
+++ b/test/unit-tests/utils/notifications-test.ts
@@ -270,7 +270,7 @@ describe("notifications", () => {
         // set true, no existing event
         it("sets unread flag if event doesn't exist", async () => {
             await setMarkedUnreadState(room, client, true);
-            expect(client.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "com.famedly.marked_unread", {
+            expect(client.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "m.marked_unread", {
                 unread: true,
             });
         });
@@ -287,7 +287,7 @@ describe("notifications", () => {
                 .fn()
                 .mockReturnValue({ getContent: jest.fn().mockReturnValue({ unread: false }) });
             await setMarkedUnreadState(room, client, true);
-            expect(client.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "com.famedly.marked_unread", {
+            expect(client.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "m.marked_unread", {
                 unread: true,
             });
         });
@@ -316,7 +316,7 @@ describe("notifications", () => {
                 .fn()
                 .mockReturnValue({ getContent: jest.fn().mockReturnValue({ unread: true }) });
             await setMarkedUnreadState(room, client, false);
-            expect(client.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "com.famedly.marked_unread", {
+            expect(client.setRoomAccountData).toHaveBeenCalledWith(ROOM_ID, "m.marked_unread", {
                 unread: false,
             });
         });