Merge pull request #1366 from akihikodaki/misc

Introduce acct directory

8 files changed, 10 insertions, 10 deletions

diff --git a/src/server/activitypub/inbox.ts b/src/server/activitypub/inbox.ts
index 865797faee..6df636f898 100644
--- a/src/server/activitypub/inbox.ts
+++ b/src/server/activitypub/inbox.ts
@@ -3,7 +3,7 @@ import * as express from 'express';
 import { parseRequest, verifySignature } from 'http-signature';
 import User, { IRemoteUser } from '../../models/user';
 import queue from '../../queue';
-import parseAcct from '../../user/parse-acct';
+import parseAcct from '../../acct/parse';
 
 const app = express();
 app.disable('x-powered-by');
diff --git a/src/server/activitypub/post.ts b/src/server/activitypub/post.ts
index 2962a9b965..91d91aeb95 100644
--- a/src/server/activitypub/post.ts
+++ b/src/server/activitypub/post.ts
@@ -1,7 +1,7 @@
 import * as express from 'express';
 import context from '../../remote/activitypub/renderer/context';
 import render from '../../remote/activitypub/renderer/note';
-import parseAcct from '../../user/parse-acct';
+import parseAcct from '../../acct/parse';
 import Post from '../../models/post';
 import User from '../../models/user';
 
diff --git a/src/server/activitypub/with-user.ts b/src/server/activitypub/with-user.ts
index b4090786bd..bdbbefb429 100644
--- a/src/server/activitypub/with-user.ts
+++ b/src/server/activitypub/with-user.ts
@@ -1,4 +1,4 @@
-import parseAcct from '../../user/parse-acct';
+import parseAcct from '../../acct/parse';
 import User from '../../models/user';
 
 export default (redirect, respond) => async (req, res, next) => {
diff --git a/src/server/api/bot/core.ts b/src/server/api/bot/core.ts
index 7f9409660a..7e80f31e5e 100644
--- a/src/server/api/bot/core.ts
+++ b/src/server/api/bot/core.ts
@@ -5,7 +5,7 @@ import User, { IUser, init as initUser, ILocalUser } from '../../../models/user'
 
 import getPostSummary from '../../../renderers/get-post-summary';
 import getUserSummary from '../../../renderers/get-user-summary';
-import parseAcct from '../../../user/parse-acct';
+import parseAcct from '../../../acct/parse';
 import getNotificationSummary from '../../../renderers/get-notification-summary';
 
 const hmm = [
diff --git a/src/server/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts
index 17841a9f09..7847cbdeaa 100644
--- a/src/server/api/bot/interfaces/line.ts
+++ b/src/server/api/bot/interfaces/line.ts
@@ -7,8 +7,8 @@ import config from '../../../../config';
 import BotCore from '../core';
 import _redis from '../../../../db/redis';
 import prominence = require('prominence');
-import getAcct from '../../../../user/get-acct';
-import parseAcct from '../../../../user/parse-acct';
+import getAcct from '../../../../acct/render';
+import parseAcct from '../../../../acct/parse';
 import getPostSummary from '../../../../renderers/get-post-summary';
 
 const redis = prominence(_redis);
diff --git a/src/server/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts
index 34a3aa1901..7c44e6f084 100644
--- a/src/server/api/endpoints/posts/create.ts
+++ b/src/server/api/endpoints/posts/create.ts
@@ -18,8 +18,8 @@ import watch from '../../common/watch-post';
 import stream, { publishChannelStream } from '../../../../publishers/stream';
 import notify from '../../../../publishers/notify';
 import pushSw from '../../../../publishers/push-sw';
-import getAcct from '../../../../user/get-acct';
-import parseAcct from '../../../../user/parse-acct';
+import getAcct from '../../../../acct/render';
+import parseAcct from '../../../../acct/parse';
 import config from '../../../../config';
 
 /**
diff --git a/src/server/api/limitter.ts b/src/server/api/limitter.ts
index 81016457dc..638fac78be 100644
--- a/src/server/api/limitter.ts
+++ b/src/server/api/limitter.ts
@@ -3,7 +3,7 @@ import * as debug from 'debug';
 import limiterDB from '../../db/redis';
 import { Endpoint } from './endpoints';
 import { IAuthContext } from './authenticate';
-import getAcct from '../../user/get-acct';
+import getAcct from '../../acct/render';
 
 const log = debug('misskey:limitter');
 
diff --git a/src/server/webfinger.ts b/src/server/webfinger.ts
index 3b0f416d6f..20057da31f 100644
--- a/src/server/webfinger.ts
+++ b/src/server/webfinger.ts
@@ -1,5 +1,5 @@
 import config from '../config';
-import parseAcct from '../user/parse-acct';
+import parseAcct from '../acct/parse';
 import User from '../models/user';
 const express = require('express');