import * as validator from 'validator'
import { Activity, ActivityType } from '../../../../shared/models/activitypub'
-import { isAccountAcceptActivityValid, isAccountDeleteActivityValid, isAccountFollowActivityValid } 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 { isVideoChannelCreateActivityValid, isVideoChannelDeleteActivityValid, isVideoChannelUpdateActivityValid } from './video-channels'
+import { isVideoCommentCreateActivityValid, isVideoCommentDeleteActivityValid } from './video-comments'
import {
isVideoFlagValid,
- isVideoTorrentAddActivityValid,
+ sanitizeAndCheckVideoTorrentCreateActivity,
isVideoTorrentDeleteActivityValid,
- isVideoTorrentUpdateActivityValid
+ sanitizeAndCheckVideoTorrentUpdateActivity
} from './videos'
import { isViewActivityValid } from './view'
+import { exists } from '../misc'
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) &&
- isActivityPubUrlValid(activity.actor)
+ exists(activity.actor) &&
+ (isActivityPubUrlValid(activity.actor) || isActivityPubUrlValid(activity.actor.id))
)
+ )
}
const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean } = {
Create: checkCreateActivity,
- Add: checkAddActivity,
Update: checkUpdateActivity,
Delete: checkDeleteActivity,
Follow: checkFollowActivity,
Accept: checkAcceptActivity,
+ Reject: checkRejectActivity,
Announce: checkAnnounceActivity,
Undo: checkUndoActivity,
Like: checkLikeActivity
function checkCreateActivity (activity: any) {
return isViewActivityValid(activity) ||
isDislikeActivityValid(activity) ||
- isVideoChannelCreateActivityValid(activity) ||
- isVideoFlagValid(activity)
-}
-
-function checkAddActivity (activity: any) {
- return isVideoTorrentAddActivityValid(activity)
+ sanitizeAndCheckVideoTorrentCreateActivity(activity) ||
+ isVideoFlagValid(activity) ||
+ isVideoCommentCreateActivityValid(activity)
}
function checkUpdateActivity (activity: any) {
- return isVideoTorrentUpdateActivityValid(activity) ||
- isVideoChannelUpdateActivityValid(activity)
+ return sanitizeAndCheckVideoTorrentUpdateActivity(activity) ||
+ isActorUpdateActivityValid(activity)
}
function checkDeleteActivity (activity: any) {
return isVideoTorrentDeleteActivityValid(activity) ||
- isVideoChannelDeleteActivityValid(activity) ||
- isAccountDeleteActivityValid(activity)
+ isActorDeleteActivityValid(activity) ||
+ isVideoCommentDeleteActivityValid(activity)
}
function checkFollowActivity (activity: any) {
- return isAccountFollowActivityValid(activity)
+ return isActorFollowActivityValid(activity)
}
function checkAcceptActivity (activity: any) {
- return isAccountAcceptActivityValid(activity)
+ return isActorAcceptActivityValid(activity)
+}
+
+function checkRejectActivity (activity: any) {
+ return isActorRejectActivityValid(activity)
}
function checkAnnounceActivity (activity: any) {