Updated dependencies [88e5219bd2, b4bbcbfc9a, 8fc6ca8b4e, 15664127be, 25da5280a5, 1b7b1161cf, 439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 3ffe4a2944, 3b4b19cfc5, 4e8aa575a6, 03c8b066f9, 264d7d5496, b8e5887fb9]:
+ + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.0 + - @rocket.chat/i18n@0.6.0-rc.0 + - @rocket.chat/tools@0.2.2-rc.0 + - @rocket.chat/web-ui-registration@9.0.0-rc.0 + - @rocket.chat/ui-client@9.0.0-rc.0 + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/omnichannel-services@0.3.0-rc.0 + - @rocket.chat/pdf-worker@0.2.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/ui-video-conf@9.0.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/ui-contexts@9.0.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/ui-kit@0.36.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 + - @rocket.chat/apps@0.1.2-rc.0 + - @rocket.chat/presence@0.2.2-rc.0 + - @rocket.chat/gazzodown@9.0.0-rc.0 + - @rocket.chat/api-client@0.2.2-rc.0 + - @rocket.chat/license@0.2.2-rc.0 + - @rocket.chat/cron@0.1.2-rc.0 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.0 + - @rocket.chat/instance-status@0.1.2-rc.0 + - @rocket.chat/server-cloud-communication@0.0.2 + +## 6.10.2 + +### Patch Changes + - Bump @rocket.chat/meteor version. - ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases diff --git a/apps/meteor/app/api/server/lib/getUploadFormData.ts b/apps/meteor/app/api/server/lib/getUploadFormData.ts index 85fc0658542d..3136a6c16e13 100644 --- a/apps/meteor/app/api/server/lib/getUploadFormData.ts +++ b/apps/meteor/app/api/server/lib/getUploadFormData.ts @@ -63,7 +63,7 @@ export async function getUploadFormData< function onFile( fieldname: string, file: Readable & { truncated: boolean }, - { filename, encoding }: { filename: string; encoding: string }, + { filename, encoding, mimeType: mimetype }: { filename: string; encoding: string; mimeType: string }, ) { if (options.field && fieldname !== options.field) { file.resume(); @@ -85,7 +85,7 @@ export async function getUploadFormData< file, filename, encoding, - mimetype: getMimeType(filename), + mimetype: getMimeType(mimetype, filename), fieldname, fields, fileBuffer: Buffer.concat(fileChunks), diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts index 410a65fe7eda..7ae585b89dfa 100644 --- a/apps/meteor/app/api/server/v1/users.ts +++ b/apps/meteor/app/api/server/v1/users.ts @@ -19,6 +19,7 @@ import { isUsersCheckUsernameAvailabilityParamsGET, isUsersSendConfirmationEmailParamsPOST, } from '@rocket.chat/rest-typings'; +import { getLoginExpirationInMs } from '@rocket.chat/tools'; import { Accounts } from 'meteor/accounts-base'; import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; @@ -1065,8 +1066,9 @@ API.v1.addRoute( const token = me.services?.resume?.loginTokens?.find((token) => token.hashedToken === hashedToken); - const tokenExpires = - (token && 'when' in token && new Date(token.when.getTime() + settings.get' back to '
' html = html.replace(/
/g, '
'); - return { ...message, html }; + return { html }; }; - -export { emojiParser }; diff --git a/apps/meteor/app/lib/server/functions/addUserToRoom.ts b/apps/meteor/app/lib/server/functions/addUserToRoom.ts index 57ea20f00cb1..b6ffc0ca4629 100644 --- a/apps/meteor/app/lib/server/functions/addUserToRoom.ts +++ b/apps/meteor/app/lib/server/functions/addUserToRoom.ts @@ -15,9 +15,15 @@ import { notifyOnRoomChangedById } from '../lib/notifyListener'; export const addUserToRoom = async function ( rid: string, - user: Pick
'; - await messages.forEach((message) => { - let author; - if (message.u._id === visitor._id) { - author = i18n.t('You', { lng: userLanguage }); - } else { - author = showAgentInfo ? message.u.name || message.u.username : i18n.t('Agent', { lng: userLanguage }); - } - - const datetime = moment.tz(message.ts, timezone).locale(userLanguage).format('LLL'); - const singleMessage = ` -
${author} ${datetime}
-${message.msg}
- `; - html += singleMessage; - }); - - html = `${html}'; + const InvalidFileMessage = `
${i18n.t(
+ 'This_attachment_is_not_supported',
+ { lng: userLanguage },
+ )}
`;
+
+ for await (const message of messages) {
+ let author;
+ if (message.u._id === visitor._id) {
+ author = i18n.t('You', { lng: userLanguage });
+ } else {
+ author = showAgentInfo ? message.u.name || message.u.username : i18n.t('Agent', { lng: userLanguage });
+ }
+
+ const isSystemMessage = MessageTypes.isSystemMessage(message);
+ const messageType = isSystemMessage && MessageTypes.getType(message);
+
+ let messageContent = messageType
+ ? `${i18n.t(
+ messageType.message,
+ messageType.data
+ ? { ...messageType.data(message), interpolation: { escapeValue: false } }
+ : { interpolation: { escapeValue: false } },
+ )}`
+ : message.msg;
+
+ let filesHTML = '';
+
+ if (message.attachments && message.attachments?.length > 0) {
+ messageContent = message.attachments[0].description || '';
+
+ for await (const attachment of message.attachments) {
+ if (!isFileAttachment(attachment)) {
+ // ignore other types of attachments
+ continue;
+ }
+
+ if (!isFileImageAttachment(attachment)) {
+ filesHTML += `${attachment.title || ''}${InvalidFileMessage}
`;
+ continue;
+ }
+
+ if (!attachment.image_type || !acceptableImageMimeTypes.includes(attachment.image_type)) {
+ filesHTML += `${attachment.title || ''}${InvalidFileMessage}
`;
+ continue;
+ }
+
+ // Image attachment can be rendered in email body
+ const file = message.files?.find((file) => file.name === attachment.title);
+
+ if (!file) {
+ filesHTML += `${attachment.title || ''}${InvalidFileMessage}
`;
+ continue;
+ }
+
+ const uploadedFile = await Uploads.findOneById(file._id);
+
+ if (!uploadedFile) {
+ filesHTML += `${file.name}${InvalidFileMessage}
`;
+ continue;
+ }
+
+ const uploadedFileBuffer = await FileUpload.getBuffer(uploadedFile);
+ filesHTML += `${file.name}
${author} ${datetime}
+${messageContent}
+${filesHTML}
+ `; + html += singleMessage; + } + + html = `${html}