yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Add ability to cleanup remote AP interactions

Browse source
This commit is contained in:
Chocobozzz 2021-02-26 16:26:27 +01:00
parent 095e225804
commit 74d249bc13
No known key found for this signature in database
GPG key ID: 583A612D890159BE
24 changed files with 655 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

26
server/helpers/custom-validators/activitypub/activity.ts
View file

@ -1,15 +1,16 @@
import validator from 'validator'
import { Activity, ActivityType } from '../../../../shared/models/activitypub'
import { exists } from '../misc'
import { sanitizeAndCheckActorObject } from './actor'
import { isCacheFileObjectValid } from './cache-file'
import { isFlagActivityValid } from './flag'
import { isActivityPubUrlValid, isBaseActivityValid, isObjectValid } from './misc'
import { isDislikeActivityValid } from './rate'
import { isPlaylistObjectValid } from './playlist'
import { isDislikeActivityValid, isLikeActivityValid } from './rate'
import { isShareActivityValid } from './share'
import { sanitizeAndCheckVideoCommentObject } from './video-comments'
import { sanitizeAndCheckVideoTorrentObject } from './videos'
import { isViewActivityValid } from './view'
import { exists } from '../misc'
import { isCacheFileObjectValid } from './cache-file'
import { isFlagActivityValid } from './flag'
import { isPlaylistObjectValid } from './playlist'
function isRootActivityValid (activity: any) {
return isCollection(activity) || isActivity(activity)
@ -70,8 +71,11 @@ function checkFlagActivity (activity: any) {
}
function checkDislikeActivity (activity: any) {
return isBaseActivityValid(activity, 'Dislike') &&
isDislikeActivityValid(activity)
return isDislikeActivityValid(activity)
}
function checkLikeActivity (activity: any) {
return isLikeActivityValid(activity)
}
function checkCreateActivity (activity: any) {
@ -118,8 +122,7 @@ function checkRejectActivity (activity: any) {
}
function checkAnnounceActivity (activity: any) {
return isBaseActivityValid(activity, 'Announce') &&
isObjectValid(activity.object)
return isShareActivityValid(activity)
}
function checkUndoActivity (activity: any) {
@ -132,8 +135,3 @@ function checkUndoActivity (activity: any) {
checkCreateActivity(activity.object)
)
}
function checkLikeActivity (activity: any) {
return isBaseActivityValid(activity, 'Like') &&
isObjectValid(activity.object)
}

13
server/helpers/custom-validators/activitypub/rate.ts
View file

@ -1,13 +1,18 @@
import { isActivityPubUrlValid, isObjectValid } from './misc'
import { isBaseActivityValid, isObjectValid } from './misc'
function isLikeActivityValid (activity: any) {
return isBaseActivityValid(activity, 'Like') &&
isObjectValid(activity.object)
}
function isDislikeActivityValid (activity: any) {
return activity.type === 'Dislike' &&
isActivityPubUrlValid(activity.actor) &&
return isBaseActivityValid(activity, 'Dislike') &&
isObjectValid(activity.object)
}
// ---------------------------------------------------------------------------
export {
isDislikeActivityValid
isDislikeActivityValid,
isLikeActivityValid
}

11
server/helpers/custom-validators/activitypub/share.ts Normal file
View file

@ -0,0 +1,11 @@
import { isBaseActivityValid, isObjectValid } from './misc'
function isShareActivityValid (activity: any) {
return isBaseActivityValid(activity, 'Announce') &&
isObjectValid(activity.object)
}
// ---------------------------------------------------------------------------
export {
isShareActivityValid
}