fix: wip

packages/lib/jobs/definitions/emails/send-document-cancelled-emails.handler.ts

@@ -10,6 +10,7 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getTeamSettings } from '../../../server-only/team/get-team-settings';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
 import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
@@ -38,12 +39,15 @@ export const run = async ({
           teamEmail: true,
           name: true,
           url: true,
-          teamGlobalSettings: true,
         },
       },
     },
   });
 
+  const teamSettings = await getTeamSettings({
+    teamId: document.teamId,
+  });
+
   const { documentMeta, user: documentOwner } = document;
 
   // Check if document cancellation emails are enabled
@@ -53,7 +57,10 @@ export const run = async ({
     return;
   }
 
-  const i18n = await getI18nInstance(documentMeta?.language);
+  const branding = teamGlobalSettingsToBranding(teamSettings, document.teamId);
+  const lang = documentMeta?.language ?? teamSettings.documentLanguage;
+
+  const i18n = await getI18nInstance(lang);
 
   // Send cancellation emails to all recipients who have been sent the document or viewed it
   const recipientsToNotify = document.recipients.filter(
@@ -73,14 +80,10 @@ export const run = async ({
           cancellationReason: cancellationReason || 'The document has been cancelled.',
         });
 
-        const branding = document.team?.teamGlobalSettings
-          ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-          : undefined;
-
         const [html, text] = await Promise.all([
-          renderEmailWithI18N(template, { lang: documentMeta?.language, branding }),
+          renderEmailWithI18N(template, { lang, branding }),
           renderEmailWithI18N(template, {
-            lang: documentMeta?.language,
+            lang,
             branding,
             plainText: true,
           }),

packages/lib/jobs/definitions/emails/send-recipient-signed-email.handler.ts

@@ -9,6 +9,7 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getTeamSettings } from '../../../server-only/team/get-team-settings';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
 import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
@@ -41,11 +42,6 @@ export const run = async ({
       },
       user: true,
       documentMeta: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -76,8 +72,16 @@ export const run = async ({
     return;
   }
 
+  const settings = await getTeamSettings({
+    userId: owner.id,
+    teamId: document.teamId,
+  });
+
   const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
-  const i18n = await getI18nInstance(document.documentMeta?.language);
+  const branding = teamGlobalSettingsToBranding(settings, document.teamId);
+
+  const lang = document.documentMeta?.language ?? settings.documentLanguage;
+  const i18n = await getI18nInstance(lang);
 
   const template = createElement(DocumentRecipientSignedEmailTemplate, {
     documentName: document.title,
@@ -87,14 +91,10 @@ export const run = async ({
   });
 
   await io.runTask('send-recipient-signed-email', async () => {
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+      renderEmailWithI18N(template, { lang, branding }),
       renderEmailWithI18N(template, {
-        lang: document.documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),

packages/lib/jobs/definitions/emails/send-rejection-emails.handler.ts

@@ -11,6 +11,7 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getTeamSettings } from '../../../server-only/team/get-team-settings';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
 import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
@@ -40,7 +41,6 @@ export const run = async ({
             teamEmail: true,
             name: true,
             url: true,
-            teamGlobalSettings: true,
           },
         },
       },
@@ -63,7 +63,15 @@ export const run = async ({
     return;
   }
 
-  const i18n = await getI18nInstance(documentMeta?.language);
+  const settings = await getTeamSettings({
+    userId: documentOwner.id,
+    teamId: document.teamId,
+  });
+
+  const branding = teamGlobalSettingsToBranding(settings, document.teamId);
+  const lang = documentMeta?.language ?? settings.documentLanguage;
+
+  const i18n = await getI18nInstance(lang);
 
   // Send confirmation email to the recipient who rejected
   await io.runTask('send-rejection-confirmation-email', async () => {
@@ -75,14 +83,10 @@ export const run = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     });
 
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(recipientTemplate, { lang: documentMeta?.language, branding }),
+      renderEmailWithI18N(recipientTemplate, { lang, branding }),
       renderEmailWithI18N(recipientTemplate, {
-        lang: documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),
@@ -115,14 +119,10 @@ export const run = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     });
 
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(ownerTemplate, { lang: documentMeta?.language, branding }),
+      renderEmailWithI18N(ownerTemplate, { lang, branding }),
       renderEmailWithI18N(ownerTemplate, {
-        lang: documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),

packages/lib/jobs/definitions/emails/send-signing-email.handler.ts

@@ -14,6 +14,7 @@ import {
   RECIPIENT_ROLES_DESCRIPTION,
   RECIPIENT_ROLE_TO_EMAIL_TYPE,
 } from '../../../constants/recipient-roles';
+import { getTeamSettings } from '../../../server-only/team/get-team-settings';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../../types/document-audit-logs';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { createDocumentAuditLogData } from '../../../utils/document-audit-logs';
@@ -49,7 +50,6 @@ export const run = async ({
           select: {
             teamEmail: true,
             name: true,
-            teamGlobalSettings: true,
           },
         },
       },
@@ -75,6 +75,11 @@ export const run = async ({
     return;
   }
 
+  const settings = await getTeamSettings({
+    userId,
+    teamId: document.teamId,
+  });
+
   const customEmail = document?.documentMeta;
   const isDirectTemplate = document.source === DocumentSource.TEMPLATE_DIRECT_LINK;
   const isTeamDocument = document.teamId !== null;
@@ -84,7 +89,10 @@ export const run = async ({
   const { email, name } = recipient;
   const selfSigner = email === user.email;
 
-  const i18n = await getI18nInstance(documentMeta?.language);
+  const branding = teamGlobalSettingsToBranding(settings, document.teamId);
+  const lang = documentMeta?.language ?? settings.documentLanguage;
+
+  const i18n = await getI18nInstance(lang);
 
   const recipientActionVerb = i18n
     ._(RECIPIENT_ROLES_DESCRIPTION[recipient.role].actionVerb)
@@ -117,7 +125,7 @@ export const run = async ({
       const inviterName = user.name || '';
 
       emailMessage = i18n._(
-        team.teamGlobalSettings?.includeSenderDetails
+        settings.includeSenderDetails
           ? msg`${inviterName} on behalf of "${team.name}" has invited you to ${recipientActionVerb} the document "${document.title}".`
           : msg`${team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`,
       );
@@ -145,18 +153,14 @@ export const run = async ({
     isTeamInvite: isTeamDocument,
     teamName: team?.name,
     teamEmail: team?.teamEmail?.email,
-    includeSenderDetails: team?.teamGlobalSettings?.includeSenderDetails,
+    includeSenderDetails: settings.includeSenderDetails,
   });
 
   await io.runTask('send-signing-email', async () => {
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(template, { lang: documentMeta?.language, branding }),
+      renderEmailWithI18N(template, { lang, branding }),
       renderEmailWithI18N(template, {
-        lang: documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),

packages/lib/jobs/definitions/emails/send-team-deleted-email.handler.ts

@@ -16,7 +16,6 @@ export const run = async ({
       await sendTeamDeleteEmail({
         email: member.email,
         team,
-        isOwner: member.id === team.ownerUserId,
       });
     });
   }

packages/lib/jobs/definitions/emails/send-team-deleted-email.ts

@@ -9,7 +9,6 @@ const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
   team: z.object({
     name: z.string(),
     url: z.string(),
-    ownerUserId: z.number(),
     teamGlobalSettings: z
       .object({
         documentVisibility: z.nativeEnum(DocumentVisibility),

packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts

@@ -10,6 +10,7 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getTeamSettings } from '../../../server-only/team/get-team-settings';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
 import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobRunIO } from '../../client/_internal/job';
@@ -37,10 +38,14 @@ export const run = async ({
           user: true,
         },
       },
-      teamGlobalSettings: true,
     },
   });
 
+  const settings = await getTeamSettings({
+    userId: payload.userId,
+    teamId: payload.teamId,
+  });
+
   const invitedMember = await prisma.teamMember.findFirstOrThrow({
     where: {
       id: payload.memberId,
@@ -68,11 +73,8 @@ export const run = async ({
           teamUrl: team.url,
         });
 
-        const branding = team.teamGlobalSettings
-          ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-          : undefined;
-
-        const lang = team.teamGlobalSettings?.documentLanguage;
+        const branding = teamGlobalSettingsToBranding(settings, team.id);
+        const lang = settings.documentLanguage;
 
         // !: Replace with the actual language of the recipient later
         const [html, text] = await Promise.all([

packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts

@@ -10,6 +10,7 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getTeamSettings } from '../../../server-only/team/get-team-settings';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
 import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobRunIO } from '../../client/_internal/job';
@@ -37,10 +38,13 @@ export const run = async ({
           user: true,
         },
       },
-      teamGlobalSettings: true,
     },
   });
 
+  const settings = await getTeamSettings({
+    teamId: payload.teamId,
+  });
+
   const oldMember = await prisma.user.findFirstOrThrow({
     where: {
       id: payload.memberUserId,
@@ -58,11 +62,8 @@ export const run = async ({
         teamUrl: team.url,
       });
 
-      const branding = team.teamGlobalSettings
-        ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-        : undefined;
-
-      const lang = team.teamGlobalSettings?.documentLanguage;
+      const branding = teamGlobalSettingsToBranding(settings, team.id);
+      const lang = settings.documentLanguage;
 
       const [html, text] = await Promise.all([
         renderEmailWithI18N(emailContent, {