Feature/filter already watched videos (#5739)

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / activitypub / activity.ts

diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts
index 69558e35898888fe00cbd61b39e31a03cbbc12c9..90a9185234e5bd3e09bdf50b8407bf69043a717a 100644 (file)
--- a/server/helpers/custom-validators/activitypub/activity.ts
+++ b/server/helpers/custom-validators/activitypub/activity.ts
@@ -8,6 +8,7 @@ import { isActivityPubUrlValid, isBaseActivityValid, isObjectValid } from './mis
 import { isPlaylistObjectValid } from './playlist'
 import { sanitizeAndCheckVideoCommentObject } from './video-comments'
 import { sanitizeAndCheckVideoTorrentObject } from './videos'
+import { isWatchActionObjectValid } from './watch-action'
 
 function isRootActivityValid (activity: any) {
   return isCollection(activity) || isActivity(activity)
@@ -49,7 +50,7 @@ function isActivityValid (activity: any) {
 }
 
 function isFlagActivityValid (activity: any) {
-  return isBaseActivityValid(activity.type, 'Flag') &&
+  return isBaseActivityValid(activity, 'Flag') &&
     isAbuseReasonValid(activity.content) &&
     isActivityPubUrlValid(activity.object)
 }
@@ -82,6 +83,7 @@ function isCreateActivityValid (activity: any) {
       isDislikeActivityValid(activity.object) ||
       isFlagActivityValid(activity.object) ||
       isPlaylistObjectValid(activity.object) ||
+      isWatchActionObjectValid(activity.object) ||
 
       isCacheFileObjectValid(activity.object) ||
       sanitizeAndCheckVideoCommentObject(activity.object) ||