Merge branch 'develop' into fix/CORE-217/fixing-room-search-filter-persistence

Author: AllanPazRibeiro

.changeset/thin-peaches-own.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where message reactions are vertically misaligned when zooming out

apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts

@@ -4,6 +4,7 @@ import { Subscriptions } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
+import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 import { getDefaultChannels } from './getDefaultChannels';
 
 export const addUserToDefaultChannels = async function (user: IUser, silenced?: boolean): Promise<void> {
@@ -23,6 +24,7 @@ export const addUserToDefaultChannels = async function (user: IUser, silenced?:
 				groupMentions: 0,
 				...(room.favorite && { f: true }),
 				...autoTranslateConfig,
+				...getDefaultSubscriptionPref(user),
 			});
 
 			// Insert user joined message

apps/meteor/app/lib/server/functions/addUserToRoom.ts

@@ -9,6 +9,7 @@ import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
 import { callbacks } from '../../../../lib/callbacks';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
 import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
+import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 
 export const addUserToRoom = async function (
 	rid: string,
@@ -81,6 +82,7 @@ export const addUserToRoom = async function (
 		userMentions: 1,
 		groupMentions: 0,
 		...autoTranslateConfig,
+		...getDefaultSubscriptionPref(userToBeAdded as IUser),
 	});
 
 	if (!userToBeAdded.username) {

apps/meteor/app/lib/server/functions/createRoom.ts

@@ -10,6 +10,7 @@ import { Meteor } from 'meteor/meteor';
 import { callbacks } from '../../../../lib/callbacks';
 import { beforeCreateRoomCallback } from '../../../../lib/callbacks/beforeCreateRoomCallback';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
+import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 import { getValidRoomName } from '../../../utils/server/lib/getValidRoomName';
 import { createDirectRoom } from './createDirectRoom';
 
@@ -36,14 +37,14 @@ async function createUsersSubscriptions({
 	options?: ICreateRoomParams['options'];
 }) {
 	if (shouldBeHandledByFederation) {
-		const extra: Partial<ISubscriptionExtraData> = options?.subscriptionExtra || {};
-		extra.open = true;
-		extra.ls = now;
-		extra.roles = ['owner'];
-
-		if (room.prid) {
-			extra.prid = room.prid;
-		}
+		const extra: Partial<ISubscriptionExtraData> = {
+			...options?.subscriptionExtra,
+			open: true,
+			ls: now,
+			roles: ['owner'],
+			...(room.prid && { prid: room.prid }),
+			...getDefaultSubscriptionPref(owner),
+		};
 
 		await Subscriptions.createWithRoomAndUser(room, owner, extra);
 

apps/meteor/client/components/message/content/Reactions.tsx

@@ -23,25 +23,22 @@ const Reactions = ({ message, ...props }: ReactionsProps): ReactElement => {
 	const { toolbarProps } = useToolbar(props, ref);
 
 	return (
-		<MessageReactions>
-			{message.reactions && (
-				<div ref={ref} {...toolbarProps} {...props}>
-					{Object.entries(message.reactions).map(([name, reactions]) => (
-						<Reaction
-							key={name}
-							counter={reactions.usernames.length}
-							hasReacted={hasReacted}
-							name={name}
-							names={reactions.usernames.filter((user) => user !== username).map((username) => `@${username}`)}
-							messageId={message._id}
-							onKeyDown={(e: KeyboardEvent) =>
-								(e.code === 'Space' || e.code === 'Enter') && toggleReactionMutation.mutate({ mid: message._id, reaction: name })
-							}
-							onClick={() => toggleReactionMutation.mutate({ mid: message._id, reaction: name })}
-						/>
-					))}
-				</div>
-			)}
+		<MessageReactions ref={ref} {...toolbarProps} {...props}>
+			{message.reactions &&
+				Object.entries(message.reactions).map(([name, reactions]) => (
+					<Reaction
+						key={name}
+						counter={reactions.usernames.length}
+						hasReacted={hasReacted}
+						name={name}
+						names={reactions.usernames.filter((user) => user !== username).map((username) => `@${username}`)}
+						messageId={message._id}
+						onKeyDown={(e: KeyboardEvent) =>
+							(e.code === 'Space' || e.code === 'Enter') && toggleReactionMutation.mutate({ mid: message._id, reaction: name })
+						}
+						onClick={() => toggleReactionMutation.mutate({ mid: message._id, reaction: name })}
+					/>
+				))}
 			<MessageReactionAction
 				title={t('Add_Reaction')}
 				onKeyDown={(e: KeyboardEvent) => (e.code === 'Space' || e.code === 'Enter') && openEmojiPicker(e)}

apps/meteor/server/methods/addAllUserToRoom.ts

@@ -7,6 +7,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission';
 import { settings } from '../../app/settings/server';
+import { getDefaultSubscriptionPref } from '../../app/utils/lib/getDefaultSubscriptionPref';
 import { callbacks } from '../../lib/callbacks';
 import { getSubscriptionAutotranslateDefaultConfig } from '../lib/getSubscriptionAutotranslateDefaultConfig';
 
@@ -65,6 +66,7 @@ Meteor.methods<ServerMethods>({
 				userMentions: 1,
 				groupMentions: 0,
 				...autoTranslateConfig,
+				...getDefaultSubscriptionPref(user),
 			});
 			await Message.saveSystemMessage('uj', rid, user.username || '', user, { ts: now });
 			await callbacks.run('afterJoinRoom', user, room);

apps/meteor/server/models/raw/Messages.ts

@@ -31,7 +31,6 @@ import type {
 
 import { otrSystemMessages } from '../../../app/otr/lib/constants';
 import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
-import { escapeExternalFederationEventId } from '../../services/federation/infrastructure/rocket-chat/adapters/federation-id-escape-helper';
 import { BaseRaw } from './BaseRaw';
 
 type DeepWritable<T> = T extends (...args: any) => any
@@ -549,7 +548,7 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 			{ _id },
 			{
 				$set: {
-					[`reactions.${reaction}.federationReactionEventIds.${escapeExternalFederationEventId(federationEventId)}`]: username,
+					[`reactions.${reaction}.federationReactionEventIds.${federationEventId}`]: username,
 				} as any,
 			},
 		);
@@ -560,7 +559,7 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 			{ _id },
 			{
 				$unset: {
-					[`reactions.${reaction}.federationReactionEventIds.${escapeExternalFederationEventId(federationEventId)}`]: 1,
+					[`reactions.${reaction}.federationReactionEventIds.${federationEventId}`]: 1,
 				},
 			},
 		);
@@ -606,7 +605,7 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 							$match: {
 								$and: [
 									{ 'reactions.v.usernames': { $in: [username] } },
-									{ [`reactions.v.federationReactionEventIds.${escapeExternalFederationEventId(federationEventId)}`]: username },
+									{ [`reactions.v.federationReactionEventIds.${federationEventId}`]: username },
 								],
 							},
 						},

apps/meteor/server/models/raw/Subscriptions.ts

@@ -1603,7 +1603,7 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 	}
 
 	// INSERT
-	async createWithRoomAndUser(room: IRoom, user: IUser, extraData: Record<string, any> = {}): Promise<InsertOneResult<ISubscription>> {
+	async createWithRoomAndUser(room: IRoom, user: IUser, extraData: Partial<ISubscription> = {}): Promise<InsertOneResult<ISubscription>> {
 		const subscription = {
 			open: false,
 			alert: false,

apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts

@@ -11,6 +11,7 @@ import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
 import type { FederatedRoom } from '../../../domain/FederatedRoom';
 import type { FederatedUser } from '../../../domain/FederatedUser';
 import { toInternalMessageFormat, toInternalQuoteMessageFormat } from '../converters/to-external-parser-formatter';
+import { escapeExternalFederationEventId } from './federation-id-escape-helper';
 
 const DEFAULT_EMOJI_TO_REACT_WHEN_RECEIVED_EMOJI_DOES_NOT_EXIST = ':grey_question:';
 
@@ -316,7 +317,12 @@ export class RocketChatMessageAdapter {
 		try {
 			await executeSetReaction(user.getInternalId(), reaction, message._id);
 			user.getUsername() &&
-				(await Messages.setFederationReactionEventId(user.getUsername() as string, message._id, reaction, externalEventId));
+				(await Messages.setFederationReactionEventId(
+					user.getUsername() as string,
+					message._id,
+					reaction,
+					escapeExternalFederationEventId(externalEventId),
+				));
 		} catch (error: any) {
 			if (error?.message?.includes('Invalid emoji provided.')) {
 				await executeSetReaction(user.getInternalId(), DEFAULT_EMOJI_TO_REACT_WHEN_RECEIVED_EMOJI_DOES_NOT_EXIST, message._id);
@@ -326,12 +332,16 @@ export class RocketChatMessageAdapter {
 
 	public async unreactToMessage(user: FederatedUser, message: IMessage, reaction: string, externalEventId: string): Promise<void> {
 		await executeSetReaction(user.getInternalId(), reaction, message._id);
-		await Messages.unsetFederationReactionEventId(externalEventId, message._id, reaction);
+		await Messages.unsetFederationReactionEventId(escapeExternalFederationEventId(externalEventId), message._id, reaction);
 	}
 
 	public async findOneByFederationIdOnReactions(federationEventId: string, user: FederatedUser): Promise<IMessage | null | undefined> {
 		return (
-			(user.getUsername() && Messages.findOneByFederationIdAndUsernameOnReactions(federationEventId, user.getUsername() as string)) ||
+			(user.getUsername() &&
+				Messages.findOneByFederationIdAndUsernameOnReactions(
+					escapeExternalFederationEventId(federationEventId),
+					user.getUsername() as string,
+				)) ||
 			undefined
 		);
 	}
@@ -345,7 +355,7 @@ export class RocketChatMessageAdapter {
 	}
 
 	public async unsetExternalFederationEventOnMessageReaction(externalEventId: string, message: IMessage, reaction: string): Promise<void> {
-		await Messages.unsetFederationReactionEventId(externalEventId, message._id, reaction);
+		await Messages.unsetFederationReactionEventId(escapeExternalFederationEventId(externalEventId), message._id, reaction);
 	}
 
 	public async getMessageById(internalMessageId: string): Promise<IMessage | null> {
@@ -358,6 +368,6 @@ export class RocketChatMessageAdapter {
 		reaction: string,
 		externalEventId: string,
 	): Promise<void> {
-		await Messages.setFederationReactionEventId(username, message._id, reaction, externalEventId);
+		await Messages.setFederationReactionEventId(username, message._id, reaction, escapeExternalFederationEventId(externalEventId));
 	}
 }

apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts

@@ -8,6 +8,7 @@ import { addUserToRoom } from '../../../../../../app/lib/server/functions/addUse
 import { createRoom } from '../../../../../../app/lib/server/functions/createRoom';
 import { removeUserFromRoom } from '../../../../../../app/lib/server/functions/removeUserFromRoom';
 import { settings } from '../../../../../../app/settings/server';
+import { getDefaultSubscriptionPref } from '../../../../../../app/utils/lib/getDefaultSubscriptionPref';
 import { getValidRoomName } from '../../../../../../app/utils/server/lib/getValidRoomName';
 import { DirectMessageFederatedRoom, FederatedRoom } from '../../../domain/FederatedRoom';
 import type { FederatedUser } from '../../../domain/FederatedUser';
@@ -157,8 +158,11 @@ export class RocketChatRoomAdapter {
 					if (subscription) {
 						return;
 					}
-					return Subscriptions.createWithRoomAndUser(room, federatedUser.getInternalReference(), {
+
+					const user = federatedUser.getInternalReference();
+					return Subscriptions.createWithRoomAndUser(room, user, {
 						ts: new Date(),
+						...getDefaultSubscriptionPref(user),
 					});
 				})
 				.filter(Boolean),

packages/model-typings/src/models/ISubscriptionsModel.ts

@@ -227,7 +227,7 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 		notificationOriginField: string,
 	): Promise<UpdateResult | Document>;
 	removeByUserId(userId: string): Promise<number>;
-	createWithRoomAndUser(room: IRoom, user: IUser, extraData?: Record<string, any>): Promise<InsertOneResult<ISubscription>>;
+	createWithRoomAndUser(room: IRoom, user: IUser, extraData?: Partial<ISubscription>): Promise<InsertOneResult<ISubscription>>;
 	createWithRoomAndManyUsers(
 		room: IRoom,
 		users: { user: AtLeast<IUser, '_id' | 'username' | 'name' | 'settings'>; extraData: Record<string, any> }[],