From f764bf6966bae2b97c5ccb62348d99089bf6a8ea Mon Sep 17 00:00:00 2001 From: guijun13 Date: Tue, 28 Nov 2023 17:11:52 -0300 Subject: [PATCH 1/2] fix mention channel on DM --- apps/meteor/client/views/room/hooks/useOpenRoom.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/hooks/useOpenRoom.ts b/apps/meteor/client/views/room/hooks/useOpenRoom.ts index d529145aaf173..8af6d62b6450e 100644 --- a/apps/meteor/client/views/room/hooks/useOpenRoom.ts +++ b/apps/meteor/client/views/room/hooks/useOpenRoom.ts @@ -75,7 +75,7 @@ export function useOpenRoom({ type, reference }: { type: RoomType; reference: st const { LegacyRoomManager } = await import('../../../../app/ui-utils/client'); - if (room._id !== reference && type === 'd') { + if (reference !== undefined && room._id !== reference && type === 'd') { // Redirect old url using username to rid await LegacyRoomManager.close(type + reference); directRoute.push({ rid: room._id }, (prev) => prev); From f4e1e876ee486cb0ffedb52a0f15ab6f63c0a8a4 Mon Sep 17 00:00:00 2001 From: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com> Date: Tue, 28 Nov 2023 18:23:41 -0300 Subject: [PATCH 2/2] Create silver-mice-allow.md --- .changeset/silver-mice-allow.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/silver-mice-allow.md diff --git a/.changeset/silver-mice-allow.md b/.changeset/silver-mice-allow.md new file mode 100644 index 0000000000000..0be0670a11f85 --- /dev/null +++ b/.changeset/silver-mice-allow.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +fix: mention channel redirecting to own DM