import { ActorModel } from '../models/activitypub/actor'
import { MAccountDefault, MActorDefault, MChannelActor } from '../types/models'
import { MUser, MUserDefault, MUserId } from '../types/models/user'
-import { buildActorInstance, setAsyncActorKeys } from './activitypub/actor'
-import { getAccountActivityPubUrl } from './activitypub/url'
+import { buildActorInstance, generateAndSaveActorKeys } from './activitypub/actor'
+import { getLocalAccountActivityPubUrl } from './activitypub/url'
import { Emailer } from './emailer'
import { LiveManager } from './live-manager'
import { Redis } from './redis'
})
const [ accountActorWithKeys, channelActorWithKeys ] = await Promise.all([
- setAsyncActorKeys(account.Actor),
- setAsyncActorKeys(videoChannel.Actor)
+ generateAndSaveActorKeys(account.Actor),
+ generateAndSaveActorKeys(videoChannel.Actor)
])
account.Actor = accountActorWithKeys
type?: ActivityPubActorType
}) {
const { name, displayName, userId, applicationId, t, type = 'Person' } = parameters
- const url = getAccountActivityPubUrl(name)
+ const url = getLocalAccountActivityPubUrl(name)
const actorInstance = buildActorInstance(type, url, name)
const actorInstanceCreated: MActorDefault = await actorInstance.save({ transaction: t })
type: 'Application'
})
- accountCreated.Actor = await setAsyncActorKeys(accountCreated.Actor)
+ accountCreated.Actor = await generateAndSaveActorKeys(accountCreated.Actor)
return accountCreated
}
newInstanceFollower: UserNotificationSettingValue.WEB,
abuseNewMessage: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
- autoInstanceFollowing: UserNotificationSettingValue.WEB
+ autoInstanceFollowing: UserNotificationSettingValue.WEB,
+ newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
+ newPluginVersion: UserNotificationSettingValue.WEB
}
return UserNotificationSettingModel.create(values, { transaction: t })