import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/activitypub'
import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects'
import { getActorUrl } from '../../helpers/activitypub'
-import { isActorObjectValid } from '../../helpers/custom-validators/activitypub/actor'
+import { isActorObjectValid, normalizeActor } from '../../helpers/custom-validators/activitypub/actor'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
import { retryTransactionWrapper, updateInstanceWithAnother } from '../../helpers/database-utils'
import { logger } from '../../helpers/logger'
import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto'
import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
import { getUrlFromWebfinger } from '../../helpers/webfinger'
-import { IMAGE_MIMETYPE_EXT, CONFIG, sequelizeTypescript, CONSTRAINTS_FIELDS } from '../../initializers'
+import { CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers'
import { AccountModel } from '../../models/account/account'
import { ActorModel } from '../../models/activitypub/actor'
import { AvatarModel } from '../../models/avatar/avatar'
import { ServerModel } from '../../models/server/server'
import { VideoChannelModel } from '../../models/video/video-channel'
-import { truncate } from 'lodash'
+import { JobQueue } from '../job-queue'
+import { getServerActor } from '../../helpers/utils'
// Set account keys, this could be long so process after the account creation and do not block the client
function setAsyncActorKeys (actor: ActorModel) {
}
}
- const options = {
- arguments: [ result, ownerActor ],
- errorMessage: 'Cannot save actor and server with many retries.'
- }
- actor = await retryTransactionWrapper(saveActorAndServerAndModelIfNotExist, options)
+ actor = await retryTransactionWrapper(saveActorAndServerAndModelIfNotExist, result, ownerActor)
}
- const options = {
- arguments: [ actor ],
- errorMessage: 'Cannot refresh actor if needed with many retries.'
- }
- return retryTransactionWrapper(refreshActorIfNeeded, options)
+ return retryTransactionWrapper(refreshActorIfNeeded, actor)
}
function buildActorInstance (type: ActivityPubActorType, url: string, preferredUsername: string, uuid?: string) {
return undefined
}
-function normalizeActor (actor: any) {
- if (!actor) return
-
- if (!actor.url || typeof actor.url !== 'string') {
- actor.url = actor.url.href || actor.url.url
+async function addFetchOutboxJob (actor: ActorModel) {
+ // Don't fetch ourselves
+ const serverActor = await getServerActor()
+ if (serverActor.id === actor.id) {
+ logger.error('Cannot fetch our own outbox!')
+ return undefined
}
- if (actor.summary && typeof actor.summary === 'string') {
- actor.summary = truncate(actor.summary, { length: CONSTRAINTS_FIELDS.USERS.DESCRIPTION.max })
-
- if (actor.summary.length < CONSTRAINTS_FIELDS.USERS.DESCRIPTION.min) {
- actor.summary = null
- }
+ const payload = {
+ uris: [ actor.outboxUrl ]
}
- return
+ return JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload })
}
export {
fetchAvatarIfExists,
updateActorInstance,
updateActorAvatarInstance,
- normalizeActor
+ addFetchOutboxJob
}
// ---------------------------------------------------------------------------