Merge branch 'develop' into feat/hide-chat-after-closing-setting

.changeset/cool-zoos-move.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed threads breaking when sending messages too fast

.changeset/dull-trainers-drive.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fix: Remove model-level query restrictions for monitors

.changeset/eleven-gorillas-deliver.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix trying to upload same file again and again.

.changeset/gentle-radios-relate.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed DM room with "guest" user kept as "read only" after reactivating user

.changeset/heavy-ads-carry.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: Change plan name from Enterprise to Premium on marketplace filtering

.changeset/lucky-vans-develop.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with file attachments in rooms' messages export having no content

.changeset/odd-hounds-thank.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+chore: Change plan name Enterprise to Premium on marketplace

.changeset/old-zoos-hang.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fix: mobile ringing notification missing call id

.changeset/perfect-pianos-yawn.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/presence': minor
+---
+
+Add peak connections monitoring and methods to get and reset the counter

.changeset/popular-actors-cheat.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Do not allow auto-translation to be enabled in E2E rooms

.changeset/proud-shrimps-cheat.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: Unable to send attachments via email as an omni-agent

.changeset/rich-dogs-smell.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Fix typing indicator of Apps user

.changeset/seven-carpets-march.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Add new permission to allow kick users from rooms without being a member

.changeset/shiny-pillows-run.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: cloud alerts not working

.changeset/slow-coats-shout.md

@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Add the daily and monthly peaks of concurrent connections to statistics
+ - Added `dailyPeakConnections` statistic for monitoring the daily peak of concurrent connections in a workspace;
+ - Added `maxMonthlyPeakConnections` statistic for monitoring the last 30 days peak of concurrent connections in a workspace;

.changeset/stale-masks-learn.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/server-fetch': patch
+---
+
+Fixed an issue where the payload of an HTTP request made by an app wouldn't be correctly encoded in some cases

.changeset/sweet-feet-relate.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: user dropdown menu position on RTL layout

.changeset/tough-apples-turn.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Forward headers when using proxy for file uploads

.changeset/weak-cameras-pay.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with message read receipts not being created when accessing a room the first time

.changeset/wicked-humans-hang.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Improve cache of static files

.changeset/wicked-jars-double.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Handle the username update in the background

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

@@ -26,29 +26,7 @@ import { getLoggedInUser } from '../helpers/getLoggedInUser';
 import { getPaginationItems } from '../helpers/getPaginationItems';
 import { getUserFromParams, getUserListFromParams } from '../helpers/getUserFromParams';
 
-// Returns the private group subscription IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
-async function findPrivateGroupByIdOrName({
-	params,
-	checkedArchived = true,
-	userId,
-}: {
-	params:
-		| {
-				roomId?: string;
-		  }
-		| {
-				roomName?: string;
-		  };
-	userId: string;
-	checkedArchived?: boolean;
-}): Promise<{
-	rid: string;
-	open: boolean;
-	ro: boolean;
-	t: string;
-	name: string;
-	broadcast: boolean;
-}> {
+async function getRoomFromParams(params: { roomId?: string } | { roomName?: string }): Promise<IRoom> {
 	if (
 		(!('roomId' in params) && !('roomName' in params)) ||
 		('roomId' in params && !(params as { roomId?: string }).roomId && 'roomName' in params && !(params as { roomName?: string }).roomName)
@@ -68,17 +46,48 @@ async function findPrivateGroupByIdOrName({
 			broadcast: 1,
 		},
 	};
-	let room: IRoom | null = null;
-	if ('roomId' in params) {
-		room = await Rooms.findOneById(params.roomId || '', roomOptions);
-	} else if ('roomName' in params) {
-		room = await Rooms.findOneByName(params.roomName || '', roomOptions);
-	}
+
+	const room = await (() => {
+		if ('roomId' in params) {
+			return Rooms.findOneById(params.roomId || '', roomOptions);
+		}
+		if ('roomName' in params) {
+			return Rooms.findOneByName(params.roomName || '', roomOptions);
+		}
+	})();
 
 	if (!room || room.t !== 'p') {
 		throw new Meteor.Error('error-room-not-found', 'The required "roomId" or "roomName" param provided does not match any group');
 	}
 
+	return room;
+}
+
+// Returns the private group subscription IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
+async function findPrivateGroupByIdOrName({
+	params,
+	checkedArchived = true,
+	userId,
+}: {
+	params:
+		| {
+				roomId?: string;
+		  }
+		| {
+				roomName?: string;
+		  };
+	userId: string;
+	checkedArchived?: boolean;
+}): Promise<{
+	rid: string;
+	open: boolean;
+	ro: boolean;
+	t: string;
+	name: string;
+	broadcast: boolean;
+}> {
+	const room = await getRoomFromParams(params);
+
 	const user = await Users.findOneById(userId, { projections: { username: 1 } });
 
 	if (!room || !user || !(await canAccessRoomAsync(room, user))) {
@@ -585,17 +594,14 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async post() {
-			const findResult = await findPrivateGroupByIdOrName({
-				params: this.bodyParams,
-				userId: this.userId,
-			});
+			const room = await getRoomFromParams(this.bodyParams);
 
 			const user = await getUserFromParams(this.bodyParams);
 			if (!user?.username) {
 				return API.v1.failure('Invalid user');
 			}
 
-			await removeUserFromRoomMethod(this.userId, { rid: findResult.rid, username: user.username });
+			await removeUserFromRoomMethod(this.userId, { rid: room._id, username: user.username });
 
 			return API.v1.success();
 		},

apps/meteor/app/apps/server/bridges/livechat.ts

@@ -288,7 +288,7 @@ export class AppLivechatBridge extends LivechatBridge {
 			throw new Error('Could not get the message converter to process livechat room messages');
 		}
 
-		const livechatMessages = await Livechat.getRoomMessages({ rid: roomId });
+		const livechatMessages = await LivechatTyped.getRoomMessages({ rid: roomId });
 
 		return Promise.all(livechatMessages.map((message) => messageConverter.convertMessage(message) as Promise<IAppsEngineMesage>));
 	}

apps/meteor/app/apps/server/bridges/messages.ts

@@ -103,7 +103,11 @@ export class AppMessageBridge extends MessageBridge {
 	protected async typing({ scope, id, username, isTyping }: ITypingDescriptor): Promise<void> {
 		switch (scope) {
 			case 'room':
-				notifications.notifyRoom(id, 'typing', username!, isTyping);
+				if (!username) {
+					throw new Error('Invalid username');
+				}
+
+				notifications.notifyRoom(id, 'user-activity', username, isTyping ? ['user-typing'] : []);
 				return;
 			default:
 				throw new Error('Unrecognized typing scope provided');

apps/meteor/app/authorization/server/constant/permissions.ts

@@ -10,6 +10,8 @@ export const permissions = [
 	{ _id: 'add-user-to-joined-room', roles: ['admin', 'owner', 'moderator'] },
 	{ _id: 'add-user-to-any-c-room', roles: ['admin'] },
 	{ _id: 'add-user-to-any-p-room', roles: [] },
+	{ _id: 'kick-user-from-any-c-room', roles: ['admin'] },
+	{ _id: 'kick-user-from-any-p-room', roles: [] },
 	{ _id: 'api-bypass-rate-limit', roles: ['admin', 'bot', 'app'] },
 	{ _id: 'archive-room', roles: ['admin', 'owner'] },
 	{ _id: 'assign-admin-role', roles: ['admin'] },

apps/meteor/app/autotranslate/server/methods/saveSettings.ts

@@ -1,4 +1,4 @@
-import { Subscriptions } from '@rocket.chat/models';
+import { Subscriptions, Rooms } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -46,6 +46,13 @@ Meteor.methods<ServerMethods>({
 
 		switch (field) {
 			case 'autoTranslate':
+				const room = await Rooms.findE2ERoomById(rid, { projection: { _id: 1 } });
+				if (room && value === '1') {
+					throw new Meteor.Error('error-e2e-enabled', 'Enabling auto-translation in E2E encrypted rooms is not allowed', {
+						method: 'saveAutoTranslateSettings',
+					});
+				}
+
 				await Subscriptions.updateAutoTranslateById(subscription._id, value === '1');
 				if (!subscription.autoTranslateLanguage && options.defaultLanguage) {
 					await Subscriptions.updateAutoTranslateLanguageById(subscription._id, options.defaultLanguage);

apps/meteor/app/cas/server/cas_server.js

@@ -257,7 +257,7 @@ Accounts.registerLoginHandler('cas', async (options) => {
 				if (roomName) {
 					let room = await Rooms.findOneByNameAndType(roomName, 'c');
 					if (!room) {
-						room = await createRoom('c', roomName, user.username);
+						room = await createRoom('c', roomName, user);
 					}
 				}
 			}

apps/meteor/app/channel-settings/server/functions/saveRoomEncrypted.ts

@@ -1,7 +1,7 @@
 import { Message } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
 import { isRegisterUser } from '@rocket.chat/core-typings';
-import { Rooms } from '@rocket.chat/models';
+import { Rooms, Subscriptions } from '@rocket.chat/models';
 import { Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import type { UpdateResult } from 'mongodb';
@@ -25,5 +25,9 @@ export const saveRoomEncrypted = async function (rid: string, encrypted: boolean
 
 		await Message.saveSystemMessage(type, rid, user.username, user);
 	}
+
+	if (encrypted) {
+		await Subscriptions.disableAutoTranslateByRoomId(rid);
+	}
 	return update;
 };

apps/meteor/app/cloud/server/functions/buildRegistrationData.ts

@@ -89,7 +89,7 @@ export async function buildWorkspaceRegistrationData<T extends string | undefine
 		setupComplete: setupWizardState === 'completed',
 		connectionDisable: !registerServer,
 		npsEnabled,
-		MAC: stats.omnichannelContactsBySource.contactsCount,
+		MAC: stats.omnichannelContactsBySource?.contactsCount ?? 0,
 		// activeContactsBillingMonth: stats.omnichannelContactsBySource.contactsCount,
 		// activeContactsYesterday: stats.uniqueContactsOfYesterday.contactsCount,
 	};

apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts

@@ -73,7 +73,7 @@ export async function getWorkspaceLicense(): Promise<{ updated: boolean; license
 
 		const payload = await fetchCloudWorkspaceLicensePayload({ token });
 
-		if (Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
+		if (currentLicense.value && Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
 			return fromCurrentLicense();
 		}
 

apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts

@@ -107,7 +107,7 @@ export async function announcementSync() {
 	} catch (err) {
 		SystemLogger.error({
 			msg: 'Failed to sync with Rocket.Chat Cloud',
-			url: '/sync',
+			url: '/comms/workspace',
 			err,
 		});
 	}

apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts

@@ -1,3 +1,4 @@
+import { SystemLogger } from '../../../../../server/lib/logger/system';
 import { CloudWorkspaceAccessTokenError } from '../getWorkspaceAccessToken';
 import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken';
 import { announcementSync } from './announcementSync';
@@ -7,10 +8,11 @@ export async function syncWorkspace() {
 	try {
 		await syncCloudData();
 		await announcementSync();
-	} catch (error) {
-		if (error instanceof CloudWorkspaceAccessTokenError) {
+	} catch (err) {
+		if (err instanceof CloudWorkspaceAccessTokenError) {
 			// TODO: Remove License if there is no access token
 		}
+		SystemLogger.error({ msg: 'Error during workspace sync', err });
 	}
 
 	await getCachedSupportedVersionsToken.reset();