From 47581df0737ebcc058a5863143c752f9112a4424 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 23 Oct 2019 11:33:53 +0200 Subject: Fix federation with some actors That don't have a shared inbox, or a URL --- server/initializers/constants.ts | 6 +++-- .../migrations/0445-shared-inbox-optional.ts | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 server/initializers/migrations/0445-shared-inbox-optional.ts (limited to 'server/initializers') diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 10f95f5ab..190fd427a 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -14,7 +14,7 @@ import { CONFIG, registerConfigChangedHandler } from './config' // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 440 +const LAST_MIGRATION_VERSION = 445 // --------------------------------------------------------------------------- @@ -459,7 +459,9 @@ const ACTIVITY_PUB = { const ACTIVITY_PUB_ACTOR_TYPES: { [ id: string ]: ActivityPubActorType } = { GROUP: 'Group', PERSON: 'Person', - APPLICATION: 'Application' + APPLICATION: 'Application', + ORGANIZATION: 'Organization', + SERVICE: 'Service' } const HTTP_SIGNATURE = { diff --git a/server/initializers/migrations/0445-shared-inbox-optional.ts b/server/initializers/migrations/0445-shared-inbox-optional.ts new file mode 100644 index 000000000..dad2d6569 --- /dev/null +++ b/server/initializers/migrations/0445-shared-inbox-optional.ts @@ -0,0 +1,26 @@ +import * as Sequelize from 'sequelize' + +async function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize, + db: any +}): Promise { + { + const data = { + type: Sequelize.STRING, + allowNull: true + } + + await utils.queryInterface.changeColumn('actor', 'sharedInboxUrl', data) + } +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} -- cgit v1.2.3