Merge branch 'develop' into feat/export-e2ee

.changeset/big-timers-relax.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/meteor': minor
+---
+
+Adds a new `contacts.checkExistence` endpoint, which allows identifying whether there's already a registered contact using a given email, phone, id or visitor to source association.

.changeset/lucky-wolves-turn.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a UI issue that showed the incorrect migration number on the `Information` page. This was caused by a function calculating the stats before the server had migrated the database and updated the control.

.changeset/quiet-lions-unite.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes sidepanel list not sorting by last message inside thread

.changeset/slow-readers-help.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes an issue where the update banner wasn't showing the new version number

apps/meteor/app/lib/server/methods/createChannel.ts

@@ -25,7 +25,7 @@ export const createChannelMethod = async (
 	name: string,
 	members: string[],
 	readOnly = false,
-	customFields: Record<string, any> = {},
+	customFields?: Record<string, any>,
 	extraData: Record<string, any> = {},
 	excludeSelf = false,
 ) => {
@@ -53,7 +53,7 @@ export const createChannelMethod = async (
 	}
 
 	return createRoom('c', name, user, members, excludeSelf, readOnly, {
-		customFields,
+		...(customFields && Object.keys(customFields).length && { customFields }),
 		...extraData,
 	});
 };

apps/meteor/app/lib/server/methods/createPrivateGroup.ts

@@ -25,7 +25,7 @@ export const createPrivateGroupMethod = async (
 	name: string,
 	members: string[],
 	readOnly = false,
-	customFields: Record<string, any> = {},
+	customFields?: Record<string, any>,
 	extraData: Record<string, any> = {},
 	excludeSelf = false,
 ): Promise<
@@ -51,7 +51,7 @@ export const createPrivateGroupMethod = async (
 	}
 
 	return createRoom('p', name, user, members, excludeSelf, readOnly, {
-		customFields,
+		...(customFields && Object.keys(customFields).length && { customFields }),
 		...extraData,
 	});
 };

apps/meteor/app/livechat/server/api/v1/contact.ts

@@ -6,6 +6,7 @@ import {
 	isGETOmnichannelContactHistoryProps,
 	isGETOmnichannelContactsChannelsProps,
 	isGETOmnichannelContactsSearchProps,
+	isGETOmnichannelContactsCheckExistenceProps,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Match, check } from 'meteor/check';
@@ -166,6 +167,20 @@ API.v1.addRoute(
 	},
 );
 
+API.v1.addRoute(
+	'omnichannel/contacts.checkExistence',
+	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsCheckExistenceProps },
+	{
+		async get() {
+			const { contactId, visitor, email, phone } = this.queryParams;
+
+			const contact = await (visitor ? getContactByChannel(visitor) : LivechatContacts.countByContactInfo({ contactId, email, phone }));
+
+			return API.v1.success({ exists: !!contact });
+		},
+	},
+);
+
 API.v1.addRoute(
 	'omnichannel/contacts.history',
 	{ authRequired: true, permissionsRequired: ['view-livechat-contact-history'], validateParams: isGETOmnichannelContactHistoryProps },

apps/meteor/app/models/client/models/CachedChatSubscription.ts

@@ -125,6 +125,10 @@ class CachedChatSubscription extends CachedCollection<SubscriptionWithRoom, ISub
 		};
 	}
 
+	async upsertSubscription(record: ISubscription): Promise<void> {
+		return this.handleRecordEvent('changed', record);
+	}
+
 	protected deserializeFromCache(record: unknown) {
 		const deserialized = super.deserializeFromCache(record);
 

apps/meteor/app/theme/client/imports/general/base_old.css

@@ -181,47 +181,6 @@ blockquote {
 	animation: highlight 6s infinite;
 }
 
-.page-settings {
-	& .settings-file-preview {
-		display: flex;
-		align-items: center;
-
-		& input[type='file'] {
-			position: absolute !important;
-			z-index: 10000;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			cursor: pointer;
-			opacity: 0;
-
-			& * {
-				cursor: pointer;
-			}
-		}
-
-		& .preview {
-			overflow: hidden;
-			width: 100px;
-			height: 40px;
-			margin-right: 0.75rem;
-			border-width: var(--input-border-width);
-			border-color: var(--input-border-color);
-			border-radius: var(--input-border-radius);
-			background-repeat: no-repeat;
-			background-position: center center;
-			background-size: contain;
-
-			&.no-file {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-	}
-}
-
 .room-not-found {
 	display: flex;
 	flex-direction: column;

apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts

@@ -44,7 +44,7 @@ export const formattingButtons: ReadonlyArray<FormattingButton> = [
 		command: 'i',
 	},
 	{
-		label: 'Strike',
+		label: 'Strikethrough',
 		icon: 'strike',
 		pattern: '~{{text}}~',
 	},
@@ -54,7 +54,7 @@ export const formattingButtons: ReadonlyArray<FormattingButton> = [
 		pattern: '`{{text}}`',
 	},
 	{
-		label: 'Multi_line',
+		label: 'Multi_line_code',
 		icon: 'multiline',
 		pattern: '```\n{{text}}\n``` ',
 	},

apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts

@@ -10,7 +10,7 @@ import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
 import { fireGlobalEvent } from '../../../../client/lib/utils/fireGlobalEvent';
 import { getConfig } from '../../../../client/lib/utils/getConfig';
 import { callbacks } from '../../../../lib/callbacks';
-import { CachedChatRoom, Messages, Subscriptions, CachedChatSubscription } from '../../../models/client';
+import { Messages, Subscriptions, CachedChatSubscription } from '../../../models/client';
 import { sdk } from '../../../utils/client/lib/SDKClient';
 
 const maxRoomsOpen = parseInt(getConfig('maxRoomsOpen') ?? '5') || 5;
@@ -79,8 +79,7 @@ function getOpenedRoomByRid(rid: IRoom['_id']) {
 }
 
 const computation = Tracker.autorun(() => {
-	const ready = CachedChatRoom.ready.get() && mainReady.get();
-	if (ready !== true) {
+	if (!mainReady.get()) {
 		return;
 	}
 	Tracker.nonreactive(() =>

apps/meteor/app/ui/client/lib/KonchatNotification.ts

@@ -10,7 +10,7 @@ import { router } from '../../../../client/providers/RouterProvider';
 import { stripTags } from '../../../../lib/utils/stringUtils';
 import { CustomSounds } from '../../../custom-sounds/client/lib/CustomSounds';
 import { e2e } from '../../../e2e/client';
-import { Subscriptions } from '../../../models/client';
+import { Subscriptions, Users } from '../../../models/client';
 import { getUserPreference } from '../../../utils/client';
 import { getUserAvatarURL } from '../../../utils/client/getUserAvatarURL';
 import { getUserNotificationsSoundVolume } from '../../../utils/client/getUserNotificationsSoundVolume';
@@ -207,27 +207,29 @@ class KonchatNotification {
 		}
 	}
 
-	public newRoom(rid: IRoom['_id']) {
+	public newRoom() {
 		Tracker.nonreactive(() => {
-			let newRoomSound = Session.get('newRoomSound') as IRoom['_id'][] | undefined;
-			if (newRoomSound) {
-				newRoomSound = [...newRoomSound, rid];
-			} else {
-				newRoomSound = [rid];
+			const uid = Meteor.userId();
+			if (!uid) {
+				return;
 			}
+			const user = Users.findOne(uid, {
+				fields: {
+					'settings.preferences.newRoomNotification': 1,
+					'settings.preferences.notificationsSoundVolume': 1,
+				},
+			});
+			const newRoomNotification = getUserPreference<string>(user, 'newRoomNotification');
+			const audioVolume = getUserNotificationsSoundVolume(user?._id);
 
-			return Session.set('newRoomSound', newRoomSound);
-		});
-	}
-
-	public removeRoomNotification(rid: IRoom['_id']) {
-		let newRoomSound = (Session.get('newRoomSound') as IRoom['_id'][] | undefined) ?? [];
-		newRoomSound = newRoomSound.filter((_rid) => _rid !== rid);
-		Tracker.nonreactive(() => Session.set('newRoomSound', newRoomSound));
-
-		const link = document.querySelector(`.link-room-${rid}`);
+			if (!newRoomNotification) {
+				return;
+			}
 
-		link?.classList.remove('new-room-highlight');
+			void CustomSounds.play(newRoomNotification, {
+				volume: Number((audioVolume / 100).toPrecision(2)),
+			});
+		});
 	}
 }
 

apps/meteor/client/hooks/useNotifyUser.ts

@@ -22,7 +22,7 @@ export const useNotifyUser = () => {
 		}
 
 		if ((!router.getRouteParameters().name || router.getRouteParameters().name !== sub.name) && !sub.ls && sub.alert === true) {
-			KonchatNotification.newRoom(sub.rid);
+			KonchatNotification.newRoom();
 		}
 	});
 

apps/meteor/client/hooks/useContinuousSoundNotification.ts → apps/meteor/client/hooks/useOmnichannelContinuousSoundNotification.ts

@@ -6,7 +6,7 @@ import { useUserSoundPreferences } from './useUserSoundPreferences';
 import { CustomSounds } from '../../app/custom-sounds/client/lib/CustomSounds';
 
 const query = { t: 'l', ls: { $exists: false }, open: true };
-export const useContinuousSoundNotification = () => {
+export const useOmnichannelContinuousSoundNotification = <T>(queue: T[]) => {
 	const userSubscriptions = useUserSubscriptions(query);
 
 	const playNewRoomSoundContinuously = useSetting('Livechat_continuous_sound_notification_new_livechat_room');
@@ -16,6 +16,8 @@ export const useContinuousSoundNotification = () => {
 
 	const continuousCustomSoundId = newRoomNotification && `${newRoomNotification}-continuous`;
 
+	const hasUnreadRoom = userSubscriptions.length > 0 || queue.length > 0;
+
 	useEffect(() => {
 		let audio: ICustomSound;
 		if (playNewRoomSoundContinuously && continuousCustomSoundId) {
@@ -39,7 +41,7 @@ export const useContinuousSoundNotification = () => {
 			return;
 		}
 
-		if (userSubscriptions.length === 0) {
+		if (!hasUnreadRoom) {
 			CustomSounds.pause(continuousCustomSoundId);
 			return;
 		}
@@ -48,5 +50,5 @@ export const useContinuousSoundNotification = () => {
 			volume: notificationsSoundVolume,
 			loop: true,
 		});
-	}, [continuousCustomSoundId, playNewRoomSoundContinuously, userSubscriptions, notificationsSoundVolume]);
+	}, [continuousCustomSoundId, playNewRoomSoundContinuously, userSubscriptions, notificationsSoundVolume, hasUnreadRoom]);
 };

apps/meteor/client/lib/cachedCollections/CachedCollection.ts

@@ -69,23 +69,6 @@ export class CachedCollection<T extends { _id: string }, U = T> {
 			: () => undefined;
 
 		CachedCollectionManager.register(this);
-
-		if (!userRelated) {
-			void this.init();
-			return;
-		}
-
-		if (process.env.NODE_ENV === 'test') {
-			return;
-		}
-
-		onLoggedIn(() => {
-			void this.init();
-		});
-
-		Accounts.onLogout(() => {
-			this.ready.set(false);
-		});
 	}
 
 	protected get eventName(): `${Name}-changed` | `${string}/${Name}-changed` {
@@ -239,23 +222,27 @@ export class CachedCollection<T extends { _id: string }, U = T> {
 	async setupListener() {
 		sdk.stream(this.eventType, [this.eventName], (async (action: 'removed' | 'changed', record: any) => {
 			this.log('record received', action, record);
-			const newRecord = this.handleReceived(record, action);
+			await this.handleRecordEvent(action, record);
+		}) as (...args: unknown[]) => void);
+	}
 
-			if (!hasId(newRecord)) {
-				return;
-			}
+	protected async handleRecordEvent(action: 'removed' | 'changed', record: any) {
+		const newRecord = this.handleReceived(record, action);
 
-			if (action === 'removed') {
-				this.collection.remove(newRecord._id);
-			} else {
-				const { _id } = newRecord;
-				if (!_id) {
-					return;
-				}
-				this.collection.upsert({ _id } as any, newRecord);
+		if (!hasId(newRecord)) {
+			return;
+		}
+
+		if (action === 'removed') {
+			this.collection.remove(newRecord._id);
+		} else {
+			const { _id } = newRecord;
+			if (!_id) {
+				return;
 			}
-			await this.save();
-		}) as (...args: unknown[]) => void);
+			this.collection.upsert({ _id } as any, newRecord);
+		}
+		await this.save();
 	}
 
 	trySync(delay = 10) {
@@ -368,4 +355,23 @@ export class CachedCollection<T extends { _id: string }, U = T> {
 	}
 
 	private reconnectionComputation: Tracker.Computation | undefined;
+
+	listen() {
+		if (!this.userRelated) {
+			void this.init();
+			return;
+		}
+
+		if (process.env.NODE_ENV === 'test') {
+			return;
+		}
+
+		onLoggedIn(() => {
+			void this.init();
+		});
+
+		Accounts.onLogout(() => {
+			this.ready.set(false);
+		});
+	}
 }

apps/meteor/client/lib/chats/flows/sendMessage.ts

@@ -1,6 +1,5 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 
-import { KonchatNotification } from '../../../../app/ui/client/lib/KonchatNotification';
 import { sdk } from '../../../../app/utils/client/lib/SDKClient';
 import { t } from '../../../../app/utils/lib/i18n';
 import { onClientBeforeSendMessage } from '../../onClientBeforeSendMessage';
@@ -12,8 +11,6 @@ import { processSlashCommand } from './processSlashCommand';
 import { processTooLongMessage } from './processTooLongMessage';
 
 const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[], isSlashCommandAllowed?: boolean): Promise<void> => {
-	KonchatNotification.removeRoomNotification(message.rid);
-
 	if (await processSetReaction(chat, message)) {
 		return;
 	}

apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx

@@ -98,7 +98,7 @@ const CannedResponsesComposer = ({ onChange, ...props }: ComponentProps<typeof M
 					<MessageComposerActionsDivider />
 					<MessageComposerAction icon='bold' onClick={useMarkdownSyntax('*')} title={t('Bold')} />
 					<MessageComposerAction icon='italic' onClick={useMarkdownSyntax('_')} title={t('Italic')} />
-					<MessageComposerAction icon='strike' onClick={useMarkdownSyntax('~')} title={t('Strike')} />
+					<MessageComposerAction icon='strike' onClick={useMarkdownSyntax('~')} title={t('Strikethrough')} />
 					<MessageComposerAction icon='link' onClick={useMarkdownSyntax('[]()')} title={t('Link')} />
 					<MessageComposerActionsDivider />
 					<Button ref={ref} small onClick={openPlaceholderSelect}>