interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

emailer: use instance name instead of hostname

This commit is contained in:
kontrollanten 2020-12-11 00:10:37 +01:00 committed by Chocobozzz
parent 915e2bbb97
commit 2e4b8ae485
11 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/lib/emailer.ts
View File

@ -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
}

2
server/lib/emails/abuse-new-message/html.pug
View File

@ -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;")

2
server/lib/emails/abuse-state-change/html.pug
View File

@ -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'}

2
server/lib/emails/account-abuse-new/html.pug
View File

@ -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):

2
server/lib/emails/common/base.pug
View File

@ -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

2
server/lib/emails/contact-form/html.pug
View File

@ -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.

2
server/lib/emails/password-create/html.pug
View File

@ -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).

2
server/lib/emails/password-reset/html.pug
View File

@ -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.

4
server/lib/emails/verify-email/html.pug
View File

@ -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.

2
server/lib/emails/video-abuse-new/html.pug
View File

@ -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

2
server/lib/emails/video-comment-abuse-new/html.pug
View File

@ -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}