aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/initializers/checker-before-init.ts2
-rw-r--r--server/initializers/config.ts4
-rw-r--r--server/lib/emailer.ts34
3 files changed, 20 insertions, 20 deletions
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts
index 55bc820f5..a986c3e0e 100644
--- a/server/initializers/checker-before-init.ts
+++ b/server/initializers/checker-before-init.ts
@@ -11,7 +11,7 @@ function checkMissedConfig () {
11 'trust_proxy', 11 'trust_proxy',
12 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max', 12 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max',
13 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', 13 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
14 'email.body.signature', 'email.object.prefix', 14 'email.body.signature', 'email.subject.prefix',
15 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', 15 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
16 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', 'storage.plugins', 16 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', 'storage.plugins',
17 'log.level', 17 'log.level',
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 58241e4ea..510f7d64d 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -48,8 +48,8 @@ const CONFIG = {
48 BODY: { 48 BODY: {
49 SIGNATURE: config.get<string>('email.body.signature') 49 SIGNATURE: config.get<string>('email.body.signature')
50 }, 50 },
51 OBJECT: { 51 SUBJECT: {
52 PREFIX: config.get<string>('email.object.prefix') + ' ' 52 PREFIX: config.get<string>('email.subject.prefix') + ' '
53 } 53 }
54 }, 54 },
55 STORAGE: { 55 STORAGE: {
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 73c2bcb1b..10e7d0479 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -104,7 +104,7 @@ class Emailer {
104 104
105 const emailPayload: EmailPayload = { 105 const emailPayload: EmailPayload = {
106 to, 106 to,
107 subject: CONFIG.EMAIL.OBJECT.PREFIX + channelName + ' just published a new video', 107 subject: CONFIG.EMAIL.SUBJECT.PREFIX + channelName + ' just published a new video',
108 text 108 text
109 } 109 }
110 110
@@ -123,7 +123,7 @@ class Emailer {
123 123
124 const emailPayload: EmailPayload = { 124 const emailPayload: EmailPayload = {
125 to, 125 to,
126 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New follower on your channel ' + followingName, 126 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New follower on your channel ' + followingName,
127 text 127 text
128 } 128 }
129 129
@@ -141,7 +141,7 @@ class Emailer {
141 141
142 const emailPayload: EmailPayload = { 142 const emailPayload: EmailPayload = {
143 to, 143 to,
144 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New instance follower', 144 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New instance follower',
145 text 145 text
146 } 146 }
147 147
@@ -161,7 +161,7 @@ class Emailer {
161 161
162 const emailPayload: EmailPayload = { 162 const emailPayload: EmailPayload = {
163 to, 163 to,
164 subject: CONFIG.EMAIL.OBJECT.PREFIX + `Your video ${video.name} is published`, 164 subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Your video ${video.name} is published`,
165 text 165 text
166 } 166 }
167 167
@@ -181,7 +181,7 @@ class Emailer {
181 181
182 const emailPayload: EmailPayload = { 182 const emailPayload: EmailPayload = {
183 to, 183 to,
184 subject: CONFIG.EMAIL.OBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} is finished`, 184 subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} is finished`,
185 text 185 text
186 } 186 }
187 187
@@ -201,7 +201,7 @@ class Emailer {
201 201
202 const emailPayload: EmailPayload = { 202 const emailPayload: EmailPayload = {
203 to, 203 to,
204 subject: CONFIG.EMAIL.OBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} encountered an error`, 204 subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Your video import ${videoImport.getTargetIdentifier()} encountered an error`,
205 text 205 text
206 } 206 }
207 207
@@ -223,7 +223,7 @@ class Emailer {
223 223
224 const emailPayload: EmailPayload = { 224 const emailPayload: EmailPayload = {
225 to, 225 to,
226 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New comment on your video ' + video.name, 226 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New comment on your video ' + video.name,
227 text 227 text
228 } 228 }
229 229
@@ -245,7 +245,7 @@ class Emailer {
245 245
246 const emailPayload: EmailPayload = { 246 const emailPayload: EmailPayload = {
247 to, 247 to,
248 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Mention on video ' + video.name, 248 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Mention on video ' + video.name,
249 text 249 text
250 } 250 }
251 251
@@ -262,7 +262,7 @@ class Emailer {
262 262
263 const emailPayload: EmailPayload = { 263 const emailPayload: EmailPayload = {
264 to, 264 to,
265 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Received a video abuse', 265 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Received a video abuse',
266 text 266 text
267 } 267 }
268 268
@@ -285,7 +285,7 @@ class Emailer {
285 285
286 const emailPayload: EmailPayload = { 286 const emailPayload: EmailPayload = {
287 to, 287 to,
288 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'An auto-blacklisted video is awaiting review', 288 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'An auto-blacklisted video is awaiting review',
289 text 289 text
290 } 290 }
291 291
@@ -300,7 +300,7 @@ class Emailer {
300 300
301 const emailPayload: EmailPayload = { 301 const emailPayload: EmailPayload = {
302 to, 302 to,
303 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'New user registration on ' + WEBSERVER.HOST, 303 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New user registration on ' + WEBSERVER.HOST,
304 text 304 text
305 } 305 }
306 306
@@ -322,7 +322,7 @@ class Emailer {
322 322
323 const emailPayload: EmailPayload = { 323 const emailPayload: EmailPayload = {
324 to, 324 to,
325 subject: CONFIG.EMAIL.OBJECT.PREFIX + `Video ${videoName} blacklisted`, 325 subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Video ${videoName} blacklisted`,
326 text 326 text
327 } 327 }
328 328
@@ -340,7 +340,7 @@ class Emailer {
340 340
341 const emailPayload: EmailPayload = { 341 const emailPayload: EmailPayload = {
342 to, 342 to,
343 subject: CONFIG.EMAIL.OBJECT.PREFIX + `Video ${video.name} unblacklisted`, 343 subject: CONFIG.EMAIL.SUBJECT.PREFIX + `Video ${video.name} unblacklisted`,
344 text 344 text
345 } 345 }
346 346
@@ -357,7 +357,7 @@ class Emailer {
357 357
358 const emailPayload: EmailPayload = { 358 const emailPayload: EmailPayload = {
359 to: [ to ], 359 to: [ to ],
360 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Reset your password', 360 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Reset your password',
361 text 361 text
362 } 362 }
363 363
@@ -374,7 +374,7 @@ class Emailer {
374 374
375 const emailPayload: EmailPayload = { 375 const emailPayload: EmailPayload = {
376 to: [ to ], 376 to: [ to ],
377 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Verify your email', 377 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Verify your email',
378 text 378 text
379 } 379 }
380 380
@@ -395,7 +395,7 @@ class Emailer {
395 const to = user.email 395 const to = user.email
396 const emailPayload: EmailPayload = { 396 const emailPayload: EmailPayload = {
397 to: [ to ], 397 to: [ to ],
398 subject: CONFIG.EMAIL.OBJECT.PREFIX + 'Account ' + blockedWord, 398 subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Account ' + blockedWord,
399 text 399 text
400 } 400 }
401 401
@@ -415,7 +415,7 @@ class Emailer {
415 fromDisplayName: fromEmail, 415 fromDisplayName: fromEmail,
416 replyTo: fromEmail, 416 replyTo: fromEmail,
417 to: [ CONFIG.ADMIN.EMAIL ], 417 to: [ CONFIG.ADMIN.EMAIL ],
418 subject: CONFIG.EMAIL.OBJECT.PREFIX + subject, 418 subject: CONFIG.EMAIL.SUBJECT.PREFIX + subject,
419 text 419 text
420 } 420 }
421 421