projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.1.0' into develop
[oweals/peertube.git]
/
server
/
initializers
/
migrations
/
0100-activitypub.ts
diff --git
a/server/initializers/migrations/0100-activitypub.ts
b/server/initializers/migrations/0100-activitypub.ts
index 2880a97d9da18656a6273e8671a2796d61ffa2ee..05fd37406874a4c2eb0d85969631ee53d2810e95 100644
(file)
--- a/
server/initializers/migrations/0100-activitypub.ts
+++ b/
server/initializers/migrations/0100-activitypub.ts
@@
-7,9
+7,9
@@
import { ApplicationModel } from '../../models/application/application'
import { SERVER_ACTOR_NAME } from '../constants'
async function up (utils: {
import { SERVER_ACTOR_NAME } from '../constants'
async function up (utils: {
- transaction: Sequelize.Transaction
,
- queryInterface: Sequelize.QueryInterface
,
- sequelize: Sequelize.Sequelize
,
+ transaction: Sequelize.Transaction
+ queryInterface: Sequelize.QueryInterface
+ sequelize: Sequelize.Sequelize
db: any
}): Promise<void> {
const q = utils.queryInterface
db: any
}): Promise<void> {
const q = utils.queryInterface
@@
-65,7
+65,12
@@
async function up (utils: {
// Create application account
{
const applicationInstance = await ApplicationModel.findOne()
// Create application account
{
const applicationInstance = await ApplicationModel.findOne()
- const accountCreated = await createLocalAccountWithoutKeys(SERVER_ACTOR_NAME, null, applicationInstance.id, undefined)
+ const accountCreated = await createLocalAccountWithoutKeys({
+ name: SERVER_ACTOR_NAME,
+ userId: null,
+ applicationId: applicationInstance.id,
+ t: undefined
+ })
const { publicKey, privateKey } = await createPrivateAndPublicKeys()
accountCreated.Actor.publicKey = publicKey
const { publicKey, privateKey } = await createPrivateAndPublicKeys()
accountCreated.Actor.publicKey = publicKey
@@
-83,7
+88,7
@@
async function up (utils: {
// Recreate accounts for each user
const users = await db.User.findAll()
for (const user of users) {
// Recreate accounts for each user
const users = await db.User.findAll()
for (const user of users) {
- const account = await createLocalAccountWithoutKeys(
user.username, user.id, null, undefined
)
+ const account = await createLocalAccountWithoutKeys(
{ name: user.username, userId: user.id, applicationId: null, t: undefined }
)
const { publicKey, privateKey } = await createPrivateAndPublicKeys()
account.Actor.publicKey = publicKey
const { publicKey, privateKey } = await createPrivateAndPublicKeys()
account.Actor.publicKey = publicKey