X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Factivitypub%2Factivity.ts;h=632f1422317c19ccc6c0aecb758e0a29cb037755;hb=e8cb44090e654fda339506dccfcec7fea8722723;hp=9305e092c91a7bbd43fd730dbc7a1eab9db98b8f;hpb=54141398354e6e7b94aa3065a705a1251390111c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts
index 9305e092c..632f14223 100644
--- a/server/helpers/custom-validators/activitypub/activity.ts
+++ b/server/helpers/custom-validators/activitypub/activity.ts
@@ -1,16 +1,21 @@
 import * as validator from 'validator'
-import { Activity, ActivityType } from '../../../../shared/models/activitypub/activity'
-import { isAccountAcceptActivityValid, isAccountDeleteActivityValid, isAccountFollowActivityValid } from './account'
-import { isAnnounceValid } from './announce'
+import { Activity, ActivityType } from '../../../../shared/models/activitypub'
+import {
+  isActorAcceptActivityValid, isActorDeleteActivityValid, isActorFollowActivityValid, isActorRejectActivityValid,
+  isActorUpdateActivityValid
+} from './actor'
+import { isAnnounceActivityValid } from './announce'
 import { isActivityPubUrlValid } from './misc'
-import { isUndoValid } from './undo'
-import { isVideoChannelCreateActivityValid, isVideoChannelDeleteActivityValid, isVideoChannelUpdateActivityValid } from './video-channels'
+import { isDislikeActivityValid, isLikeActivityValid } from './rate'
+import { isUndoActivityValid } from './undo'
+import { isVideoCommentCreateActivityValid, isVideoCommentDeleteActivityValid } from './video-comments'
 import {
   isVideoFlagValid,
-  isVideoTorrentAddActivityValid,
+  isVideoTorrentCreateActivityValid,
   isVideoTorrentDeleteActivityValid,
   isVideoTorrentUpdateActivityValid
 } from './videos'
+import { isViewActivityValid } from './view'
 
 function isRootActivityValid (activity: any) {
   return Array.isArray(activity['@context']) &&
@@ -27,13 +32,14 @@ function isRootActivityValid (activity: any) {
 
 const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean } = {
   Create: checkCreateActivity,
-  Add: checkAddActivity,
   Update: checkUpdateActivity,
   Delete: checkDeleteActivity,
   Follow: checkFollowActivity,
   Accept: checkAcceptActivity,
+  Reject: checkRejectActivity,
   Announce: checkAnnounceActivity,
-  Undo: checkUndoActivity
+  Undo: checkUndoActivity,
+  Like: checkLikeActivity
 }
 
 function isActivityValid (activity: any) {
@@ -54,37 +60,44 @@ export {
 // ---------------------------------------------------------------------------
 
 function checkCreateActivity (activity: any) {
-  return isVideoChannelCreateActivityValid(activity) ||
-    isVideoFlagValid(activity)
-}
-
-function checkAddActivity (activity: any) {
-  return isVideoTorrentAddActivityValid(activity)
+  return isViewActivityValid(activity) ||
+    isDislikeActivityValid(activity) ||
+    isVideoTorrentCreateActivityValid(activity) ||
+    isVideoFlagValid(activity) ||
+    isVideoCommentCreateActivityValid(activity)
 }
 
 function checkUpdateActivity (activity: any) {
   return isVideoTorrentUpdateActivityValid(activity) ||
-    isVideoChannelUpdateActivityValid(activity)
+    isActorUpdateActivityValid(activity)
 }
 
 function checkDeleteActivity (activity: any) {
   return isVideoTorrentDeleteActivityValid(activity) ||
-    isVideoChannelDeleteActivityValid(activity) ||
-    isAccountDeleteActivityValid(activity)
+    isActorDeleteActivityValid(activity) ||
+    isVideoCommentDeleteActivityValid(activity)
 }
 
 function checkFollowActivity (activity: any) {
-  return isAccountFollowActivityValid(activity)
+  return isActorFollowActivityValid(activity)
 }
 
 function checkAcceptActivity (activity: any) {
-  return isAccountAcceptActivityValid(activity)
+  return isActorAcceptActivityValid(activity)
+}
+
+function checkRejectActivity (activity: any) {
+  return isActorRejectActivityValid(activity)
 }
 
 function checkAnnounceActivity (activity: any) {
-  return isAnnounceValid(activity)
+  return isAnnounceActivityValid(activity)
 }
 
 function checkUndoActivity (activity: any) {
-  return isUndoValid(activity)
+  return isUndoActivityValid(activity)
+}
+
+function checkLikeActivity (activity: any) {
+  return isLikeActivityValid(activity)
 }