Merge branch 'develop' into fix/roomMembers-actions

.changeset/chilly-pants-hunt.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Removes a validation that allowed only the room creator to propagate E2EE room keys. This was causing issues when the rooms were created via apps or some other integration, as the creator may not be online or able to create E2EE keys

.changeset/green-shirts-fold.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes condition causing Omnichannel queue to start more than once.

.changeset/proud-cups-share.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes `im.counters` endpoint returning `null` on `unread` messages property for users that have never opened the queried DM

.changeset/six-snails-study.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a behavior of the mentions parser that identified mentions inside markdown links text. Now, these components will be removed from the text before trying to parse mentions.

apps/meteor/app/api/server/v1/im.ts

@@ -195,9 +195,9 @@ API.v1.addRoute(
 
 			lm = room?.lm ? new Date(room.lm).toISOString() : new Date(room._updatedAt).toISOString(); // lm is the last message timestamp
 
-			if (subscription?.open) {
+			if (subscription) {
+				unreads = subscription.unread ?? null;
 				if (subscription.ls && room.msgs) {
-					unreads = subscription.unread;
 					unreadsFrom = new Date(subscription.ls).toISOString(); // last read timestamp
 				}
 				userMentions = subscription.userMentions;

apps/meteor/app/e2e/client/rocketchat.e2e.room.ts

@@ -326,8 +326,7 @@ export class E2ERoom extends Emitter {
 
 		try {
 			const room = Rooms.findOne({ _id: this.roomId })!;
-			// Only room creator can set keys for room
-			if (!room.e2eKeyId && this.userShouldCreateKeys(room)) {
+			if (!room.e2eKeyId) {
 				this.setState(E2ERoomState.CREATING_KEYS);
 				await this.createGroupKey();
 				this.setState(E2ERoomState.READY);
@@ -343,15 +342,6 @@ export class E2ERoom extends Emitter {
 		}
 	}
 
-	userShouldCreateKeys(room: any) {
-		// On DMs, we'll allow any user to set the keys
-		if (room.t === 'd') {
-			return true;
-		}
-
-		return room.u._id === this.userId;
-	}
-
 	isSupportedRoomType(type: any) {
 		return roomCoordinator.getRoomDirectives(type).allowRoomSettingChange({}, RoomSettingsEnum.E2E);
 	}

apps/meteor/app/mentions/lib/MentionsParser.ts

@@ -119,11 +119,17 @@ export class MentionsParser {
 			return this.roomTemplate({ prefix, reference, channel, mention });
 		});
 
-	getUserMentions(str: string) {
+	getUserMentions(msg: string) {
+		// First remove the text inside md links
+		const str = msg.replace(/\[[^\]]*\]\([^)]+\)/g, '');
+		// Then do the match
 		return (str.match(this.userMentionRegex) || []).map((match) => match.trim());
 	}
 
-	getChannelMentions(str: string) {
+	getChannelMentions(msg: string) {
+		// First remove the text inside md links
+		const str = msg.replace(/\[[^\]]*\]\([^)]+\)/g, '');
+		// Then do the match
 		return (str.match(this.channelMentionRegex) || []).map((match) => match.trim());
 	}
 

apps/meteor/client/components/UserCard/UserCard.stories.tsx

@@ -3,30 +3,34 @@ import React from 'react';
 
 import { UserCard, UserCardRole, UserCardAction } from '.';
 
+const user = {
+	name: 'guilherme.gazzo',
+	customStatus: '🛴 currently working on User Card',
+	roles: (
+		<>
+			<UserCardRole>Admin</UserCardRole>
+			<UserCardRole>Rocket.Chat</UserCardRole>
+			<UserCardRole>Team</UserCardRole>
+		</>
+	),
+	bio: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla tempus, eros convallis vulputate cursus, nisi neque eleifend libero, eget lacinia justo purus nec est. In at sodales ipsum. Sed lacinia quis purus eget pulvinar. Aenean eu pretium nunc, at aliquam magna. Praesent dignissim, tortor sed volutpat mattis, mauris diam pulvinar leo, porta commodo risus est non purus. Mauris in justo vel lorem ullamcorper hendrerit. Nam est metus, viverra a pellentesque vitae, ornare eget odio. Morbi tempor feugiat mattis. Morbi non felis tempor, aliquam justo sed, sagittis nibh. Mauris consequat ex metus. Praesent sodales sit amet nibh a vulputate. Integer commodo, mi vel bibendum sollicitudin, urna lectus accumsan ante, eget faucibus augue ex id neque. Aenean consectetur, orci a pellentesque mattis, tortor tellus fringilla elit, non ullamcorper risus nunc feugiat risus. Fusce sit amet nisi dapibus turpis commodo placerat. In tortor ante, vehicula sit amet augue et, imperdiet porta sem.',
+	localTime: 'Local Time: 7:44 AM',
+};
+
 export default {
 	title: 'Components/UserCard',
 	component: UserCard,
 	parameters: {
 		layout: 'centered',
 	},
 	args: {
-		name: 'guilherme.gazzo',
-		customStatus: '🛴 currently working on User Card',
-		roles: (
-			<>
-				<UserCardRole>Admin</UserCardRole>
-				<UserCardRole>Rocket.Chat</UserCardRole>
-				<UserCardRole>Team</UserCardRole>
-			</>
-		),
-		bio: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla tempus, eros convallis vulputate cursus, nisi neque eleifend libero, eget lacinia justo purus nec est. In at sodales ipsum. Sed lacinia quis purus eget pulvinar. Aenean eu pretium nunc, at aliquam magna. Praesent dignissim, tortor sed volutpat mattis, mauris diam pulvinar leo, porta commodo risus est non purus. Mauris in justo vel lorem ullamcorper hendrerit. Nam est metus, viverra a pellentesque vitae, ornare eget odio. Morbi tempor feugiat mattis. Morbi non felis tempor, aliquam justo sed, sagittis nibh. Mauris consequat ex metus. Praesent sodales sit amet nibh a vulputate. Integer commodo, mi vel bibendum sollicitudin, urna lectus accumsan ante, eget faucibus augue ex id neque. Aenean consectetur, orci a pellentesque mattis, tortor tellus fringilla elit, non ullamcorper risus nunc feugiat risus. Fusce sit amet nisi dapibus turpis commodo placerat. In tortor ante, vehicula sit amet augue et, imperdiet porta sem.',
+		user,
 		actions: (
 			<>
 				<UserCardAction icon='message' />
 				<UserCardAction icon='phone' />
 			</>
 		),
-		localTime: 'Local Time: 7:44 AM',
 	},
 } satisfies Meta<typeof UserCard>;
 
@@ -36,18 +40,27 @@ export const Example = Template.bind({});
 
 export const Nickname = Template.bind({});
 Nickname.args = {
-	nickname: 'nicknamenickname',
+	user: {
+		...user,
+		nickname: 'nicknamenickname',
+	},
 } as any;
 
 export const LargeName = Template.bind({});
 LargeName.args = {
-	customStatus: '🛴 currently working on User Card  on User Card  on User Card  on User Card  on User Card ',
-	name: 'guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.',
+	user: {
+		...user,
+		customStatus: '🛴 currently working on User Card  on User Card  on User Card  on User Card  on User Card ',
+		name: 'guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.guilherme.gazzo.',
+	},
 } as any;
 
 export const NoRoles = Template.bind({});
 NoRoles.args = {
-	roles: undefined,
+	user: {
+		...user,
+		roles: undefined,
+	},
 } as any;
 
 export const NoActions = Template.bind({});
@@ -57,25 +70,37 @@ NoActions.args = {
 
 export const NoLocalTime = Template.bind({});
 NoLocalTime.args = {
-	localTime: undefined,
+	user: {
+		...user,
+		localTime: undefined,
+	},
 } as any;
 
 export const NoBio = Template.bind({});
 NoBio.args = {
-	bio: undefined,
+	user: {
+		...user,
+		bio: undefined,
+	},
 } as any;
 
 export const NoBioAndNoLocalTime = Template.bind({});
 NoBioAndNoLocalTime.args = {
-	bio: undefined,
-	localTime: undefined,
+	user: {
+		...user,
+		bio: undefined,
+		localTime: undefined,
+	},
 } as any;
 
 export const NoBioNoLocalTimeNoRoles = Template.bind({});
 NoBioNoLocalTimeNoRoles.args = {
-	bio: undefined,
-	localTime: undefined,
-	roles: undefined,
+	user: {
+		...user,
+		bio: undefined,
+		localTime: undefined,
+		roles: undefined,
+	},
 } as any;
 
 export const Loading = () => <UserCard />;

apps/meteor/client/components/UserCard/UserCard.tsx

@@ -23,33 +23,27 @@ const clampStyle = css`
 `;
 
 type UserCardProps = {
-	onOpenUserInfo?: () => void;
-	name?: string;
-	username?: string;
-	etag?: string;
-	customStatus?: ReactNode;
-	roles?: ReactNode;
-	bio?: ReactNode;
-	status?: ReactNode;
+	user?: {
+		nickname?: string;
+		name?: string;
+		username?: string;
+		etag?: string;
+		customStatus?: ReactNode;
+		roles?: ReactNode;
+		bio?: ReactNode;
+		status?: ReactNode;
+		localTime?: ReactNode;
+	};
 	actions?: ReactNode;
-	localTime?: ReactNode;
+	onOpenUserInfo?: () => void;
 	onClose?: () => void;
-	nickname?: string;
 } & ComponentProps<typeof UserCardDialog>;
 
 const UserCard = ({
-	onOpenUserInfo,
-	name,
-	username,
-	etag,
-	customStatus,
-	roles,
-	bio,
-	status = <Status.Offline />,
+	user: { name, username, etag, customStatus, roles, bio, status = <Status.Offline />, localTime, nickname } = {},
 	actions,
-	localTime,
+	onOpenUserInfo,
 	onClose,
-	nickname,
 	...props
 }: UserCardProps) => {
 	const { t } = useTranslation();

apps/meteor/client/components/message/hooks/useMarkAsUnreadMutation.tsx

@@ -0,0 +1,20 @@
+import type { IMessage, ISubscription } from '@rocket.chat/core-typings';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useMutation } from '@tanstack/react-query';
+
+import { LegacyRoomManager } from '../../../../app/ui-utils/client';
+import { sdk } from '../../../../app/utils/client/lib/SDKClient';
+
+export const useMarkAsUnreadMutation = () => {
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	return useMutation({
+		mutationFn: async ({ message, subscription }: { message: IMessage; subscription: ISubscription }) => {
+			await LegacyRoomManager.close(subscription.t + subscription.name);
+			await sdk.call('unreadMessages', message);
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+};

apps/meteor/client/components/message/toolbar/MessageToolbar.tsx

@@ -12,6 +12,7 @@ import MessageActionMenu from './MessageActionMenu';
 import MessageToolbarStarsActionMenu from './MessageToolbarStarsActionMenu';
 import { useFollowMessageAction } from './useFollowMessageAction';
 import { useJumpToMessageContextAction } from './useJumpToMessageContextAction';
+import { useMarkAsUnreadMessageAction } from './useMarkAsUnreadMessageAction';
 import { useNewDiscussionMessageAction } from './useNewDiscussionMessageAction';
 import { usePermalinkAction } from './usePermalinkAction';
 import { usePinMessageAction } from './usePinMessageAction';
@@ -133,6 +134,7 @@ const MessageToolbar = ({
 		context: ['starred'],
 	});
 	useReactionMessageAction(message, { user, room, subscription });
+	useMarkAsUnreadMessageAction(message, { user, room, subscription });
 
 	const actionsQueryResult = useQuery({
 		queryKey: roomsQueryKeys.messageActionsWithParameters(room._id, message),

apps/meteor/client/components/message/toolbar/useMarkAsUnreadMessageAction.ts

@@ -0,0 +1,47 @@
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { ISubscription, IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
+import { useRouter } from '@rocket.chat/ui-contexts';
+import { useEffect } from 'react';
+
+import { MessageAction } from '../../../../app/ui-utils/client';
+import { useMarkAsUnreadMutation } from '../hooks/useMarkAsUnreadMutation';
+
+export const useMarkAsUnreadMessageAction = (
+	message: IMessage,
+	{ user, room, subscription }: { user: IUser | undefined; room: IRoom; subscription: ISubscription | undefined },
+) => {
+	const { mutateAsync: markAsUnread } = useMarkAsUnreadMutation();
+
+	const router = useRouter();
+
+	useEffect(() => {
+		if (isOmnichannelRoom(room) || !user) {
+			return;
+		}
+
+		if (!subscription) {
+			return;
+		}
+
+		if (message.u._id === user._id) {
+			return;
+		}
+
+		MessageAction.addButton({
+			id: 'mark-message-as-unread',
+			icon: 'flag',
+			label: 'Mark_unread',
+			context: ['message', 'message-mobile', 'threads'],
+			type: 'interaction',
+			async action() {
+				router.navigate('/home');
+				await markAsUnread({ message, subscription });
+			},
+			order: 4,
+			group: 'menu',
+		});
+		return () => {
+			MessageAction.removeButton('mark-message-as-unread');
+		};
+	}, [markAsUnread, message, room, router, subscription, user]);
+};

apps/meteor/client/importPackages.ts

@@ -16,7 +16,6 @@ import '../app/iframe-login/client';
 import '../app/license/client';
 import '../app/lib/client';
 import '../app/livechat-enterprise/client';
-import '../app/message-mark-as-unread/client';
 import '../app/nextcloud/client';
 import '../app/notifications/client';
 import '../app/otr/client';