tweaks

Joystream · Aug 31, 2023 · e8e103f · e8e103f
1 parent d2af87b
commit e8e103f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -80,4 +80,4 @@
     "tscpaths": "^0.0.9",
     "typescript": "^4.9.5"
   }
-}
+}
diff --git a/packages/server/src/auth/api/auth.ts b/packages/server/src/auth/api/auth.ts
@@ -7,7 +7,7 @@ import { verifySignature } from '@/auth/model/signature'
 import { createAuthToken, createEmailToken } from '@/auth/model/token'
 import { Context } from '@/common/api'
 import { PIONEER_URL } from '@/common/config'
-import PioneerEmail from '@/common/email-templates/pioneer-email'
+import PioneerEmailTemplate from '@/common/email-templates/pioneer-email'
 import { createEmailProvider } from '@/common/utils/email'
 
 const emailProvider = createEmailProvider()
@@ -69,11 +69,11 @@ export const signup = mutationField('signup', {
         to: args.email,
         subject: 'Confirm your email for Pioneer',
         html: render(
-          PioneerEmail({
+          PioneerEmailTemplate({
             memberHandle: args.name,
             summary: 'Confirm your email for Pioneer',
             text: 'Please use the link below to confirm your email address for Pioneer notifications',
-            cta: {
+            button: {
               label: 'Confirm email',
               href: verificationUrl,
             },

diff --git a/packages/server/src/common/email-templates/pioneer-email.tsx b/packages/server/src/common/email-templates/pioneer-email.tsx
@@ -13,25 +13,26 @@ import * as React from 'react'
 
 import { PIONEER_URL } from '../config'
 
-interface PioneerEmailProps {
+interface PioneerEmailTemplateProps {
   memberHandle: string
   text: string
   summary: string
-  cta?: {
+  button: {
     href: string
     label: string
   }
 }
 
-export const PioneerEmail = ({
+export const PioneerEmailTemplate = ({
   memberHandle = 'bob',
   text = 'New council election has just started. Follow the link below to announce your candidacy.',
   summary,
-  cta = {
-    href: 'https://pioneer.dev',
+  // button default value only for email development preview
+  button = {
+    href: `${PIONEER_URL}/#/election`,
     label: 'See on Pioneer',
   },
-}: PioneerEmailProps) => (
+}: PioneerEmailTemplateProps) => (
   <Html>
     <Head />
     <Preview>{summary}</Preview>
@@ -47,9 +48,9 @@ export const PioneerEmail = ({
         <Section style={mainSectionStyle}>
           <Heading style={h1Style}>Hi {memberHandle},</Heading>
           <Text style={textStyle}>{text}</Text>
-          {cta && (
-            <Button href={cta.href} style={ctaStyle} pX={16} pY={12}>
-              {cta.label}
+          {button && (
+            <Button href={button.href} style={ctaStyle} pX={16} pY={12}>
+              {button.label}
             </Button>
           )}
         </Section>
@@ -86,7 +87,7 @@ export const PioneerEmail = ({
   </Html>
 )
 
-export default PioneerEmail
+export default PioneerEmailTemplate
 
 const bodyStyle = {
   backgroundColor: '#ffffff',

diff --git a/packages/server/src/notifier/model/email/forum.ts b/packages/server/src/notifier/model/email/forum.ts
@@ -2,7 +2,7 @@ import { render } from '@react-email/render'
 import { match } from 'ts-pattern'
 
 import { PIONEER_URL } from '@/common/config'
-import { PioneerEmail } from '@/common/email-templates/pioneer-email'
+import { PioneerEmailTemplate } from '@/common/email-templates/pioneer-email'
 
 import { EmailFromNotificationFn, getForumPost, getForumThread } from './utils'
 
@@ -30,6 +30,7 @@ export const fromPostAddedNotification: EmailFromNotificationFn = async ({ id, k
   const { author, thread, threadId } = await getForumPost(entityId)
 
   const emailSubject = `[Pioneer forum] ${thread}`
+
   const emailSummary: string = match(kind)
     .with('FORUM_THREAD_CONTRIBUTOR', 'FORUM_THREAD_CREATOR', () => `${author} replied in the thread ${thread}.`)
     .with('FORUM_POST_MENTION', () => `${author} mentioned you in the thread ${thread}.`)
@@ -40,6 +41,7 @@ export const fromPostAddedNotification: EmailFromNotificationFn = async ({ id, k
       () => `${author} posted in the thread ${thread}.`
     )
     .exhaustive()
+
   const emailText: string = match(kind)
     .with('FORUM_THREAD_CONTRIBUTOR', 'FORUM_THREAD_CREATOR', () => `${author} replied in the thread ${thread}.`)
     .with('FORUM_POST_MENTION', () => `${author} mentioned you in the thread ${thread}.`)
@@ -51,12 +53,12 @@ export const fromPostAddedNotification: EmailFromNotificationFn = async ({ id, k
     )
     .exhaustive()
 
-  const renderedEmail = render(
-    PioneerEmail({
+  const emailHtml = render(
+    PioneerEmailTemplate({
       memberHandle: member.name,
       summary: emailSummary,
       text: emailText,
-      cta: {
+      button: {
         label: 'See on Pioneer',
         href: `${PIONEER_URL}/#/forum/thread/${threadId}?post=${entityId}`,
       },
@@ -65,7 +67,7 @@ export const fromPostAddedNotification: EmailFromNotificationFn = async ({ id, k
 
   return {
     subject: emailSubject,
-    html: renderedEmail,
+    html: emailHtml,
     to: member.email,
   }
 }
@@ -82,21 +84,23 @@ export const fromThreadCreatedNotification: EmailFromNotificationFn = async ({ i
   const { author, title } = await getForumThread(entityId)
 
   const emailSubject = `[Pioneer forum] ${title}`
+
   const emailSummary: string = match(kind)
     .with('FORUM_THREAD_MENTION', () => `${author} mentioned you in a new thread ${title}.`)
     .with('FORUM_CATEGORY_ENTITY_THREAD', 'FORUM_THREAD_ALL', () => `${author} posted a new thread ${title}.`)
     .exhaustive()
+
   const emailText: string = match(kind)
     .with('FORUM_THREAD_MENTION', () => `${author} mentioned you in a new thread ${title}.`)
     .with('FORUM_CATEGORY_ENTITY_THREAD', 'FORUM_THREAD_ALL', () => `${author} posted a new thread ${title}.`)
     .exhaustive()
 
-  const renderedEmail = render(
-    PioneerEmail({
+  const emailHtml = render(
+    PioneerEmailTemplate({
       memberHandle: member.name,
       summary: emailSummary,
       text: emailText,
-      cta: {
+      button: {
         label: 'See on Pioneer',
         href: `${PIONEER_URL}/#/forum/thread/${entityId}`,
       },
@@ -105,7 +109,7 @@ export const fromThreadCreatedNotification: EmailFromNotificationFn = async ({ i
 
   return {
     subject: emailSubject,
-    html: renderedEmail,
+    html: emailHtml,
     to: member.email,
   }
 }