Add totalLocalVideoFilesSize in stats

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

diff --git a/server/helpers/custom-validators/activitypub/announce.ts b/server/helpers/custom-validators/activitypub/announce.ts
index 4ba99d1ea366e812a084083f7a371d38a2d31abf..0519c60261ec11bf7f6dc34144ed84eea81fe3db 100644 (file)
--- a/server/helpers/custom-validators/activitypub/announce.ts
+++ b/server/helpers/custom-validators/activitypub/announce.ts
@@ -1,15 +1,13 @@
-import { isBaseActivityValid } from './misc'
-import { isVideoTorrentAddActivityValid } from './videos'
-import { isVideoChannelCreateActivityValid } from './video-channels'
+import { isActivityPubUrlValid, isBaseActivityValid } from './misc'
 
-function isAnnounceValid (activity: any) {
+function isAnnounceActivityValid (activity: any) {
   return isBaseActivityValid(activity, 'Announce') &&
     (
-      isVideoChannelCreateActivityValid(activity.object) ||
-      isVideoTorrentAddActivityValid(activity.object)
+      isActivityPubUrlValid(activity.object) ||
+      (activity.object && isActivityPubUrlValid(activity.object.id))
     )
 }
 
 export {
-  isAnnounceValid
+  isAnnounceActivityValid
 }