Merge branch 'RocketChat:develop' into PRTour1

.changeset/brown-forks-fry.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a problem where the setting `Show Agent Email` from Omnichannel was not being used by the back when returning agent's info

.changeset/custom-fields.md

@@ -0,0 +1,10 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-typings": patch
+"@rocket.chat/rest-typings": patch
+"@rocket.chat/ui-client": patch
+"@rocket.chat/ui-contexts": patch
+"@rocket.chat/web-ui-registration": patch
+---
+
+Added and Improved Custom Fields form to Registration Flow

.changeset/hungry-oranges-explode.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed a bug with autotranslation encoding text

.changeset/little-crews-end.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fix show badge for thread direct mentions

.changeset/pretty-clocks-add.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+fix: hidden custom fields being required in some cases

.changeset/slimy-olives-march.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/meteor': minor
+---
+
+Reintroduce an user preference to allow users to see all thread messages in the main channel

.changeset/soft-carrots-add.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed an error on mobile ios browser where if you started recording audio and denied permission, it would look like it is still recording

.changeset/two-wasps-develop.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed Business Hours behavior so they now Take seconds in consideration to assess if BH is open/closed

.github/workflows/ci-code-check.yml

@@ -22,10 +22,10 @@ jobs:
         check: ['ts', 'lint']
 
     steps:
-      # - name: Set Swap Space
-      #   uses: pierotofy/set-swap-space@master
-      #   with:
-      #     swap-size-gb: 4
+      - name: Set Swap Space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 4
 
       - uses: actions/checkout@v3
 

.github/workflows/ci.yml

@@ -116,6 +116,14 @@ jobs:
       #     docker rmi $(docker image ls -aq)
       #     df -h
 
+      - name: Cache vite
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules/.vite
+          key: vite-local-cache-${{ runner.OS }}-${{ hashFiles('package.json') }}
+          restore-keys: |
+            vite-local-cache-${{ runner.os }}-
+
       - name: Cache meteor local
         uses: actions/cache@v3
         with:

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

@@ -30,6 +30,7 @@ import { getUserInfo } from '../helpers/getUserInfo';
 import { getPaginationItems } from '../helpers/getPaginationItems';
 import { getUserFromParams } from '../helpers/getUserFromParams';
 import { i18n } from '../../../../server/lib/i18n';
+import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 
 /**
  * @openapi
@@ -392,7 +393,7 @@ API.v1.addRoute(
 API.v1.addRoute(
 	'pw.getPolicy',
 	{
-		authRequired: true,
+		authRequired: false,
 	},
 	{
 		get() {
@@ -409,6 +410,7 @@ API.v1.addRoute(
 	},
 	{
 		async get() {
+			apiDeprecationLogger.endpoint(this.request.route, '7.0.0', this.response, ' Use pw.getPolicy instead.');
 			check(
 				this.queryParams,
 				Match.ObjectIncluding({

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

@@ -564,6 +564,15 @@ API.v1.addRoute(
 			}
 
 			const { secret: secretURL, ...params } = this.bodyParams;
+
+			if (this.bodyParams.customFields) {
+				try {
+					await validateCustomFields(this.bodyParams.customFields);
+				} catch (e) {
+					return API.v1.failure(e);
+				}
+			}
+
 			// Register the user
 			const userId = await Meteor.callAsync('registerUser', {
 				...params,
@@ -579,6 +588,10 @@ API.v1.addRoute(
 				return API.v1.failure('User not found');
 			}
 
+			if (this.bodyParams.customFields) {
+				await saveCustomFields(userId, this.bodyParams.customFields);
+			}
+
 			return API.v1.success({ user });
 		},
 	},

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

@@ -20,6 +20,7 @@ import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestra
 import { Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
 import { callbacks } from '../../../../lib/callbacks';
 import { deasyncPromise } from '../../../../server/deasync/deasync';
+import { settings } from '../../../settings/server';
 
 export class AppLivechatBridge extends LivechatBridge {
 	// eslint-disable-next-line no-empty-function
@@ -90,7 +91,7 @@ export class AppLivechatBridge extends LivechatBridge {
 
 		let agentRoom: SelectedAgent | undefined;
 		if (agent?.id) {
-			const user = await Users.getAgentInfo(agent.id);
+			const user = await Users.getAgentInfo(agent.id, settings.get('Livechat_show_agent_email'));
 			if (!user) {
 				throw new Error(`The agent with id "${agent.id}" was not found.`);
 			}

apps/meteor/app/autotranslate/server/deeplTranslate.ts

@@ -198,8 +198,7 @@ class DeeplAutoTranslate extends AutoTranslate {
 	 */
 	async _translateMessage(message: IMessage, targetLanguages: string[]): Promise<ITranslationResult> {
 		const translations: { [k: string]: string } = {};
-		let msgs = message.msg.split('\n');
-		msgs = msgs.map((msg) => encodeURIComponent(msg));
+		const msgs = message.msg.split('\n');
 		const supportedLanguages = await this.getSupportedLanguages('en');
 		for await (let language of targetLanguages) {
 			if (language.indexOf('-') !== -1 && !_.findWhere(supportedLanguages, { language })) {
@@ -250,7 +249,7 @@ class DeeplAutoTranslate extends AutoTranslate {
 					params: {
 						auth_key: this.apiKey,
 						target_lang: language,
-						text: encodeURIComponent(attachment.description || attachment.text || ''),
+						text: attachment.description || attachment.text || '',
 					},
 				});
 				if (!result.ok) {

apps/meteor/app/autotranslate/server/googleTranslate.ts

@@ -126,8 +126,6 @@ class GoogleAutoTranslate extends AutoTranslate {
 	 */
 	async _translateMessage(message: IMessage, targetLanguages: string[]): Promise<ITranslationResult> {
 		const translations: { [k: string]: string } = {};
-		let msgs = message.msg.split('\n');
-		msgs = msgs.map((msg) => encodeURIComponent(msg));
 
 		const supportedLanguages = await this.getSupportedLanguages('en');
 
@@ -142,7 +140,7 @@ class GoogleAutoTranslate extends AutoTranslate {
 						key: this.apiKey,
 						target: language,
 						format: 'text',
-						q: msgs,
+						q: message.msg.split('\n'),
 					},
 				});
 				if (!result.ok) {
@@ -189,7 +187,7 @@ class GoogleAutoTranslate extends AutoTranslate {
 						key: this.apiKey,
 						target: language,
 						format: 'text',
-						q: encodeURIComponent(attachment.description || attachment.text || ''),
+						q: attachment.description || attachment.text || '',
 					},
 				});
 				if (!result.ok) {

apps/meteor/app/integrations/server/methods/incoming/updateIncomingIntegration.ts

@@ -80,7 +80,7 @@ Meteor.methods<ServerMethods>({
 						$set: {
 							scriptCompiled,
 						},
-						$unset: { scriptError: 1 },
+						$unset: { scriptError: 1 as const },
 					},
 				);
 			} catch (e) {
@@ -96,7 +96,7 @@ Meteor.methods<ServerMethods>({
 							scriptError,
 						},
 						$unset: {
-							scriptCompiled: 1,
+							scriptCompiled: 1 as const,
 						},
 					},
 				);

apps/meteor/app/integrations/server/methods/outgoing/updateOutgoingIntegration.ts

@@ -56,15 +56,15 @@ Meteor.methods<ServerMethods>({
 				{ _id: integrationId },
 				{
 					$set: { scriptCompiled: integration.scriptCompiled },
-					$unset: { scriptError: 1 },
+					$unset: { scriptError: 1 as const },
 				},
 			);
 		} else {
 			await Integrations.updateOne(
 				{ _id: integrationId },
 				{
 					$set: { scriptError: integration.scriptError },
-					$unset: { scriptCompiled: 1 },
+					$unset: { scriptCompiled: 1 as const },
 				},
 			);
 		}

apps/meteor/app/livechat/server/api/lib/livechat.ts

@@ -126,7 +126,7 @@ export function getRoom({
 	return LivechatTyped.getRoom(guest, message, roomInfo, agent, extraParams);
 }
 
-export async function findAgent(agentId: string): Promise<void | { hiddenInfo: true } | ILivechatAgent> {
+export async function findAgent(agentId?: string): Promise<void | { hiddenInfo: true } | ILivechatAgent> {
 	return normalizeAgent(agentId);
 }
 

apps/meteor/app/livechat/server/business-hour/Helper.ts

@@ -8,7 +8,7 @@ import { createDefaultBusinessHourRow } from './LivechatBusinessHours';
 export const filterBusinessHoursThatMustBeOpened = async (
 	businessHours: ILivechatBusinessHour[],
 ): Promise<Pick<ILivechatBusinessHour, '_id' | 'type'>[]> => {
-	const currentTime = moment(moment().format('dddd:HH:mm'), 'dddd:HH:mm');
+	const currentTime = moment(moment().format('dddd:HH:mm:ss'), 'dddd:HH:mm:ss');
 
 	return businessHours
 		.filter(
@@ -17,9 +17,9 @@ export const filterBusinessHoursThatMustBeOpened = async (
 				businessHour.workHours
 					.filter((hour) => hour.open)
 					.some((hour) => {
-						const localTimeStart = moment(`${hour.start.cron.dayOfWeek}:${hour.start.cron.time}`, 'dddd:HH:mm');
-						const localTimeFinish = moment(`${hour.finish.cron.dayOfWeek}:${hour.finish.cron.time}`, 'dddd:HH:mm');
-						return currentTime.isSameOrAfter(localTimeStart) && currentTime.isSameOrBefore(localTimeFinish);
+						const localTimeStart = moment(`${hour.start.cron.dayOfWeek}:${hour.start.cron.time}:00`, 'dddd:HH:mm:ss');
+						const localTimeFinish = moment(`${hour.finish.cron.dayOfWeek}:${hour.finish.cron.time}:00`, 'dddd:HH:mm:ss');
+						return currentTime.isSameOrAfter(localTimeStart) && currentTime.isBefore(localTimeFinish);
 					}),
 		)
 		.map((businessHour) => ({

apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts

@@ -12,7 +12,7 @@ callbacks.add(
 			return message;
 		}
 
-		if (!RoutingManager.getConfig().showQueue) {
+		if (!RoutingManager.getConfig()?.showQueue) {
 			// since last message is only getting used on UI as preview message when queue is enabled
 			return message;
 		}

apps/meteor/app/livechat/server/lib/Contacts.ts

@@ -72,9 +72,13 @@ export const Contacts = {
 			}
 		}
 
-		const allowedCF = LivechatCustomField.findByScope<Pick<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>>('visitor', {
-			projection: { _id: 1, label: 1, regexp: 1, required: 1 },
-		});
+		const allowedCF = LivechatCustomField.findByScope<Pick<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required' | 'visibility'>>(
+			'visitor',
+			{
+				projection: { _id: 1, label: 1, regexp: 1, required: 1 },
+			},
+			false,
+		);
 
 		const livechatData: Record<string, string> = {};
 

apps/meteor/app/livechat/server/lib/Helper.js

@@ -258,7 +258,7 @@ export const normalizeAgent = async (agentId) => {
 		return { hiddenInfo: true };
 	}
 
-	const agent = await Users.getAgentInfo(agentId);
+	const agent = await Users.getAgentInfo(agentId, settings.get('Livechat_show_agent_email'));
 	const { customFields: agentCustomFields, ...extraData } = agent;
 	const customFields = parseAgentCustomFields(agentCustomFields);