From 3fd3ab2d34d512b160a5e6084d7609be7b4f4452 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 12 Dec 2017 17:53:50 +0100 Subject: Move models to typescript-sequelize --- server/lib/activitypub/process/process.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server/lib/activitypub/process/process.ts') diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts index 54981c289..bfbf8053c 100644 --- a/server/lib/activitypub/process/process.ts +++ b/server/lib/activitypub/process/process.ts @@ -1,6 +1,6 @@ -import { Activity, ActivityType } from '../../../../shared/models/activitypub/activity' -import { logger } from '../../../helpers/logger' -import { AccountInstance } from '../../../models/account/account-interface' +import { Activity, ActivityType } from '../../../../shared/models/activitypub' +import { logger } from '../../../helpers' +import { AccountModel } from '../../../models/account/account' import { processAcceptActivity } from './process-accept' import { processAddActivity } from './process-add' import { processAnnounceActivity } from './process-announce' @@ -11,7 +11,7 @@ import { processLikeActivity } from './process-like' import { processUndoActivity } from './process-undo' import { processUpdateActivity } from './process-update' -const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountInstance) => Promise } = { +const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountModel) => Promise } = { Create: processCreateActivity, Add: processAddActivity, Update: processUpdateActivity, @@ -23,7 +23,7 @@ const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccoun Like: processLikeActivity } -async function processActivities (activities: Activity[], signatureAccount?: AccountInstance, inboxAccount?: AccountInstance) { +async function processActivities (activities: Activity[], signatureAccount?: AccountModel, inboxAccount?: AccountModel) { for (const activity of activities) { // When we fetch remote data, we don't have signature if (signatureAccount && activity.actor !== signatureAccount.url) { -- cgit v1.2.3