diff --git a/server/commands/revisionCreator.ts b/server/commands/revisionCreator.ts index 408f4013f..9ce4db287 100644 --- a/server/commands/revisionCreator.ts +++ b/server/commands/revisionCreator.ts @@ -21,6 +21,7 @@ export default async function revisionCreator({ { name: "revisions.create", documentId: document.id, + collectionId: document.collectionId, modelId: revision.id, teamId: document.teamId, actorId: user.id, diff --git a/server/emails/templates/DocumentNotificationEmail.tsx b/server/emails/templates/DocumentNotificationEmail.tsx index 167918903..000fd4ed9 100644 --- a/server/emails/templates/DocumentNotificationEmail.tsx +++ b/server/emails/templates/DocumentNotificationEmail.tsx @@ -45,7 +45,7 @@ export default class DocumentNotificationEmail extends BaseEmail< } protected preview({ actorName, eventName }: Props): string { - return `${actorName} ${eventName} a new document`; + return `${actorName} ${eventName} a document`; } protected renderAsText({ diff --git a/server/queues/processors/NotificationsProcessor.ts b/server/queues/processors/NotificationsProcessor.ts index 5b9484f22..729e823b9 100644 --- a/server/queues/processors/NotificationsProcessor.ts +++ b/server/queues/processors/NotificationsProcessor.ts @@ -44,14 +44,14 @@ export default class NotificationsProcessor extends BaseProcessor { if (event.data?.source === "import") { return; } - const [document, team] = await Promise.all([ + const [collection, document, team] = await Promise.all([ + Collection.findByPk(event.collectionId), Document.findByPk(event.documentId), Team.findByPk(event.teamId), ]); - if (!document || !team || !document.collection) { + if (!document || !team || !collection) { return; } - const { collection } = document; const notificationSettings = await NotificationSetting.findAll({ where: { userId: {