Merge branch 'develop' into cli-wrapper

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

diff --git a/server/helpers/custom-validators/activitypub/undo.ts b/server/helpers/custom-validators/activitypub/undo.ts
index a9a2a3a41d38c1ce1607930aaa3c0a446b19aaaf..578035893b61a55065784d79ea961f84141b442e 100644 (file)
--- a/server/helpers/custom-validators/activitypub/undo.ts
+++ b/server/helpers/custom-validators/activitypub/undo.ts
@@ -1,13 +1,20 @@
-import { isAccountFollowActivityValid } from './account'
+import { isActorFollowActivityValid } from './actor'
 import { isBaseActivityValid } from './misc'
+import { isDislikeActivityValid, isLikeActivityValid } from './rate'
+import { isAnnounceActivityValid } from './announce'
+import { isCacheFileCreateActivityValid } from './cache-file'
 
-function isUndoValid (activity: any) {
+function isUndoActivityValid (activity: any) {
   return isBaseActivityValid(activity, 'Undo') &&
     (
-      isAccountFollowActivityValid(activity.object)
+      isActorFollowActivityValid(activity.object) ||
+      isLikeActivityValid(activity.object) ||
+      isDislikeActivityValid(activity.object) ||
+      isAnnounceActivityValid(activity.object) ||
+      isCacheFileCreateActivityValid(activity.object)
     )
 }
 
 export {
-  isUndoValid
+  isUndoActivityValid
 }