wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-06-11 12:57:59 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

UBERF-11423: Fix attachments in emails (#9166)

Browse Source 
Signed-off-by: Artem Savchenko <armisav@gmail.com>
This commit is contained in:
Artyom Savchenko 2025-06-04 14:37:59 +07:00 committed by GitHub
parent cd1a25bf52
commit 07c364c776
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/config/rush/pnpm-lock.yaml
View File

@ -4381,7 +4381,7 @@ packages:
version: 0.0.0
'@rush-temp/mail-common@file:projects/mail-common.tgz':
resolution: {integrity: sha512-3mF2CTdNdTUi6sq+KOG6Tz1Jknrfp8+WggKdc/ZSgy3u5ASp8PcXTad3ihjXD0gRatFfrvNI+m3A90gB2zJMNg==, tarball: file:projects/mail-common.tgz}
resolution: {integrity: sha512-sdNydMgE2+6RUZLuoxs9vR5TuVhx0ZtgzXtR7GW2AqlG3O31iBo/WyST90ar4jftmjASKrJ4bSObnkuX7dnHyA==, tarball: file:projects/mail-common.tgz}
version: 0.0.0
'@rush-temp/mail@file:projects/mail.tgz':
@ -20010,6 +20010,7 @@ snapshots:
eslint-plugin-n: 15.7.0(eslint@8.56.0)
eslint-plugin-node: 11.1.0(eslint@8.56.0)
eslint-plugin-promise: 6.1.1(eslint@8.56.0)
image-size: 1.1.1
jest: 29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@types/node@22.15.29)(typescript@5.3.3))
kafkajs: 2.2.4
prettier: 3.2.5

3
services/mail/mail-common/package.json
View File

@ -63,6 +63,7 @@
"kafkajs": "^2.2.4",
"sanitize-html": "^2.15.0",
"turndown": "^7.2.0",
"uuid": "^8.3.2"
"uuid": "^8.3.2",
"image-size": "^1.1.1"
}
}

14
services/mail/mail-common/src/message.ts
View File

@ -44,7 +44,7 @@ import { generateMessageId } from '@hcengineering/communication-shared'
import { BaseConfig, type Attachment } from './types'
import { EmailMessage, MailRecipient, MessageData } from './types'
import { getMdContent } from './utils'
import { getBlobMetadata, getMdContent } from './utils'
import { PersonCacheFactory } from './person'
import { PersonSpacesCacheFactory } from './personSpaces'
import { ChannelCache, ChannelCacheFactory } from './channel'
@ -252,11 +252,11 @@ async function saveMessageToSpaces (
}
const messageId = await createMailMessage(producer, config, messageData, threadId)
await createFiles(ctx, producer, config, attachments, messageData, threadId, messageId)
if (!isReply) {
await addCollaborators(producer, config, messageData, threadId)
await createMailThread(producer, config, messageData, messageId)
}
await createFiles(producer, config, attachments, messageData, threadId, messageId)
await threadLookup.setThreadId(mailId, space._id, threadId)
})
@ -305,6 +305,7 @@ async function createMailMessage (
}
async function createFiles (
ctx: MeasureContext,
producer: Producer,
config: BaseConfig,
attachments: Attachment[],
@ -313,9 +314,9 @@ async function createFiles (
messageId: MessageID
): Promise<void> {
const fileData: Buffer[] = attachments.map((a) => {
const creeateFileEvent: CreateFileEvent = {
const createFileEvent: CreateFileEvent = {
type: MessageRequestEventType.CreateFile,
card: threadId,
card: messageData.isReply ? threadId : messageData.channel,
message: messageId,
messageCreated: messageData.created,
creator: messageData.modifiedBy,
@ -323,10 +324,11 @@ async function createFiles (
blobId: a.id as Ref<Blob>,
type: a.contentType,
filename: a.name,
size: a.data.length
size: a.data.length,
meta: getBlobMetadata(ctx, a)
}
}
return Buffer.from(JSON.stringify(creeateFileEvent))
return Buffer.from(JSON.stringify(createFileEvent))
})
const fileEvents = fileData.map((data) => ({
key: Buffer.from(messageData.channel ?? messageData.spaceId),

23
services/mail/mail-common/src/utils.ts
View File

@ -14,9 +14,10 @@
//
import TurndownService from 'turndown'
import sanitizeHtml from 'sanitize-html'
import { imageSize } from 'image-size'
import { MeasureContext } from '@hcengineering/core'
import { EmailContact, EmailMessage } from './types'
import { BlobMetadata, MeasureContext } from '@hcengineering/core'
import { Attachment, EmailContact, EmailMessage } from './types'
const NAME_EMAIL_PATTERN = /^(?:"?([^"<]+)"?\s*)?<([^>]+)>$/
const NAME_SEGMENT_REGEX = /[\s,;]+/
@ -131,3 +132,21 @@ export function parseNameFromEmailHeader (headerValue: string | undefined): Emai
export function normalizeEmail (email: string): string {
return email.toLowerCase().trim()
}
export function getBlobMetadata (ctx: MeasureContext, attachment: Attachment): BlobMetadata | undefined {
try {
const dimensions = imageSize(attachment.data)
return dimensions != null
? {
originalHeight: dimensions.height,
originalWidth: dimensions.width
}
: undefined
} catch (error: any) {
ctx.warn('Failed to get blob metadata', {
error: error.message,
attachmentId: attachment.id
})
return undefined
}
}