summaryrefslogtreecommitdiff
path: root/src/queue
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-04-09 05:04:06 +0900
committerGitHub <noreply@github.com>2018-04-09 05:04:06 +0900
commit49ad86498ecf0da61a3e36998150250c526fdd0d (patch)
tree126de4e02c83b8cb126e82563959190f58f1fdfa /src/queue
parentMerge pull request #1422 from unarist/fix/username-regex (diff)
parentwip (diff)
downloadmisskey-49ad86498ecf0da61a3e36998150250c526fdd0d.tar.gz
misskey-49ad86498ecf0da61a3e36998150250c526fdd0d.tar.bz2
misskey-49ad86498ecf0da61a3e36998150250c526fdd0d.zip
Merge pull request #1423 from syuilo/hoge
Refactor
Diffstat (limited to 'src/queue')
-rw-r--r--src/queue/processors/http/process-inbox.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 6608907a7a..ce5b7d5a89 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -4,8 +4,8 @@ import * as debug from 'debug';
import { verifySignature } from 'http-signature';
import parseAcct from '../../../acct/parse';
import User, { IRemoteUser } from '../../../models/user';
-import act from '../../../remote/activitypub/act';
-import resolvePerson from '../../../remote/activitypub/resolve-person';
+import perform from '../../../remote/activitypub/perform';
+import { resolvePerson } from '../../../remote/activitypub/objects/person';
const log = debug('misskey:queue:inbox');
@@ -58,7 +58,7 @@ export default async (job: kue.Job, done): Promise<void> => {
// アクティビティを処理
try {
- await act(user, activity);
+ await perform(user, activity);
done();
} catch (e) {
done(e);