Merge branch 'develop' into feat/single-contact-id

.changeset/cool-dryers-judge.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Send messages with encrypted attachments to mobile notification service

.changeset/modern-trees-draw.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed the regex for domains in the isValidDomain function

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

@@ -57,7 +57,7 @@ export const isValidIPv4 = (ip: string): boolean => {
 };
 
 export const isValidDomain = (domain: string): boolean => {
-	const domainPattern = /^(?!-)(?!.*--)[A-Za-z0-9-]{1,63}(?<!-)\.?([A-Za-z]{2,63}\.?)*[A-Za-z]{2,63}$/;
+	const domainPattern = /^(?!-)(?!.*--)[A-Za-z0-9-]{1,63}(?<!-)\.?([A-Za-z0-9-]{2,63}\.?)*[A-Za-z]{2,63}$/;
 	if (!domainPattern.test(domain)) {
 		return false;
 	}

apps/meteor/app/lib/server/functions/notifications/mobile.js

@@ -52,7 +52,7 @@ export async function getPushData({
 			name: settings.get('Push_show_username_room') ? room.name : '',
 			messageType: message.t,
 			tmid: message.tmid,
-			...(message.t === 'e2e' && { msg: message.msg }),
+			...(message.t === 'e2e' && { msg: message.msg, content: message.content }),
 		},
 		roomName:
 			settings.get('Push_show_username_room') && roomCoordinator.getRoomDirectives(room.t).isGroupChat(room)

apps/meteor/app/statistics/server/lib/getAppsStatistics.ts

@@ -1,5 +1,6 @@
 import { Apps } from '@rocket.chat/apps';
 import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/AppStatus';
+import { AppInstallationSource } from '@rocket.chat/apps-engine/server/storage';
 import mem from 'mem';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
@@ -10,6 +11,8 @@ export type AppsStatistics = {
 	totalInstalled: number | false;
 	totalActive: number | false;
 	totalFailed: number | false;
+	totalPrivateApps: number | false;
+	totalPrivateAppsEnabled: number | false;
 };
 
 async function _getAppsStatistics(): Promise<AppsStatistics> {
@@ -19,6 +22,8 @@ async function _getAppsStatistics(): Promise<AppsStatistics> {
 			totalInstalled: false,
 			totalActive: false,
 			totalFailed: false,
+			totalPrivateApps: false,
+			totalPrivateAppsEnabled: false,
 		};
 	}
 
@@ -28,12 +33,23 @@ async function _getAppsStatistics(): Promise<AppsStatistics> {
 		let totalInstalled = 0;
 		let totalActive = 0;
 		let totalFailed = 0;
+		let totalPrivateApps = 0;
+		let totalPrivateAppsEnabled = 0;
 
 		await Promise.all(
 			apps.map(async (app) => {
 				totalInstalled++;
 
 				const status = await app.getStatus();
+				const storageItem = await app.getStorageItem();
+
+				if (storageItem.installationSource === AppInstallationSource.PRIVATE) {
+					totalPrivateApps++;
+
+					if (AppStatusUtils.isEnabled(status)) {
+						totalPrivateAppsEnabled++;
+					}
+				}
 
 				if (status === AppStatus.MANUALLY_DISABLED) {
 					totalFailed++;
@@ -50,6 +66,8 @@ async function _getAppsStatistics(): Promise<AppsStatistics> {
 			totalInstalled,
 			totalActive,
 			totalFailed,
+			totalPrivateApps,
+			totalPrivateAppsEnabled,
 		};
 	} catch (err: unknown) {
 		SystemLogger.error({ msg: 'Exception while getting Apps statistics', err });
@@ -58,6 +76,8 @@ async function _getAppsStatistics(): Promise<AppsStatistics> {
 			totalInstalled: false,
 			totalActive: false,
 			totalFailed: false,
+			totalPrivateApps: false,
+			totalPrivateAppsEnabled: false,
 		};
 	}
 }

apps/meteor/app/statistics/server/lib/statistics.ts

@@ -157,6 +157,13 @@ export const statistics = {
 				}),
 		);
 
+		// Number of livechat rooms with department
+		statsPms.push(
+			LivechatRooms.countLivechatRoomsWithDepartment().then((count) => {
+				statistics.totalLivechatRoomsWithDepartment = count;
+			}),
+		);
+
 		// Number of departments
 		statsPms.push(
 			LivechatDepartment.estimatedDocumentCount().then((count) => {

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

@@ -2609,6 +2609,10 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 			.toArray();
 	}
 
+	countLivechatRoomsWithDepartment(): Promise<number> {
+		return this.col.countDocuments({ departmentId: { $exists: true } });
+	}
+
 	async unsetAllPredictedVisitorAbandonment(): Promise<void> {
 		throw new Error('Method not implemented.');
 	}

packages/core-typings/src/IStats.ts

@@ -56,6 +56,8 @@ export interface IStats {
 	totalDirectMessages: number;
 	totalDiscussionsMessages: number;
 	totalLivechatMessages: number;
+	totalLivechatRoomsWithPriority: number;
+	totalLivechatRoomsWithDepartment: number;
 	totalTriggers: number;
 	totalMessages: number;
 	federatedServers: number;

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

@@ -271,4 +271,5 @@ export interface ILivechatRoomsModel extends IBaseModel<IOmnichannelRoom> {
 		source?: string;
 		options?: FindOptions;
 	}): FindPaginated<FindCursor<IOmnichannelRoom>>;
+	countLivechatRoomsWithDepartment(): Promise<number>;
 }