aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/lib/emailer.ts5
-rw-r--r--server/lib/emails/account-abuse-new/html.pug4
-rw-r--r--server/lib/emails/video-comment-abuse-new/html.pug8
3 files changed, 10 insertions, 7 deletions
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 5a6f37bb9..d54eab966 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -311,7 +311,8 @@ class Emailer {
311 videoPublishedAt: new Date(video.publishedAt).toLocaleString(), 311 videoPublishedAt: new Date(video.publishedAt).toLocaleString(),
312 videoName: video.name, 312 videoName: video.name,
313 reason: abuse.reason, 313 reason: abuse.reason,
314 videoChannel: video.VideoChannel, 314 videoChannel: abuse.video.channel,
315 reporter,
315 action 316 action
316 } 317 }
317 } 318 }
@@ -330,6 +331,7 @@ class Emailer {
330 commentCreatedAt: new Date(comment.createdAt).toLocaleString(), 331 commentCreatedAt: new Date(comment.createdAt).toLocaleString(),
331 reason: abuse.reason, 332 reason: abuse.reason,
332 flaggedAccount: abuseInstance.FlaggedAccount.getDisplayName(), 333 flaggedAccount: abuseInstance.FlaggedAccount.getDisplayName(),
334 reporter,
333 action 335 action
334 } 336 }
335 } 337 }
@@ -346,6 +348,7 @@ class Emailer {
346 accountDisplayName: account.getDisplayName(), 348 accountDisplayName: account.getDisplayName(),
347 isLocal: account.isOwned(), 349 isLocal: account.isOwned(),
348 reason: abuse.reason, 350 reason: abuse.reason,
351 reporter,
349 action 352 action
350 } 353 }
351 } 354 }
diff --git a/server/lib/emails/account-abuse-new/html.pug b/server/lib/emails/account-abuse-new/html.pug
index 06be8025b..f1aa2886e 100644
--- a/server/lib/emails/account-abuse-new/html.pug
+++ b/server/lib/emails/account-abuse-new/html.pug
@@ -6,8 +6,8 @@ block title
6 6
7block content 7block content
8 p 8 p
9 | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}account " 9 | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}account
10 a(href=accountUrl) #{accountDisplayName} 10 a(href=accountUrl) #{accountDisplayName}
11 11
12 p The reporter, #{reporter}, cited the following reason(s): 12 p The reporter, #{reporter}, cited the following reason(s):
13 blockquote #{reason} 13 blockquote #{reason}
diff --git a/server/lib/emails/video-comment-abuse-new/html.pug b/server/lib/emails/video-comment-abuse-new/html.pug
index fc1c3e4e7..e92d986b5 100644
--- a/server/lib/emails/video-comment-abuse-new/html.pug
+++ b/server/lib/emails/video-comment-abuse-new/html.pug
@@ -6,10 +6,10 @@ block title
6 6
7block content 7block content
8 p 8 p
9 | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}comment " 9 | #[a(href=WEBSERVER.URL) #{WEBSERVER.HOST}] received an abuse report for the #{isLocal ? '' : 'remote '}
10 a(href=commentUrl) on video #{videoName} 10 a(href=commentUrl) comment on video "#{videoName}"
11 | of #{flaggedAccount} 11 | of #{flaggedAccount}
12 | created on #{commentCreatedAt} 12 | created on #{commentCreatedAt}
13 13
14 p The reporter, #{reporter}, cited the following reason(s): 14 p The reporter, #{reporter}, cited the following reason(s):
15 blockquote #{reason} 15 blockquote #{reason}