From aa94035987926f47b037c32b3c89ac470a40dc40 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Mon, 2 Apr 2018 13:44:32 +0900
Subject: [PATCH] Introduce acct directory
---
src/{user/parse-acct.ts => acct/parse.ts} | 0
src/{user/get-acct.ts => acct/render.ts} | 0
src/client/app/ch/tags/channel.tag | 2 +-
src/client/app/common/views/components/autocomplete.vue | 2 +-
.../app/common/views/components/messaging-room.message.vue | 2 +-
src/client/app/common/views/components/messaging.vue | 2 +-
src/client/app/common/views/components/post-html.ts | 2 +-
src/client/app/common/views/components/welcome-timeline.vue | 2 +-
src/client/app/desktop/views/components/friends-maker.vue | 2 +-
.../app/desktop/views/components/messaging-room-window.vue | 2 +-
src/client/app/desktop/views/components/notifications.vue | 2 +-
src/client/app/desktop/views/components/post-detail.sub.vue | 2 +-
src/client/app/desktop/views/components/post-detail.vue | 2 +-
src/client/app/desktop/views/components/post-preview.vue | 2 +-
src/client/app/desktop/views/components/posts.post.sub.vue | 2 +-
src/client/app/desktop/views/components/posts.post.vue | 2 +-
src/client/app/desktop/views/components/settings.mute.vue | 2 +-
src/client/app/desktop/views/components/user-preview.vue | 4 ++--
src/client/app/desktop/views/components/users-list.item.vue | 2 +-
src/client/app/desktop/views/pages/messaging-room.vue | 2 +-
.../app/desktop/views/pages/user/user.followers-you-know.vue | 2 +-
src/client/app/desktop/views/pages/user/user.friends.vue | 2 +-
src/client/app/desktop/views/pages/user/user.header.vue | 2 +-
src/client/app/desktop/views/pages/user/user.vue | 2 +-
src/client/app/desktop/views/pages/welcome.vue | 2 +-
src/client/app/desktop/views/widgets/channel.channel.post.vue | 2 +-
src/client/app/desktop/views/widgets/polls.vue | 2 +-
src/client/app/desktop/views/widgets/trends.vue | 2 +-
src/client/app/desktop/views/widgets/users.vue | 2 +-
src/client/app/mobile/views/components/notification.vue | 2 +-
src/client/app/mobile/views/components/post-card.vue | 2 +-
src/client/app/mobile/views/components/post-detail.sub.vue | 2 +-
src/client/app/mobile/views/components/post-detail.vue | 2 +-
src/client/app/mobile/views/components/post-preview.vue | 2 +-
src/client/app/mobile/views/components/post.sub.vue | 2 +-
src/client/app/mobile/views/components/post.vue | 2 +-
src/client/app/mobile/views/components/user-card.vue | 2 +-
src/client/app/mobile/views/components/user-preview.vue | 2 +-
src/client/app/mobile/views/pages/followers.vue | 2 +-
src/client/app/mobile/views/pages/following.vue | 2 +-
src/client/app/mobile/views/pages/messaging-room.vue | 2 +-
src/client/app/mobile/views/pages/messaging.vue | 2 +-
src/client/app/mobile/views/pages/user.vue | 4 ++--
.../app/mobile/views/pages/user/home.followers-you-know.vue | 2 +-
src/client/app/mobile/views/pages/user/home.photos.vue | 2 +-
src/drive/add-file.ts | 2 +-
src/renderers/get-user-summary.ts | 2 +-
src/server/activitypub/inbox.ts | 2 +-
src/server/activitypub/post.ts | 2 +-
src/server/activitypub/with-user.ts | 2 +-
src/server/api/bot/core.ts | 2 +-
src/server/api/bot/interfaces/line.ts | 4 ++--
src/server/api/endpoints/posts/create.ts | 4 ++--
src/server/api/limitter.ts | 2 +-
src/server/webfinger.ts | 2 +-
src/text/parse/elements/mention.ts | 2 +-
56 files changed, 58 insertions(+), 58 deletions(-)
rename src/{user/parse-acct.ts => acct/parse.ts} (100%)
rename src/{user/get-acct.ts => acct/render.ts} (100%)
diff --git a/src/user/parse-acct.ts b/src/acct/parse.ts
similarity index 100%
rename from src/user/parse-acct.ts
rename to src/acct/parse.ts
diff --git a/src/user/get-acct.ts b/src/acct/render.ts
similarity index 100%
rename from src/user/get-acct.ts
rename to src/acct/render.ts
diff --git a/src/client/app/ch/tags/channel.tag b/src/client/app/ch/tags/channel.tag
index 0c139ba26..1ebc3cceb 100644
--- a/src/client/app/ch/tags/channel.tag
+++ b/src/client/app/ch/tags/channel.tag
@@ -229,7 +229,7 @@
</style>
<script lang="typescript">
- import getAcct from '../../../../user/get-acct';
+ import getAcct from '../../../../acct/render';
this.post = this.opts.post;
this.form = this.opts.form;
diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index 7bcfc07e9..38eaf8650 100644
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -21,7 +21,7 @@
import Vue from 'vue';
import * as emojilib from 'emojilib';
import contains from '../../../common/scripts/contains';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
const lib = Object.entries(emojilib.lib).filter((x: any) => {
return x[1].category != 'flags';
diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue
index 3de8321f8..1518602c6 100644
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -34,7 +34,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse';
export default Vue.extend({
diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue
index bde2b2b90..4ab3e46e8 100644
--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@@ -51,7 +51,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: {
diff --git a/src/client/app/common/views/components/post-html.ts b/src/client/app/common/views/components/post-html.ts
index 4018a966e..8d8531652 100644
--- a/src/client/app/common/views/components/post-html.ts
+++ b/src/client/app/common/views/components/post-html.ts
@@ -1,7 +1,7 @@
import Vue from 'vue';
import * as emojilib from 'emojilib';
import parse from '../../../../../text/parse';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
import { url } from '../../../config';
import MkUrl from './url.vue';
diff --git a/src/client/app/common/views/components/welcome-timeline.vue b/src/client/app/common/views/components/welcome-timeline.vue
index 94b7f5889..ef0c7beaa 100644
--- a/src/client/app/common/views/components/welcome-timeline.vue
+++ b/src/client/app/common/views/components/welcome-timeline.vue
@@ -24,7 +24,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
data() {
diff --git a/src/client/app/desktop/views/components/friends-maker.vue b/src/client/app/desktop/views/components/friends-maker.vue
index bfa7503d2..351e9e1c5 100644
--- a/src/client/app/desktop/views/components/friends-maker.vue
+++ b/src/client/app/desktop/views/components/friends-maker.vue
@@ -22,7 +22,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
data() {
diff --git a/src/client/app/desktop/views/components/messaging-room-window.vue b/src/client/app/desktop/views/components/messaging-room-window.vue
index 88eb28578..f29f9b74e 100644
--- a/src/client/app/desktop/views/components/messaging-room-window.vue
+++ b/src/client/app/desktop/views/components/messaging-room-window.vue
@@ -8,7 +8,7 @@
<script lang="ts">
import Vue from 'vue';
import { url } from '../../../config';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue
index 9bfe1560b..c5ab284df 100644
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@@ -102,7 +102,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
import getPostSummary from '../../../../../renderers/get-post-summary';
export default Vue.extend({
diff --git a/src/client/app/desktop/views/components/post-detail.sub.vue b/src/client/app/desktop/views/components/post-detail.sub.vue
index 2719fee9d..59bc9ce0c 100644
--- a/src/client/app/desktop/views/components/post-detail.sub.vue
+++ b/src/client/app/desktop/views/components/post-detail.sub.vue
@@ -28,7 +28,7 @@
<script lang="ts">
import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/desktop/views/components/post-detail.vue b/src/client/app/desktop/views/components/post-detail.vue
index 5911a267f..8000ce2e6 100644
--- a/src/client/app/desktop/views/components/post-detail.vue
+++ b/src/client/app/desktop/views/components/post-detail.vue
@@ -78,7 +78,7 @@
<script lang="ts">
import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse';
import MkPostFormWindow from './post-form-window.vue';
diff --git a/src/client/app/desktop/views/components/post-preview.vue b/src/client/app/desktop/views/components/post-preview.vue
index e27f0b4cc..7129f67b3 100644
--- a/src/client/app/desktop/views/components/post-preview.vue
+++ b/src/client/app/desktop/views/components/post-preview.vue
@@ -21,7 +21,7 @@
<script lang="ts">
import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/desktop/views/components/posts.post.sub.vue b/src/client/app/desktop/views/components/posts.post.sub.vue
index 16f5c4bee..dffecb89c 100644
--- a/src/client/app/desktop/views/components/posts.post.sub.vue
+++ b/src/client/app/desktop/views/components/posts.post.sub.vue
@@ -21,7 +21,7 @@
<script lang="ts">
import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/desktop/views/components/posts.post.vue b/src/client/app/desktop/views/components/posts.post.vue
index b32ebe944..9a13dd687 100644
--- a/src/client/app/desktop/views/components/posts.post.vue
+++ b/src/client/app/desktop/views/components/posts.post.vue
@@ -85,7 +85,7 @@
<script lang="ts">
import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse';
import MkPostFormWindow from './post-form-window.vue';
diff --git a/src/client/app/desktop/views/components/settings.mute.vue b/src/client/app/desktop/views/components/settings.mute.vue
index 5c8c86222..c87f973fa 100644
--- a/src/client/app/desktop/views/components/settings.mute.vue
+++ b/src/client/app/desktop/views/components/settings.mute.vue
@@ -13,7 +13,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
data() {
diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue
index cad7d455f..2f2e78ec6 100644
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -29,8 +29,8 @@
<script lang="ts">
import Vue from 'vue';
import * as anime from 'animejs';
-import getAcct from '../../../../../user/get-acct';
-import parseAcct from '../../../../../user/parse-acct';
+import getAcct from '../../../../../acct/render';
+import parseAcct from '../../../../../acct/parse';
export default Vue.extend({
props: {
diff --git a/src/client/app/desktop/views/components/users-list.item.vue b/src/client/app/desktop/views/components/users-list.item.vue
index a25d68c44..2d7d4dc72 100644
--- a/src/client/app/desktop/views/components/users-list.item.vue
+++ b/src/client/app/desktop/views/components/users-list.item.vue
@@ -19,7 +19,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/desktop/views/pages/messaging-room.vue b/src/client/app/desktop/views/pages/messaging-room.vue
index b3d0ff149..1e61f3ce1 100644
--- a/src/client/app/desktop/views/pages/messaging-room.vue
+++ b/src/client/app/desktop/views/pages/messaging-room.vue
@@ -7,7 +7,7 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
-import parseAcct from '../../../../../user/parse-acct';
+import parseAcct from '../../../../../acct/parse';
export default Vue.extend({
data() {
diff --git a/src/client/app/desktop/views/pages/user/user.followers-you-know.vue b/src/client/app/desktop/views/pages/user/user.followers-you-know.vue
index a8bc67d3a..7497acd0e 100644
--- a/src/client/app/desktop/views/pages/user/user.followers-you-know.vue
+++ b/src/client/app/desktop/views/pages/user/user.followers-you-know.vue
@@ -13,7 +13,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../../user/get-acct';
+import getAcct from '../../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/desktop/views/pages/user/user.friends.vue b/src/client/app/desktop/views/pages/user/user.friends.vue
index 6710e3793..a726e2565 100644
--- a/src/client/app/desktop/views/pages/user/user.friends.vue
+++ b/src/client/app/desktop/views/pages/user/user.friends.vue
@@ -20,7 +20,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../../user/get-acct';
+import getAcct from '../../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/pages/user/user.header.vue
index 7b051224d..d30f423d5 100644
--- a/src/client/app/desktop/views/pages/user/user.header.vue
+++ b/src/client/app/desktop/views/pages/user/user.header.vue
@@ -22,7 +22,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../../user/get-acct';
+import getAcct from '../../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue
index 54d675bbd..02ddc2421 100644
--- a/src/client/app/desktop/views/pages/user/user.vue
+++ b/src/client/app/desktop/views/pages/user/user.vue
@@ -9,7 +9,7 @@
<script lang="ts">
import Vue from 'vue';
-import parseAcct from '../../../../../../user/parse-acct';
+import parseAcct from '../../../../../../acct/parse';
import Progress from '../../../../common/scripts/loading';
import XHeader from './user.header.vue';
import XHome from './user.home.vue';
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 1e1c49019..41b015b8a 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -43,7 +43,7 @@
<script lang="ts">
import Vue from 'vue';
import { docsUrl, copyright, lang } from '../../../config';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
const shares = [
'Everything!',
diff --git a/src/client/app/desktop/views/widgets/channel.channel.post.vue b/src/client/app/desktop/views/widgets/channel.channel.post.vue
index 587371a76..e10e9c4f7 100644
--- a/src/client/app/desktop/views/widgets/channel.channel.post.vue
+++ b/src/client/app/desktop/views/widgets/channel.channel.post.vue
@@ -19,7 +19,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/desktop/views/widgets/polls.vue b/src/client/app/desktop/views/widgets/polls.vue
index ad7101e0d..c8ba17bd4 100644
--- a/src/client/app/desktop/views/widgets/polls.vue
+++ b/src/client/app/desktop/views/widgets/polls.vue
@@ -16,7 +16,7 @@
<script lang="ts">
import define from '../../../common/define-widget';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default define({
name: 'polls',
diff --git a/src/client/app/desktop/views/widgets/trends.vue b/src/client/app/desktop/views/widgets/trends.vue
index be62faa42..27c1860b3 100644
--- a/src/client/app/desktop/views/widgets/trends.vue
+++ b/src/client/app/desktop/views/widgets/trends.vue
@@ -15,7 +15,7 @@
<script lang="ts">
import define from '../../../common/define-widget';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default define({
name: 'trends',
diff --git a/src/client/app/desktop/views/widgets/users.vue b/src/client/app/desktop/views/widgets/users.vue
index c4643f485..6f6a10157 100644
--- a/src/client/app/desktop/views/widgets/users.vue
+++ b/src/client/app/desktop/views/widgets/users.vue
@@ -23,7 +23,7 @@
<script lang="ts">
import define from '../../../common/define-widget';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
const limit = 3;
diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue
index d3e313756..189d7195f 100644
--- a/src/client/app/mobile/views/components/notification.vue
+++ b/src/client/app/mobile/views/components/notification.vue
@@ -79,7 +79,7 @@
<script lang="ts">
import Vue from 'vue';
import getPostSummary from '../../../../../renderers/get-post-summary';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['notification'],
diff --git a/src/client/app/mobile/views/components/post-card.vue b/src/client/app/mobile/views/components/post-card.vue
index de42a01f7..38d4522d2 100644
--- a/src/client/app/mobile/views/components/post-card.vue
+++ b/src/client/app/mobile/views/components/post-card.vue
@@ -15,7 +15,7 @@
<script lang="ts">
import Vue from 'vue';
import summary from '../../../../../renderers/get-post-summary';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/mobile/views/components/post-detail.sub.vue b/src/client/app/mobile/views/components/post-detail.sub.vue
index c8e06e26f..7ff9f1aab 100644
--- a/src/client/app/mobile/views/components/post-detail.sub.vue
+++ b/src/client/app/mobile/views/components/post-detail.sub.vue
@@ -20,7 +20,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/mobile/views/components/post-detail.vue b/src/client/app/mobile/views/components/post-detail.vue
index 4a293562e..ed394acd3 100644
--- a/src/client/app/mobile/views/components/post-detail.vue
+++ b/src/client/app/mobile/views/components/post-detail.vue
@@ -80,7 +80,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse';
import MkPostMenu from '../../../common/views/components/post-menu.vue';
diff --git a/src/client/app/mobile/views/components/post-preview.vue b/src/client/app/mobile/views/components/post-preview.vue
index b6916edb4..81b0c22bf 100644
--- a/src/client/app/mobile/views/components/post-preview.vue
+++ b/src/client/app/mobile/views/components/post-preview.vue
@@ -20,7 +20,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/mobile/views/components/post.sub.vue b/src/client/app/mobile/views/components/post.sub.vue
index 7f132b0a4..85ddb9188 100644
--- a/src/client/app/mobile/views/components/post.sub.vue
+++ b/src/client/app/mobile/views/components/post.sub.vue
@@ -20,7 +20,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['post'],
diff --git a/src/client/app/mobile/views/components/post.vue b/src/client/app/mobile/views/components/post.vue
index 7cfb97425..1454bc939 100644
--- a/src/client/app/mobile/views/components/post.vue
+++ b/src/client/app/mobile/views/components/post.vue
@@ -77,7 +77,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse';
import MkPostMenu from '../../../common/views/components/post-menu.vue';
diff --git a/src/client/app/mobile/views/components/user-card.vue b/src/client/app/mobile/views/components/user-card.vue
index 542ad2031..46fa3b473 100644
--- a/src/client/app/mobile/views/components/user-card.vue
+++ b/src/client/app/mobile/views/components/user-card.vue
@@ -13,7 +13,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/mobile/views/components/user-preview.vue b/src/client/app/mobile/views/components/user-preview.vue
index 51c32b9fd..00f87e554 100644
--- a/src/client/app/mobile/views/components/user-preview.vue
+++ b/src/client/app/mobile/views/components/user-preview.vue
@@ -17,7 +17,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/mobile/views/pages/followers.vue b/src/client/app/mobile/views/pages/followers.vue
index 2e984508d..d2e6a9aea 100644
--- a/src/client/app/mobile/views/pages/followers.vue
+++ b/src/client/app/mobile/views/pages/followers.vue
@@ -19,7 +19,7 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
-import parseAcct from '../../../../../user/parse-acct';
+import parseAcct from '../../../../../acct/parse';
export default Vue.extend({
data() {
diff --git a/src/client/app/mobile/views/pages/following.vue b/src/client/app/mobile/views/pages/following.vue
index f5c7223a1..3690536cf 100644
--- a/src/client/app/mobile/views/pages/following.vue
+++ b/src/client/app/mobile/views/pages/following.vue
@@ -19,7 +19,7 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
-import parseAcct from '../../../../../user/parse-acct';
+import parseAcct from '../../../../../acct/parse';
export default Vue.extend({
data() {
diff --git a/src/client/app/mobile/views/pages/messaging-room.vue b/src/client/app/mobile/views/pages/messaging-room.vue
index 14f12a99b..172666eea 100644
--- a/src/client/app/mobile/views/pages/messaging-room.vue
+++ b/src/client/app/mobile/views/pages/messaging-room.vue
@@ -10,7 +10,7 @@
<script lang="ts">
import Vue from 'vue';
-import parseAcct from '../../../../../user/parse-acct';
+import parseAcct from '../../../../../acct/parse';
export default Vue.extend({
data() {
diff --git a/src/client/app/mobile/views/pages/messaging.vue b/src/client/app/mobile/views/pages/messaging.vue
index f3f6f9f9b..fa735a253 100644
--- a/src/client/app/mobile/views/pages/messaging.vue
+++ b/src/client/app/mobile/views/pages/messaging.vue
@@ -7,7 +7,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../user/get-acct';
+import getAcct from '../../../../../acct/render';
export default Vue.extend({
mounted() {
diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue
index 2d8f9f8ec..be696484b 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -60,8 +60,8 @@
<script lang="ts">
import Vue from 'vue';
import * as age from 's-age';
-import getAcct from '../../../../../user/get-acct';
-import getAcct from '../../../../../user/parse-acct';
+import getAcct from '../../../../../acct/render';
+import getAcct from '../../../../../acct/parse';
import Progress from '../../../common/scripts/loading';
import XHome from './user/home.vue';
diff --git a/src/client/app/mobile/views/pages/user/home.followers-you-know.vue b/src/client/app/mobile/views/pages/user/home.followers-you-know.vue
index 04d8538f7..ffdd9f178 100644
--- a/src/client/app/mobile/views/pages/user/home.followers-you-know.vue
+++ b/src/client/app/mobile/views/pages/user/home.followers-you-know.vue
@@ -12,7 +12,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../../user/get-acct';
+import getAcct from '../../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/client/app/mobile/views/pages/user/home.photos.vue b/src/client/app/mobile/views/pages/user/home.photos.vue
index 491660711..ecf508207 100644
--- a/src/client/app/mobile/views/pages/user/home.photos.vue
+++ b/src/client/app/mobile/views/pages/user/home.photos.vue
@@ -14,7 +14,7 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../../user/get-acct';
+import getAcct from '../../../../../../acct/render';
export default Vue.extend({
props: ['user'],
diff --git a/src/drive/add-file.ts b/src/drive/add-file.ts
index 4a718a9da..f48fada7e 100644
--- a/src/drive/add-file.ts
+++ b/src/drive/add-file.ts
@@ -14,7 +14,7 @@ import DriveFile, { getGridFSBucket } from '../models/drive-file';
import DriveFolder from '../models/drive-folder';
import { pack } from '../models/drive-file';
import event, { publishDriveStream } from '../publishers/stream';
-import getAcct from '../user/get-acct';
+import getAcct from '../acct/render';
import config from '../config';
const gm = _gm.subClass({
diff --git a/src/renderers/get-user-summary.ts b/src/renderers/get-user-summary.ts
index 2a9e8a5d0..208987113 100644
--- a/src/renderers/get-user-summary.ts
+++ b/src/renderers/get-user-summary.ts
@@ -1,5 +1,5 @@
import { IUser, isLocalUser } from '../models/user';
-import getAcct from '../user/get-acct';
+import getAcct from '../acct/render';
/**
* ユーザーを表す文字列を取得します。
diff --git a/src/server/activitypub/inbox.ts b/src/server/activitypub/inbox.ts
index 865797fae..6df636f89 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 2962a9b96..91d91aeb9 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 b4090786b..bdbbefb42 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 7f9409660..7e80f31e5 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 17841a9f0..7847cbdea 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 34a3aa190..7c44e6f08 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 81016457d..638fac78b 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 3b0f416d6..20057da31 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');
diff --git a/src/text/parse/elements/mention.ts b/src/text/parse/elements/mention.ts
index 732554d8b..4f2997b39 100644
--- a/src/text/parse/elements/mention.ts
+++ b/src/text/parse/elements/mention.ts
@@ -1,7 +1,7 @@
/**
* Mention
*/
-import parseAcct from '../../../user/parse-acct';
+import parseAcct from '../../../acct/parse';
module.exports = text => {
const match = text.match(/^(?:@[a-zA-Z0-9\-]+){1,2}/);