From da854ddd502cd70685ef779c673b9e63757b8aa0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Dec 2017 11:16:08 +0100 Subject: Propagate old comment on new follow --- server/helpers/custom-validators/activitypub/actor.ts | 3 ++- server/helpers/custom-validators/activitypub/announce.ts | 1 - server/helpers/custom-validators/activitypub/index.ts | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 server/helpers/custom-validators/activitypub/index.ts (limited to 'server/helpers/custom-validators') diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index ec8da3350..630bace30 100644 --- a/server/helpers/custom-validators/activitypub/actor.ts +++ b/server/helpers/custom-validators/activitypub/actor.ts @@ -46,7 +46,8 @@ function isActorPrivateKeyValid (privateKey: string) { } function isRemoteActorValid (remoteActor: any) { - return isActivityPubUrlValid(remoteActor.id) && + return exists(remoteActor) && + isActivityPubUrlValid(remoteActor.id) && isActorTypeValid(remoteActor.type) && isActivityPubUrlValid(remoteActor.following) && isActivityPubUrlValid(remoteActor.followers) && diff --git a/server/helpers/custom-validators/activitypub/announce.ts b/server/helpers/custom-validators/activitypub/announce.ts index 1baea4f60..7dd1d6988 100644 --- a/server/helpers/custom-validators/activitypub/announce.ts +++ b/server/helpers/custom-validators/activitypub/announce.ts @@ -2,7 +2,6 @@ import { isActivityPubUrlValid, isBaseActivityValid } from './misc' import { isVideoTorrentCreateActivityValid } from './videos' function isAnnounceActivityValid (activity: any) { - console.log(activity) return isBaseActivityValid(activity, 'Announce') && ( isVideoTorrentCreateActivityValid(activity.object) || diff --git a/server/helpers/custom-validators/activitypub/index.ts b/server/helpers/custom-validators/activitypub/index.ts deleted file mode 100644 index ba411f1c6..000000000 --- a/server/helpers/custom-validators/activitypub/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './actor' -export * from './activity' -export * from './misc' -export * from './signature' -export * from './undo' -export * from './video-channels' -export * from './videos' -export * from './view' -- cgit v1.2.3