Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix email theme with admin injected colors

Chocobozzz30c3e09852e0
diff --git a/server/core/lib/emailer.ts b/server/core/lib/emailer.ts
index 4ca872cfec..8d85a7a343 100644
--- a/server/core/lib/emailer.ts
+++ b/server/core/lib/emailer.ts
@@ -397,10 +397,9 @@ export class Emailer {
text: options.text,
subject,
signature: this.buildSignature(),
- fg: CONFIG.THEME.CUSTOMIZATION.FOREGROUND_COLOR || '#000',
- bg: CONFIG.THEME.CUSTOMIZATION.BACKGROUND_COLOR || '#fff',
- primary: CONFIG.THEME.CUSTOMIZATION.PRIMARY_COLOR || '#FF8F37',
- onPrimary: CONFIG.THEME.CUSTOMIZATION.ON_PRIMARY_COLOR || '#000',
+
+ ...this.buildEmailTheme(),
+
language: to.language,
logoUrl: ServerConfigManager.Instance.getLogoUrl(await getServerActor(), 192)
}
@@ -513,6 +512,38 @@ export class Emailer {
})
}
+ private buildEmailTheme () {
+ const defaultColorsLight = {
+ fg: '#060404',
+ bg: '#f4f4f5',
+ primary: '#FF8F37',
+ onPrimary: '#060404'
+ }
+
+ const defaultColorsDark = {
+ fg: '#f6f4f4',
+ bg: '#140f0f',
+ primary: '#FD9C50',
+ onPrimary: '#111'
+ }
+
+ // Use default colors, because the admin may have used custom color on a non-peertube-core theme, which would make the email unreadable
+ if (CONFIG.THEME.DEFAULT !== 'peertube-core-dark-brown' && CONFIG.THEME.DEFAULT !== 'peertube-core-light-beige') {
+ return defaultColorsLight
+ }
+
+ const defaultColors = CONFIG.THEME.DEFAULT === 'peertube-core-dark-brown'
+ ? defaultColorsDark
+ : defaultColorsLight
+
+ return {
+ fg: CONFIG.THEME.CUSTOMIZATION.FOREGROUND_COLOR || defaultColors.fg,
+ bg: CONFIG.THEME.CUSTOMIZATION.BACKGROUND_COLOR || defaultColors.bg,
+ primary: CONFIG.THEME.CUSTOMIZATION.PRIMARY_COLOR || defaultColors.primary,
+ onPrimary: CONFIG.THEME.CUSTOMIZATION.ON_PRIMARY_COLOR || defaultColors.onPrimary
+ }
+ }
+
static get Instance () {
return this.instance || (this.instance = new this())
}