Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/tidy-pillows-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': patch
'@rocket.chat/meteor': patch
---

Adds error feedback when clicking on a mentioned room you don't have access to
11 changes: 8 additions & 3 deletions apps/meteor/client/views/room/hooks/useGoToRoom.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
import { useStableCallback } from '@rocket.chat/fuselage-hooks';
import { useMethod, useRouter } from '@rocket.chat/ui-contexts';
import { useMethod, useRouter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';

import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
import { Subscriptions } from '../../../stores';
Expand All @@ -13,6 +13,7 @@ type GoToRoomByIdOptions = {
export const useGoToRoom = (): ((roomId: IRoom['_id'], options?: GoToRoomByIdOptions) => Promise<void>) => {
const router = useRouter();
const getRoomById = useMethod('getRoomById');
const dispatchToastMessage = useToastMessageDispatch();

// TODO: remove params recycling
return useStableCallback(async (roomId: IRoom['_id'], options?: GoToRoomByIdOptions) => {
Expand All @@ -25,7 +26,11 @@ export const useGoToRoom = (): ((roomId: IRoom['_id'], options?: GoToRoomByIdOpt
return;
}

const room = await getRoomById(roomId);
roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room }, router.getSearchParameters(), options);
try {
const room = await getRoomById(roomId);
roomCoordinator.openRouteLink(room.t, { rid: room._id, ...room }, router.getSearchParameters(), options);
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
}
});
};
Loading