forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix email footer 

Do not include notif preferences in contact form email
This commit is contained in:
Chocobozzz 2020-11-10 15:56:13 +01:00
parent 10c8b0b743
commit b9cf3fb638
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/lib/emailer.ts
View File

@ -606,7 +606,10 @@ class Emailer {
locals: {
fromName,
fromEmail,
body
body,
// There are not notification preferences for the contact form
hideNotificationPreferences: true
}
}

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

@ -199,7 +199,7 @@ body(width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule:
td(width="40px")
img(src=`${WEBSERVER.URL}/client/assets/images/icons/icon-192x192.png` width="auto" height="30px" alt="" border="0" style="height: 30px; background: #ffffff; font-family: sans-serif; font-size: 15px; line-height: 15px; color: #555555;")
td
h1(style='margin: 10px 0 10px 0; font-family: sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;')
h1(style='margin: 10px 0 10px 0; font-family: sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;')
block title
if title
| #{title}
@ -234,17 +234,18 @@ body(width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule:
//- 1 Column Text : END
//- Email Body : END
//- Email Footer : BEGIN
table(align='center' role='presentation' cellspacing='0' cellpadding='0' border='0' width='100%' style='margin: auto;')
tr
td(style='padding: 20px; padding-bottom: 0px; font-family: sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;')
webversion
a.nocolor(href=`${WEBSERVER.URL}/my-account/notifications` style='color: #cccccc; font-weight: bold;') View in your notifications
br
tr
td(style='padding: 20px; padding-top: 10px; font-family: sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;')
unsubscribe
a.nocolor(href=`${WEBSERVER.URL}/my-account/settings#notifications` style='color: #888888;') Manage your notification preferences in your profile
br
unless hideNotificationPreferences
table(align='center' role='presentation' cellspacing='0' cellpadding='0' border='0' width='100%' style='margin: auto;')
tr
td(style='padding: 20px; padding-bottom: 0px; font-family: sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;')
webversion
a.nocolor(href=`${WEBSERVER.URL}/my-account/notifications` style='color: #cccccc; font-weight: bold;') View in your notifications
br
tr
td(style='padding: 20px; padding-top: 10px; font-family: sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;')
unsubscribe
a.nocolor(href=`${WEBSERVER.URL}/my-account/settings#notifications` style='color: #888888;') Manage your notification preferences in your profile
br
//- Email Footer : END
//if mso
//- Full Bleed Background Section : BEGIN

5
server/tests/api/server/contact-form.ts
View File

@ -83,6 +83,11 @@ describe('Test contact form', function () {
})
})
it('Should not have the manage preferences link in the email', async function () {
const email = emails[0]
expect(email['text']).to.not.contain('Manage your notification preferences')
})
after(async function () {
MockSmtpServer.Instance.kill()

5
server/tests/api/server/email.ts
View File

@ -279,6 +279,11 @@ describe('Test emails', function () {
expect(email['subject']).contains(' unblacklisted')
expect(email['text']).contains('my super user video')
})
it('Should have the manage preferences link in the email', async function () {
const email = emails[6]
expect(email['text']).to.contain('Manage your notification preferences')
})
})
describe('When verifying a user email', function () {