import * as validator from 'validator'
import { Activity, ActivityType } from '../../../../shared/models/activitypub'
import {
- isActorAcceptActivityValid, isActorDeleteActivityValid, isActorFollowActivityValid, isActorRejectActivityValid,
+ isActorAcceptActivityValid,
+ isActorDeleteActivityValid,
+ isActorFollowActivityValid,
+ isActorRejectActivityValid,
isActorUpdateActivityValid
} from './actor'
import { isAnnounceActivityValid } from './announce'
import { isVideoCommentCreateActivityValid, isVideoCommentDeleteActivityValid } from './video-comments'
import {
isVideoFlagValid,
- sanitizeAndCheckVideoTorrentCreateActivity,
isVideoTorrentDeleteActivityValid,
+ sanitizeAndCheckVideoTorrentCreateActivity,
sanitizeAndCheckVideoTorrentUpdateActivity
} from './videos'
import { isViewActivityValid } from './view'
+import { exists } from '../misc'
+import { isCacheFileCreateActivityValid, isCacheFileUpdateActivityValid } from './cache-file'
function isRootActivityValid (activity: any) {
- return Array.isArray(activity['@context']) &&
+ return Array.isArray(activity['@context']) && (
(
(activity.type === 'Collection' || activity.type === 'OrderedCollection') &&
validator.isInt(activity.totalItems, { min: 0 }) &&
) ||
(
isActivityPubUrlValid(activity.id) &&
+ exists(activity.actor) &&
(isActivityPubUrlValid(activity.actor) || isActivityPubUrlValid(activity.actor.id))
)
+ )
}
const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean } = {
isDislikeActivityValid(activity) ||
sanitizeAndCheckVideoTorrentCreateActivity(activity) ||
isVideoFlagValid(activity) ||
- isVideoCommentCreateActivityValid(activity)
+ isVideoCommentCreateActivityValid(activity) ||
+ isCacheFileCreateActivityValid(activity)
}
function checkUpdateActivity (activity: any) {
- return sanitizeAndCheckVideoTorrentUpdateActivity(activity) ||
+ return isCacheFileUpdateActivityValid(activity) ||
+ sanitizeAndCheckVideoTorrentUpdateActivity(activity) ||
isActorUpdateActivityValid(activity)
}