X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Factivitypub%2Factivity.ts;h=632f1422317c19ccc6c0aecb758e0a29cb037755;hb=e8cb44090e654fda339506dccfcec7fea8722723;hp=c402800a48ee9df70c1d0d74ec26d9a5981dc805;hpb=50d6de9c286abcb34ff4234d56d9cbb803db7665;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts index c402800a4..632f14223 100644 --- a/server/helpers/custom-validators/activitypub/activity.ts +++ b/server/helpers/custom-validators/activitypub/activity.ts @@ -1,11 +1,14 @@ import * as validator from 'validator' import { Activity, ActivityType } from '../../../../shared/models/activitypub' -import { isActorAcceptActivityValid, isActorDeleteActivityValid, isActorFollowActivityValid } from './actor' +import { + isActorAcceptActivityValid, isActorDeleteActivityValid, isActorFollowActivityValid, isActorRejectActivityValid, + isActorUpdateActivityValid +} from './actor' import { isAnnounceActivityValid } from './announce' import { isActivityPubUrlValid } from './misc' import { isDislikeActivityValid, isLikeActivityValid } from './rate' import { isUndoActivityValid } from './undo' -import { isVideoChannelDeleteActivityValid, isVideoChannelUpdateActivityValid } from './video-channels' +import { isVideoCommentCreateActivityValid, isVideoCommentDeleteActivityValid } from './video-comments' import { isVideoFlagValid, isVideoTorrentCreateActivityValid, @@ -33,6 +36,7 @@ const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean Delete: checkDeleteActivity, Follow: checkFollowActivity, Accept: checkAcceptActivity, + Reject: checkRejectActivity, Announce: checkAnnounceActivity, Undo: checkUndoActivity, Like: checkLikeActivity @@ -59,18 +63,19 @@ function checkCreateActivity (activity: any) { return isViewActivityValid(activity) || isDislikeActivityValid(activity) || isVideoTorrentCreateActivityValid(activity) || - isVideoFlagValid(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) || - isActorDeleteActivityValid(activity) + isActorDeleteActivityValid(activity) || + isVideoCommentDeleteActivityValid(activity) } function checkFollowActivity (activity: any) { @@ -81,6 +86,10 @@ function checkAcceptActivity (activity: any) { return isActorAcceptActivityValid(activity) } +function checkRejectActivity (activity: any) { + return isActorRejectActivityValid(activity) +} + function checkAnnounceActivity (activity: any) { return isAnnounceActivityValid(activity) }