aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-07-08 15:51:46 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-07-10 14:02:41 +0200
commit310b5219b38427f0c2c7ba57225afdd8f3064380 (patch)
tree853ff7e4e66425ca47b0999384eeb08ed14b28ff /server/lib
parent811cef146c841ef8530bc812c05dfee77e0f2998 (diff)
downloadPeerTube-310b5219b38427f0c2c7ba57225afdd8f3064380.tar.gz
PeerTube-310b5219b38427f0c2c7ba57225afdd8f3064380.tar.zst
PeerTube-310b5219b38427f0c2c7ba57225afdd8f3064380.zip
Add new abuses tests
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/emailer.ts1
-rw-r--r--server/lib/emails/video-comment-abuse-new/html.pug3
-rw-r--r--server/lib/notifier.ts2
3 files changed, 4 insertions, 2 deletions
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index a5664408d..5a6f37bb9 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -325,6 +325,7 @@ class Emailer {
325 subject: `New comment abuse report from ${reporter}`, 325 subject: `New comment abuse report from ${reporter}`,
326 locals: { 326 locals: {
327 commentUrl, 327 commentUrl,
328 videoName: comment.Video.name,
328 isLocal: comment.isOwned(), 329 isLocal: comment.isOwned(),
329 commentCreatedAt: new Date(comment.createdAt).toLocaleString(), 330 commentCreatedAt: new Date(comment.createdAt).toLocaleString(),
330 reason: abuse.reason, 331 reason: abuse.reason,
diff --git a/server/lib/emails/video-comment-abuse-new/html.pug b/server/lib/emails/video-comment-abuse-new/html.pug
index 170b79576..fc1c3e4e7 100644
--- a/server/lib/emails/video-comment-abuse-new/html.pug
+++ b/server/lib/emails/video-comment-abuse-new/html.pug
@@ -7,7 +7,8 @@ block title
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 '}comment "
10 a(href=commentUrl) of #{flaggedAccount} 10 a(href=commentUrl) on video #{videoName}
11 | of #{flaggedAccount}
11 | created on #{commentCreatedAt} 12 | created on #{commentCreatedAt}
12 13
13 p The reporter, #{reporter}, cited the following reason(s): 14 p The reporter, #{reporter}, cited the following reason(s):
diff --git a/server/lib/notifier.ts b/server/lib/notifier.ts
index 969e393fa..c567e1c20 100644
--- a/server/lib/notifier.ts
+++ b/server/lib/notifier.ts
@@ -371,7 +371,7 @@ class Notifier {
371 371
372 async function notificationCreator (user: MUserWithNotificationSetting) { 372 async function notificationCreator (user: MUserWithNotificationSetting) {
373 const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ 373 const notification = await UserNotificationModel.create<UserNotificationModelForApi>({
374 type: UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS, 374 type: UserNotificationType.NEW_ABUSE_FOR_MODERATORS,
375 userId: user.id, 375 userId: user.id,
376 abuseId: abuse.id 376 abuseId: abuse.id
377 }) 377 })