import * as uuidv4 from 'uuid/v4'
import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/activitypub'
import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects'
-import { isActorObjectValid } from '../../helpers/custom-validators/activitypub/actor'
+import { getActorUrl } from '../../helpers/activitypub'
+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 } 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 { 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) {
return actor.save()
})
.catch(err => {
- logger.error('Cannot set public/private keys of actor %d.', actor.uuid, err)
+ logger.error('Cannot set public/private keys of actor %d.', actor.uuid, { err })
return actor
})
}
-async function getOrCreateActorAndServerAndModel (actorUrl: string, recurseIfNeeded = true) {
+async function getOrCreateActorAndServerAndModel (activityActor: string | ActivityPubActor, recurseIfNeeded = true) {
+ const actorUrl = getActorUrl(activityActor)
+
let actor = await ActorModel.loadByUrl(actorUrl)
// We don't have this actor in our database, fetch it on remote
}
}
- 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) {
try {
await actorInstance.Avatar.destroy({ transaction: t })
} catch (err) {
- logger.error('Cannot remove old avatar of actor %s.', actorInstance.url, err)
+ logger.error('Cannot remove old avatar of actor %s.', actorInstance.url, { err })
}
}
const { body } = await doRequest(options)
return body.totalItems ? body.totalItems : 0
} catch (err) {
- logger.warn('Cannot fetch remote actor count %s.', url, err)
+ logger.warn('Cannot fetch remote actor count %s.', url, { err })
return 0
}
}
return undefined
}
+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
+ }
+
+ const payload = {
+ uris: [ actor.outboxUrl ]
+ }
+
+ return JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload })
+}
+
export {
getOrCreateActorAndServerAndModel,
buildActorInstance,
fetchActorTotalItems,
fetchAvatarIfExists,
updateActorInstance,
- updateActorAvatarInstance
+ updateActorAvatarInstance,
+ addFetchOutboxJob
}
// ---------------------------------------------------------------------------
logger.info('Fetching remote actor %s.', actorUrl)
const requestResult = await doRequest(options)
- const actorJSON: ActivityPubActor = normalizeActor(requestResult.body)
+ normalizeActor(requestResult.body)
+
+ const actorJSON: ActivityPubActor = requestResult.body
if (isActorObjectValid(actorJSON) === false) {
logger.debug('Remote actor JSON is not valid.', { actorJSON: actorJSON })
return videoChannelCreated
}
-async function refreshActorIfNeeded (actor: ActorModel) {
+async function refreshActorIfNeeded (actor: ActorModel): Promise<ActorModel> {
if (!actor.isOutdated()) return actor
try {
return actor
})
} catch (err) {
- logger.warn('Cannot refresh actor.', err)
+ logger.warn('Cannot refresh actor.', { err })
return actor
}
}
-
-function normalizeActor (actor: any) {
- if (actor && actor.url && typeof actor.url === 'string') return actor
-
- actor.url = actor.url.href || actor.url.url
- return actor
-}