Merge pull request #1366 from akihikodaki/misc

Introduce acct directory

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;

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';

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({

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: {

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';
 

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() {

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() {

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'],

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({

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'],

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';

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'],

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'],

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';

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() {

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 getAcct from '../../../../../acct/render';
-import parseAcct from '../../../../../user/parse-acct';
+import parseAcct from '../../../../../acct/parse';
 
 export default Vue.extend({
 	props: {

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'],

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() {

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'],

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'],

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'],

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';

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!',

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'],

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',

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',

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;
 

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'],

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'],

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'],

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';

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'],

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'],

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';

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'],

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'],

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() {

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() {

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() {

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() {

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 '../../../../../acct/render';
-import getAcct from '../../../../../user/parse-acct';
+import getAcct from '../../../../../acct/parse';
 import Progress from '../../../common/scripts/loading';
 import XHome from './user/home.vue';
 

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'],

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'],

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({

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';
 
 /**
  * ユーザーを表す文字列を取得します。

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');

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';
 

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) => {

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 = [

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 getAcct from '../../../../acct/render';
-import parseAcct from '../../../../user/parse-acct';
+import parseAcct from '../../../../acct/parse';
 import getPostSummary from '../../../../renderers/get-post-summary';
 
 const redis = prominence(_redis);

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 getAcct from '../../../../acct/render';
-import parseAcct from '../../../../user/parse-acct';
+import parseAcct from '../../../../acct/parse';
 import config from '../../../../config';
 
 /**

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');
 

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');
 

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}/);