diff options
Diffstat (limited to 'server/helpers/custom-validators/activitypub/activity.ts')
-rw-r--r-- | server/helpers/custom-validators/activitypub/activity.ts | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts index ae7732194..c402800a4 100644 --- a/server/helpers/custom-validators/activitypub/activity.ts +++ b/server/helpers/custom-validators/activitypub/activity.ts | |||
@@ -1,14 +1,14 @@ | |||
1 | import * as validator from 'validator' | 1 | import * as validator from 'validator' |
2 | import { Activity, ActivityType } from '../../../../shared/models/activitypub' | 2 | import { Activity, ActivityType } from '../../../../shared/models/activitypub' |
3 | import { isAccountAcceptActivityValid, isAccountDeleteActivityValid, isAccountFollowActivityValid } from './actor' | 3 | import { isActorAcceptActivityValid, isActorDeleteActivityValid, isActorFollowActivityValid } from './actor' |
4 | import { isAnnounceActivityValid } from './announce' | 4 | import { isAnnounceActivityValid } from './announce' |
5 | import { isActivityPubUrlValid } from './misc' | 5 | import { isActivityPubUrlValid } from './misc' |
6 | import { isDislikeActivityValid, isLikeActivityValid } from './rate' | 6 | import { isDislikeActivityValid, isLikeActivityValid } from './rate' |
7 | import { isUndoActivityValid } from './undo' | 7 | import { isUndoActivityValid } from './undo' |
8 | import { isVideoChannelCreateActivityValid, isVideoChannelDeleteActivityValid, isVideoChannelUpdateActivityValid } from './video-channels' | 8 | import { isVideoChannelDeleteActivityValid, isVideoChannelUpdateActivityValid } from './video-channels' |
9 | import { | 9 | import { |
10 | isVideoFlagValid, | 10 | isVideoFlagValid, |
11 | isVideoTorrentAddActivityValid, | 11 | isVideoTorrentCreateActivityValid, |
12 | isVideoTorrentDeleteActivityValid, | 12 | isVideoTorrentDeleteActivityValid, |
13 | isVideoTorrentUpdateActivityValid | 13 | isVideoTorrentUpdateActivityValid |
14 | } from './videos' | 14 | } from './videos' |
@@ -29,7 +29,6 @@ function isRootActivityValid (activity: any) { | |||
29 | 29 | ||
30 | const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean } = { | 30 | const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean } = { |
31 | Create: checkCreateActivity, | 31 | Create: checkCreateActivity, |
32 | Add: checkAddActivity, | ||
33 | Update: checkUpdateActivity, | 32 | Update: checkUpdateActivity, |
34 | Delete: checkDeleteActivity, | 33 | Delete: checkDeleteActivity, |
35 | Follow: checkFollowActivity, | 34 | Follow: checkFollowActivity, |
@@ -59,14 +58,10 @@ export { | |||
59 | function checkCreateActivity (activity: any) { | 58 | function checkCreateActivity (activity: any) { |
60 | return isViewActivityValid(activity) || | 59 | return isViewActivityValid(activity) || |
61 | isDislikeActivityValid(activity) || | 60 | isDislikeActivityValid(activity) || |
62 | isVideoChannelCreateActivityValid(activity) || | 61 | isVideoTorrentCreateActivityValid(activity) || |
63 | isVideoFlagValid(activity) | 62 | isVideoFlagValid(activity) |
64 | } | 63 | } |
65 | 64 | ||
66 | function checkAddActivity (activity: any) { | ||
67 | return isVideoTorrentAddActivityValid(activity) | ||
68 | } | ||
69 | |||
70 | function checkUpdateActivity (activity: any) { | 65 | function checkUpdateActivity (activity: any) { |
71 | return isVideoTorrentUpdateActivityValid(activity) || | 66 | return isVideoTorrentUpdateActivityValid(activity) || |
72 | isVideoChannelUpdateActivityValid(activity) | 67 | isVideoChannelUpdateActivityValid(activity) |
@@ -75,15 +70,15 @@ function checkUpdateActivity (activity: any) { | |||
75 | function checkDeleteActivity (activity: any) { | 70 | function checkDeleteActivity (activity: any) { |
76 | return isVideoTorrentDeleteActivityValid(activity) || | 71 | return isVideoTorrentDeleteActivityValid(activity) || |
77 | isVideoChannelDeleteActivityValid(activity) || | 72 | isVideoChannelDeleteActivityValid(activity) || |
78 | isAccountDeleteActivityValid(activity) | 73 | isActorDeleteActivityValid(activity) |
79 | } | 74 | } |
80 | 75 | ||
81 | function checkFollowActivity (activity: any) { | 76 | function checkFollowActivity (activity: any) { |
82 | return isAccountFollowActivityValid(activity) | 77 | return isActorFollowActivityValid(activity) |
83 | } | 78 | } |
84 | 79 | ||
85 | function checkAcceptActivity (activity: any) { | 80 | function checkAcceptActivity (activity: any) { |
86 | return isAccountAcceptActivityValid(activity) | 81 | return isActorAcceptActivityValid(activity) |
87 | } | 82 | } |
88 | 83 | ||
89 | function checkAnnounceActivity (activity: any) { | 84 | function checkAnnounceActivity (activity: any) { |