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 { AVATAR_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'
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
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
}
}
async function fetchAvatarIfExists (actorJSON: ActivityPubActor) {
if (
- actorJSON.icon && actorJSON.icon.type === 'Image' && AVATAR_MIMETYPE_EXT[actorJSON.icon.mediaType] !== undefined &&
+ actorJSON.icon && actorJSON.icon.type === 'Image' && IMAGE_MIMETYPE_EXT[actorJSON.icon.mediaType] !== undefined &&
isActivityPubUrlValid(actorJSON.icon.url)
) {
- const extension = AVATAR_MIMETYPE_EXT[actorJSON.icon.mediaType]
+ const extension = IMAGE_MIMETYPE_EXT[actorJSON.icon.mediaType]
const avatarName = uuidv4() + extension
const destPath = join(CONFIG.STORAGE.AVATARS_DIR, avatarName)
})
if (actorCreated.type === 'Person' || actorCreated.type === 'Application') {
- const account = await saveAccount(actorCreated, result, t)
- actorCreated.Account = account
+ actorCreated.Account = await saveAccount(actorCreated, result, t)
actorCreated.Account.Actor = actorCreated
} else if (actorCreated.type === 'Group') { // Video channel
- const videoChannel = await saveVideoChannel(actorCreated, result, ownerActor, t)
- actorCreated.VideoChannel = videoChannel
+ actorCreated.VideoChannel = await saveVideoChannel(actorCreated, result, ownerActor, t)
actorCreated.VideoChannel.Actor = actorCreated
}
actor: ActorModel
name: string
summary: string
+ support?: string
avatarName?: string
attributedTo: ActivityPubAttributedTo[]
}
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 })
name,
avatarName,
summary: actorJSON.summary,
+ support: actorJSON.support,
attributedTo: actorJSON.attributedTo
}
}
const [ accountCreated ] = await AccountModel.findOrCreate({
defaults: {
name: result.name,
+ description: result.summary,
actorId: actor.id
},
where: {
defaults: {
name: result.name,
description: result.summary,
+ support: result.support,
actorId: actor.id,
accountId: ownerActor.Account.id
},
return videoChannelCreated
}
-async function refreshActorIfNeeded (actor: ActorModel) {
+async function refreshActorIfNeeded (actor: ActorModel): Promise<ActorModel> {
if (!actor.isOutdated()) return actor
try {
await actor.save({ transaction: t })
actor.Account.set('name', result.name)
+ actor.Account.set('description', result.summary)
await actor.Account.save({ transaction: t })
} else if (actor.VideoChannel) {
await actor.save({ transaction: t })
actor.VideoChannel.set('name', result.name)
+ actor.VideoChannel.set('description', result.summary)
+ actor.VideoChannel.set('support', result.support)
await actor.VideoChannel.save({ transaction: t })
}
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
-}