Merge branch 'develop' into bump-webpack

Author: julio-rocketchat

.changeset/proud-mayflies-invite.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Includes attachments metadata in JSON export if type is file when exporting messages

.changeset/yellow-cars-change.md

@@ -0,0 +1,8 @@
+---
+'@rocket.chat/fuselage-ui-kit': patch
+'@rocket.chat/ui-video-conf': patch
+'@rocket.chat/i18n': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where video conf message block wasn't considering display avatars preference

.github/CODEOWNERS

@@ -20,7 +20,7 @@
 /apps/meteor/app/voip @RocketChat/omnichannel
 /apps/meteor/app/sms @RocketChat/omnichannel
 /apps/meteor/server @RocketChat/backend
-/apps/meteor/server/models @RocketChat/Architecture
+/packages/models @RocketChat/Architecture
 apps/meteor/server/startup/migrations @RocketChat/Architecture
 /apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel
 /apps/meteor/server/services/voip-asterisk @RocketChat/omnichannel

apps/meteor/app/push/server/apn.ts

@@ -1,13 +1,13 @@
+import apn from '@parse/node-apn';
 import type { IAppsTokens, RequiredField } from '@rocket.chat/core-typings';
-import apn from 'apn';
 import EJSON from 'ejson';
 
 import type { PushOptions, PendingPushNotification } from './definition';
 import { logger } from './logger';
 
 let apnConnection: apn.Provider | undefined;
 
-declare module 'apn' {
+declare module '@parse/node-apn' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Notification {
 		setContentAvailable: (value: boolean | 1 | 0) => void;
@@ -72,7 +72,7 @@ export const sendAPN = ({
 		response.failed.forEach((failure) => {
 			logger.debug(`Got error code ${failure.status} for token ${userToken}`);
 
-			if (['400', '410'].includes(failure.status ?? '')) {
+			if (['400', '410'].includes(String(failure.status))) {
 				logger.debug(`Removing token ${userToken}`);
 				_removeToken({
 					apn: userToken,

apps/meteor/client/startup/index.ts

@@ -20,7 +20,6 @@ import './reloadRoomAfterLogin';
 import './roles';
 import './rootUrlChange';
 import './routes';
-import './setupWizard';
 import './slashCommands';
 import './startup';
 import './streamMessage';

apps/meteor/client/startup/setupWizard.ts

@@ -0,0 +1,17 @@
+import { useRole, useRouter, useSetting, useUserId } from '@rocket.chat/ui-contexts';
+import { useEffect } from 'react';
+
+export const useRedirectToSetupWizard = (): void => {
+	const userId = useUserId();
+	const setupWizardState = useSetting('Show_Setup_Wizard');
+	const router = useRouter();
+	const isAdmin = useRole('admin');
+
+	const isWizardInProgress = userId && isAdmin && setupWizardState === 'in_progress';
+	const mustRedirect = (!userId && setupWizardState === 'pending') || isWizardInProgress;
+	useEffect(() => {
+		if (mustRedirect) {
+			router.navigate('/setup-wizard');
+		}
+	}, [mustRedirect, router]);
+};

apps/meteor/client/startup/useRedirectToSetupWizard.ts

@@ -51,6 +51,8 @@ const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMes
 	});
 
 	const handleRecord = useEffectEvent(async () => {
+		chat?.composer?.setRecordingMode(true);
+
 		if (recordingRoomId && recordingRoomId !== rid) {
 			return;
 		}
@@ -105,7 +107,7 @@ const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMes
 	}
 
 	return (
-		<Box display='flex' position='absolute' color='default' pi={4} pb={12}>
+		<Box display='flex' position='absolute' color='default' pi={4} pb={12} role='group' aria-label={t('Audio_recorder')}>
 			{state === 'recording' && (
 				<>
 					<MessageComposerAction icon='circle-cross' title={t('Cancel_recording')} onClick={handleCancelButtonClick} />

apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx

@@ -8,7 +8,29 @@ import { Messages } from '../../../../../app/models/client';
 import { downloadJsonAs } from '../../../../lib/download';
 import { useRoom } from '../../contexts/RoomContext';
 
-const messagesFields: FindOptions<IMessage> = { projection: { _id: 1, ts: 1, u: 1, msg: 1, _updatedAt: 1, tlm: 1, replies: 1, tmid: 1 } };
+const messagesFields: FindOptions<IMessage> = {
+	projection: {
+		'_id': 1,
+		'ts': 1,
+		'u': 1,
+		'msg': 1,
+		'_updatedAt': 1,
+		'tlm': 1,
+		'replies': 1,
+		'tmid': 1,
+		'attachments.ts': 1,
+		'attachments.title': 1,
+		'attachments.title_link': 1,
+		'attachments.title_link_download': 1,
+		'attachments.image_dimensions': 1,
+		'attachments.image_preview': 1,
+		'attachments.image_url': 1,
+		'attachments.image_type': 1,
+		'attachments.image_size': 1,
+		'attachments.type': 1,
+		'attachments.description': 1,
+	},
+};
 
 export const useDownloadExportMutation = () => {
 	const { t } = useTranslation();

apps/meteor/client/views/room/contextualBar/ExportMessages/useDownloadExportMutation.ts

@@ -106,7 +106,7 @@ const VideoConfListItem = ({
 								</Avatar.Stack>
 								<Box mis={4}>
 									{joinedUsers.length > VIDEOCONF_STACK_MAX_USERS
-										? t('__usersCount__member_joined', { count: joinedUsers.length - VIDEOCONF_STACK_MAX_USERS })
+										? t('__usersCount__joined', { count: joinedUsers.length - VIDEOCONF_STACK_MAX_USERS })
 										: t('joined')}
 								</Box>
 							</Box>