From 488c2f5df543e4eb50c200e4dd060f3ce8388c1b Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Sun, 2 May 2021 14:44:19 +0100
Subject: [PATCH] fix broken url in welcome email

---
 email.go          | 11 ++++++-----
 mail/welcome.mjml |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/email.go b/email.go
index d91eea8..694ff0e 100644
--- a/email.go
+++ b/email.go
@@ -653,11 +653,12 @@ func (emailer *Emailer) constructEnabled(reason string, app *appContext, noSub b
 
 func (emailer *Emailer) welcomeValues(username string, expiry time.Time, app *appContext, noSub bool, custom bool) map[string]interface{} {
 	template := map[string]interface{}{
-		"welcome":           emailer.lang.WelcomeEmail.get("welcome"),
-		"youCanLoginWith":   emailer.lang.WelcomeEmail.get("youCanLoginWith"),
-		"jellyfinURLString": emailer.lang.WelcomeEmail.get("jellyfinURL"),
-		"usernameString":    emailer.lang.Strings.get("username"),
-		"message":           "",
+		"welcome":               emailer.lang.WelcomeEmail.get("welcome"),
+		"youCanLoginWith":       emailer.lang.WelcomeEmail.get("youCanLoginWith"),
+		"jellyfinURLString":     emailer.lang.WelcomeEmail.get("jellyfinURL"),
+		"usernameString":        emailer.lang.Strings.get("username"),
+		"message":               "",
+		"yourAccountWillExpire": "",
 	}
 	if noSub {
 		empty := []string{"jellyfinURL", "username", "yourAccountWillExpire"}
diff --git a/mail/welcome.mjml b/mail/welcome.mjml
index cc92c40..45f8d28 100644
--- a/mail/welcome.mjml
+++ b/mail/welcome.mjml
@@ -62,7 +62,7 @@
         <mj-text mj-class="text" font-size="16px" font-family="Noto Sans, Helvetica, Arial, sans-serif">
             <h3>{{ .welcome }}</h3>
             <p>{{ .youCanLoginWith }}:</p>
-            {{ .jellyfinURLString }}: <a href="{{ .jellyfinURLVal }}">{{ .jellyfinURL }}</a>
+            {{ .jellyfinURLString }}: <a href="{{ .jellyfinURL }}">{{ .jellyfinURL }}</a>
             <p>{{ .usernameString }}: <i>{{ .username }}</i></p>
           	<p>{{ .yourAccountWillExpire }}</p>
         </mj-text>