diff options
author | Chocobozzz <me@florianbigard.com> | 2018-01-04 11:19:16 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-01-04 11:19:16 +0100 |
commit | 4cb6d4578893db310297d7e118ce2fb7ecb952a3 (patch) | |
tree | a89a2e2062ba7bb91e922f07a7950ee51e090ccf /server/helpers/custom-validators | |
parent | cf117aaafc1e9ae1ab4c388fc5d2e5ba9349efee (diff) | |
download | PeerTube-4cb6d4578893db310297d7e118ce2fb7ecb952a3.tar.gz PeerTube-4cb6d4578893db310297d7e118ce2fb7ecb952a3.tar.zst PeerTube-4cb6d4578893db310297d7e118ce2fb7ecb952a3.zip |
Add ability to delete comments
Diffstat (limited to 'server/helpers/custom-validators')
-rw-r--r-- | server/helpers/custom-validators/activitypub/activity.ts | 5 | ||||
-rw-r--r-- | server/helpers/custom-validators/activitypub/video-comments.ts | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts index 856c87f2c..577cf4b52 100644 --- a/server/helpers/custom-validators/activitypub/activity.ts +++ b/server/helpers/custom-validators/activitypub/activity.ts | |||
@@ -5,7 +5,7 @@ import { isAnnounceActivityValid } from './announce' | |||
5 | import { isActivityPubUrlValid } from './misc' | 5 | import { isActivityPubUrlValid } from './misc' |
6 | import { isDislikeActivityValid, isLikeActivityValid } from './rate' | 6 | import { isDislikeActivityValid, isLikeActivityValid } from './rate' |
7 | import { isUndoActivityValid } from './undo' | 7 | import { isUndoActivityValid } from './undo' |
8 | import { isVideoCommentCreateActivityValid } from './video-comments' | 8 | import { isVideoCommentCreateActivityValid, isVideoCommentDeleteActivityValid } from './video-comments' |
9 | import { | 9 | import { |
10 | isVideoFlagValid, | 10 | isVideoFlagValid, |
11 | isVideoTorrentCreateActivityValid, | 11 | isVideoTorrentCreateActivityValid, |
@@ -70,7 +70,8 @@ function checkUpdateActivity (activity: any) { | |||
70 | 70 | ||
71 | function checkDeleteActivity (activity: any) { | 71 | function checkDeleteActivity (activity: any) { |
72 | return isVideoTorrentDeleteActivityValid(activity) || | 72 | return isVideoTorrentDeleteActivityValid(activity) || |
73 | isActorDeleteActivityValid(activity) | 73 | isActorDeleteActivityValid(activity) || |
74 | isVideoCommentDeleteActivityValid(activity) | ||
74 | } | 75 | } |
75 | 76 | ||
76 | function checkFollowActivity (activity: any) { | 77 | function checkFollowActivity (activity: any) { |
diff --git a/server/helpers/custom-validators/activitypub/video-comments.ts b/server/helpers/custom-validators/activitypub/video-comments.ts index 489ff27de..6928aced3 100644 --- a/server/helpers/custom-validators/activitypub/video-comments.ts +++ b/server/helpers/custom-validators/activitypub/video-comments.ts | |||
@@ -18,10 +18,15 @@ function isVideoCommentObjectValid (comment: any) { | |||
18 | isActivityPubUrlValid(comment.url) | 18 | isActivityPubUrlValid(comment.url) |
19 | } | 19 | } |
20 | 20 | ||
21 | function isVideoCommentDeleteActivityValid (activity: any) { | ||
22 | return isBaseActivityValid(activity, 'Delete') | ||
23 | } | ||
24 | |||
21 | // --------------------------------------------------------------------------- | 25 | // --------------------------------------------------------------------------- |
22 | 26 | ||
23 | export { | 27 | export { |
24 | isVideoCommentCreateActivityValid | 28 | isVideoCommentCreateActivityValid, |
29 | isVideoCommentDeleteActivityValid | ||
25 | } | 30 | } |
26 | 31 | ||
27 | // --------------------------------------------------------------------------- | 32 | // --------------------------------------------------------------------------- |