import * as validator from 'validator'
import { CONSTRAINTS_FIELDS } from '../../../initializers'
-import { exists } from '../misc'
+import { exists, isArray } from '../misc'
import { truncate } from 'lodash'
import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'
+import { isHostValid } from '../servers'
function isActorEndpointsObjectValid (endpointObject: any) {
return isActivityPubUrlValid(endpointObject.sharedInbox)
validator.isLength(publicKey, CONSTRAINTS_FIELDS.ACTORS.PUBLIC_KEY)
}
-const actorNameRegExp = new RegExp('[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_]+')
+const actorNameRegExp = new RegExp('^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\\-_]+$')
function isActorPreferredUsernameValid (preferredUsername: string) {
return exists(preferredUsername) && validator.matches(preferredUsername, actorNameRegExp)
}
}
function normalizeActor (actor: any) {
- if (!actor) return
+ if (!actor || !actor.url) return
if (typeof actor.url !== 'string') {
actor.url = actor.url.href || actor.url.url
return
}
+function isValidActorHandle (handle: string) {
+ if (!exists(handle)) return false
+
+ const parts = handle.split('@')
+ if (parts.length !== 2) return false
+
+ return isHostValid(parts[1])
+}
+
+function areValidActorHandles (handles: string[]) {
+ return isArray(handles) && handles.every(h => isValidActorHandle(h))
+}
+
// ---------------------------------------------------------------------------
export {
normalizeActor,
+ areValidActorHandles,
isActorEndpointsObjectValid,
isActorPublicKeyObjectValid,
isActorTypeValid,
isActorAcceptActivityValid,
isActorRejectActivityValid,
isActorDeleteActivityValid,
- isActorUpdateActivityValid
+ isActorUpdateActivityValid,
+ isValidActorHandle
}