-import * as validator from 'validator'
-import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers'
+import validator from 'validator'
+import { ACTIVITY_PUB } from '../../../initializers/constants'
import { exists, isArray, isDateValid } from '../misc'
-import { isActivityPubUrlValid, isBaseActivityValid } from './misc'
-
-function isVideoCommentCreateActivityValid (activity: any) {
- return isBaseActivityValid(activity, 'Create') &&
- sanitizeAndCheckVideoCommentObject(activity.object)
-}
+import { isActivityPubUrlValid } from './misc'
function sanitizeAndCheckVideoCommentObject (comment: any) {
- if (!comment || comment.type !== 'Note') return false
+ if (!comment) return false
+
+ if (!isCommentTypeValid(comment)) return false
normalizeComment(comment)
+ if (comment.type === 'Tombstone') {
+ return isActivityPubUrlValid(comment.id) &&
+ isDateValid(comment.published) &&
+ isDateValid(comment.deleted) &&
+ isActivityPubUrlValid(comment.url)
+ }
+
return isActivityPubUrlValid(comment.id) &&
isCommentContentValid(comment.content) &&
isActivityPubUrlValid(comment.inReplyTo) &&
) // Only accept public comments
}
-function isVideoCommentDeleteActivityValid (activity: any) {
- return isBaseActivityValid(activity, 'Delete')
-}
-
// ---------------------------------------------------------------------------
export {
- isVideoCommentCreateActivityValid,
- isVideoCommentDeleteActivityValid,
sanitizeAndCheckVideoCommentObject
}
if (!comment) return
if (typeof comment.url !== 'string') {
- comment.url = comment.url.href || comment.url.url
+ if (typeof comment.url === 'object') comment.url = comment.url.href || comment.url.url
+ else comment.url = comment.id
}
+}
+
+function isCommentTypeValid (comment: any): boolean {
+ if (comment.type === 'Note') return true
+
+ if (comment.type === 'Tombstone' && comment.formerType === 'Note') return true
- return
+ return false
}