From 2e4b8ae4858616572deec6ebdaa38f20ae96be7a Mon Sep 17 00:00:00 2001 From: kontrollanten <6680299+kontrollanten@users.noreply.github.com> Date: Fri, 11 Dec 2020 00:10:37 +0100 Subject: [PATCH] emailer: use instance name instead of hostname --- server/lib/emailer.ts | 13 +++++++------ server/lib/emails/abuse-new-message/html.pug | 2 +- server/lib/emails/abuse-state-change/html.pug | 2 +- server/lib/emails/account-abuse-new/html.pug | 2 +- server/lib/emails/common/base.pug | 2 +- server/lib/emails/contact-form/html.pug | 2 +- server/lib/emails/password-create/html.pug | 2 +- server/lib/emails/password-reset/html.pug | 2 +- server/lib/emails/verify-email/html.pug | 4 ++-- server/lib/emails/video-abuse-new/html.pug | 2 +- server/lib/emails/video-comment-abuse-new/html.pug | 2 +- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts index e4e093fbc..5243a6029 100644 --- a/server/lib/emailer.ts +++ b/server/lib/emailer.ts @@ -472,7 +472,7 @@ class Emailer { const emailPayload: EmailPayload = { template: 'user-registered', to, - subject: `a new user registered on ${WEBSERVER.HOST}: ${user.username}`, + subject: `a new user registered on ${CONFIG.INSTANCE.NAME}: ${user.username}`, locals: { user } @@ -486,7 +486,7 @@ class Emailer { const videoUrl = WEBSERVER.URL + videoBlacklist.Video.getWatchStaticPath() const reasonString = videoBlacklist.reason ? ` for the following reason: ${videoBlacklist.reason}` : '' - const blockedString = `Your video ${videoName} (${videoUrl} on ${WEBSERVER.HOST} has been blacklisted${reasonString}.` + const blockedString = `Your video ${videoName} (${videoUrl} on ${CONFIG.INSTANCE.NAME} has been blacklisted${reasonString}.` const emailPayload: EmailPayload = { to, @@ -506,7 +506,7 @@ class Emailer { const emailPayload: EmailPayload = { to, subject: `Video ${video.name} unblacklisted`, - text: `Your video "${video.name}" (${videoUrl}) on ${WEBSERVER.HOST} has been unblacklisted.`, + text: `Your video "${video.name}" (${videoUrl}) on ${CONFIG.INSTANCE.NAME} has been unblacklisted.`, locals: { title: 'Your video was unblacklisted' } @@ -547,7 +547,7 @@ class Emailer { const emailPayload: EmailPayload = { template: 'verify-email', to: [ to ], - subject: `Verify your email on ${WEBSERVER.HOST}`, + subject: `Verify your email on ${CONFIG.INSTANCE.NAME}`, locals: { username, verifyEmailUrl @@ -565,7 +565,7 @@ class Emailer { const emailPayload: EmailPayload = { to: [ to ], subject: 'Account ' + blockedWord, - text: `Your account ${user.username} on ${WEBSERVER.HOST} has been ${blockedWord}${reasonString}.` + text: `Your account ${user.username} on ${CONFIG.INSTANCE.NAME} has been ${blockedWord}${reasonString}.` } return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload }) @@ -597,7 +597,7 @@ class Emailer { const fromDisplayName = options.from ? options.from - : WEBSERVER.HOST + : CONFIG.INSTANCE.NAME const email = new Email({ send: true, @@ -625,6 +625,7 @@ class Emailer { locals: { // default variables available in all templates WEBSERVER, EMAIL: CONFIG.EMAIL, + instanceName: CONFIG.INSTANCE.NAME, text: options.text, subject: options.subject } diff --git a/server/lib/emails/abuse-new-message/html.pug b/server/lib/emails/abuse-new-message/html.pug index 0841775d2..c1d452e7d 100644 --- a/server/lib/emails/abuse-new-message/html.pug +++ b/server/lib/emails/abuse-new-message/html.pug @@ -6,6 +6,6 @@ block title block content p - | A new message by #{messageAccountName} was posted on #[a(href=abuseUrl) abuse report ##{abuseId}] on #{WEBSERVER.HOST} + | A new message by #{messageAccountName} was posted on #[a(href=abuseUrl) abuse report ##{abuseId}] on #{instanceName} blockquote #{messageText} br(style="display: none;") diff --git a/server/lib/emails/abuse-state-change/html.pug b/server/lib/emails/abuse-state-change/html.pug index ca89a2f05..bb243e729 100644 --- a/server/lib/emails/abuse-state-change/html.pug +++ b/server/lib/emails/abuse-state-change/html.pug @@ -6,4 +6,4 @@ block title block content p - | #[a(href=abuseUrl) Your abuse report ##{abuseId}] on #{WEBSERVER.HOST} has been #{isAccepted ? 'accepted' : 'rejected'} + | #[a(href=abuseUrl) Your abuse report ##{abuseId}] on #{instanceName} has been #{isAccepted ? 'accepted' : 'rejected'} diff --git a/server/lib/emails/account-abuse-new/html.pug b/server/lib/emails/account-abuse-new/html.pug index f1aa2886e..e4c0366fb 100644 --- a/server/lib/emails/account-abuse-new/html.pug +++ b/server/lib/emails/account-abuse-new/html.pug @@ -6,7 +6,7 @@ block title block content p - | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}account + | #[a(href=WEBSERVER.URL) #{instanceName}] received an abuse report for the #{isLocal ? '' : 'remote '}account a(href=accountUrl) #{accountDisplayName} p The reporter, #{reporter}, cited the following reason(s): diff --git a/server/lib/emails/common/base.pug b/server/lib/emails/common/base.pug index 991cd5fbe..6da5648e4 100644 --- a/server/lib/emails/common/base.pug +++ b/server/lib/emails/common/base.pug @@ -230,7 +230,7 @@ body(width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: tr td(style='padding: 20px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;') p(style='margin: 0;') - | You are receiving this email as part of your notification settings on #{WEBSERVER.HOST} for your account #{username}. + | You are receiving this email as part of your notification settings on #{instanceName} for your account #{username}. //- 1 Column Text : END //- Email Body : END //- Email Footer : BEGIN diff --git a/server/lib/emails/contact-form/html.pug b/server/lib/emails/contact-form/html.pug index 0073ff78e..5a24fa6f1 100644 --- a/server/lib/emails/contact-form/html.pug +++ b/server/lib/emails/contact-form/html.pug @@ -4,6 +4,6 @@ block title | Someone just used the contact form block content - p #{fromName} sent you a message via the contact form on #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}]: + p #{fromName} sent you a message via the contact form on #[a(href=WEBSERVER.URL) #{instanceName}]: blockquote(style='white-space: pre-wrap') #{body} p You can contact them at #[a(href=`mailto:${fromEmail}`) #{fromEmail}], or simply reply to this email to get in touch. \ No newline at end of file diff --git a/server/lib/emails/password-create/html.pug b/server/lib/emails/password-create/html.pug index 45ff3078a..2061435fc 100644 --- a/server/lib/emails/password-create/html.pug +++ b/server/lib/emails/password-create/html.pug @@ -5,6 +5,6 @@ block title block content p. - Welcome to #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}], your PeerTube instance. Your username is: #{username}. + Welcome to #[a(href=WEBSERVER.URL) #{instanceName}], your PeerTube instance. Your username is: #{username}. Please set your password by following #[a(href=createPasswordUrl) this link]: #[a(href=createPasswordUrl) #{createPasswordUrl}] (this link will expire within seven days). \ No newline at end of file diff --git a/server/lib/emails/password-reset/html.pug b/server/lib/emails/password-reset/html.pug index ac33db5d7..54a3ee6df 100644 --- a/server/lib/emails/password-reset/html.pug +++ b/server/lib/emails/password-reset/html.pug @@ -5,7 +5,7 @@ block title block content p. - A reset password procedure for your account #{username} has been requested on #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}]. + A reset password procedure for your account #{username} has been requested on #[a(href=WEBSERVER.URL) #{instanceName}]. Please follow #[a(href=resetPasswordUrl) this link] to reset it: #[a(href=resetPasswordUrl) #{resetPasswordUrl}] (the link will expire within 1 hour) p. diff --git a/server/lib/emails/verify-email/html.pug b/server/lib/emails/verify-email/html.pug index 8a4a77703..e6d805a16 100644 --- a/server/lib/emails/verify-email/html.pug +++ b/server/lib/emails/verify-email/html.pug @@ -6,9 +6,9 @@ block title block content p Welcome to PeerTube! p. - You just created an account #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}], your new PeerTube instance. + You just created an account #[a(href=WEBSERVER.URL) #{instanceName}], your new PeerTube instance. Your username there is: #{username}. p. - To start using PeerTube on #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] you must verify your email first! + To start using PeerTube on #[a(href=WEBSERVER.URL) #{instanceName}] you must verify your email first! Please follow #[a(href=verifyEmailUrl) this link] to verify this email belongs to you: #[a(href=verifyEmailUrl) #{verifyEmailUrl}] If you are not the person who initiated this request, please ignore this email. \ No newline at end of file diff --git a/server/lib/emails/video-abuse-new/html.pug b/server/lib/emails/video-abuse-new/html.pug index a1acdabdc..a085b4b38 100644 --- a/server/lib/emails/video-abuse-new/html.pug +++ b/server/lib/emails/video-abuse-new/html.pug @@ -6,7 +6,7 @@ block title block content p - | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}video " + | #[a(href=WEBSERVER.URL) #{instanceName}] received an abuse report for the #{isLocal ? '' : 'remote '}video " a(href=videoUrl) #{videoName} | " by #[+channel(videoChannel)] if videoPublishedAt diff --git a/server/lib/emails/video-comment-abuse-new/html.pug b/server/lib/emails/video-comment-abuse-new/html.pug index e92d986b5..752bf7c10 100644 --- a/server/lib/emails/video-comment-abuse-new/html.pug +++ b/server/lib/emails/video-comment-abuse-new/html.pug @@ -6,7 +6,7 @@ block title block content p - | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '} + | #[a(href=WEBSERVER.URL) #{instanceName}] received an abuse report for the #{isLocal ? '' : 'remote '} a(href=commentUrl) comment on video "#{videoName}" | of #{flaggedAccount} | created on #{commentCreatedAt} -- 2.41.0