forks
/
peertube
1
0
Fork 0
Code Releases Activity

email object -> email subject

This commit is contained in:
Chocobozzz 2019-08-22 10:22:01 +02:00
parent 122dbb5705
commit 916937d7da
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default.yaml
View File

@ -64,7 +64,7 @@ smtp:
email:
body:
signature: "PeerTube"
object:
subject:
prefix: "[PeerTube]"
# From the project root directory

2
config/production.yaml.example
View File

@ -65,7 +65,7 @@ smtp:
email:
body:
signature: "PeerTube"
object:
subject:
prefix: "[PeerTube]"
# From the project root directory

2
server/initializers/checker-before-init.ts
View File

@ -11,7 +11,7 @@ function checkMissedConfig () {
'trust_proxy',
'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max',
'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
'email.body.signature', 'email.object.prefix',
'email.body.signature', 'email.subject.prefix',
'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', 'storage.plugins',
'log.level',

4
server/initializers/config.ts
View File

@ -48,8 +48,8 @@ const CONFIG = {
BODY: {
SIGNATURE: config.get<string>('email.body.signature')
},
OBJECT: {
PREFIX: config.get<string>('email.object.prefix') + ' '
SUBJECT: {
PREFIX: config.get<string>('email.subject.prefix') + ' '
}
},
STORAGE: {

34
server/lib/emailer.ts
View File

@ -104,7 +104,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + channelName + ' just published a new video',
subject: CONFIG.EMAIL.SUBJECT.PREFIX + channelName + ' just published a new video',
text
}
@ -123,7 +123,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New follower on your channel ' + followingName,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New follower on your channel ' + followingName,
text
}
@ -141,7 +141,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New instance follower',
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New instance follower',
text
}
@ -161,7 +161,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + `Your video ${video.name} is published`,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Your video ${video.name} is published`,
text
}
@ -181,7 +181,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} is finished`,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} is finished`,
text
}
@ -201,7 +201,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} encountered an error`,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} encountered an error`,
text
}
@ -223,7 +223,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New comment on your video ' + video.name,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New comment on your video ' + video.name,
text
}
@ -245,7 +245,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Mention on video ' + video.name,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Mention on video ' + video.name,
text
}
@ -262,7 +262,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Received a video abuse',
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Received a video abuse',
text
}
@ -285,7 +285,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'An auto-blacklisted video is awaiting review',
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'An auto-blacklisted video is awaiting review',
text
}
@ -300,7 +300,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New user registration on ' + WEBSERVER.HOST,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New user registration on ' + WEBSERVER.HOST,
text
}
@ -322,7 +322,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + `Video ${videoName} blacklisted`,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Video ${videoName} blacklisted`,
text
}
@ -340,7 +340,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to,
subject: CONFIG.EMAIL.OBJECT.PREFIX + `Video ${video.name} unblacklisted`,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Video ${video.name} unblacklisted`,
text
}
@ -357,7 +357,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to: [ to ],
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Reset your password',
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Reset your password',
text
}
@ -374,7 +374,7 @@ class Emailer {
const emailPayload: EmailPayload = {
to: [ to ],
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Verify your email',
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Verify your email',
text
}
@ -395,7 +395,7 @@ class Emailer {
const to = user.email
const emailPayload: EmailPayload = {
to: [ to ],
subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Account ' + blockedWord,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Account ' + blockedWord,
text
}
@ -415,7 +415,7 @@ class Emailer {
fromDisplayName: fromEmail,
replyTo: fromEmail,
to: [ CONFIG.ADMIN.EMAIL ],
subject: CONFIG.EMAIL.OBJECT.PREFIX + subject,
subject: CONFIG.EMAIL.SUBJECT.PREFIX + subject,
text
}