From aa4ef6745ad798bd7d4f05cb397ef1dd85279814 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 7 Jul 2018 19:19:00 +0900
Subject: Refactorng

---
 src/acct/parse.ts                                  |  4 -
 src/acct/render.ts                                 |  5 --
 src/cafy-id.ts                                     | 33 ---------
 .../app/common/scripts/compose-notification.ts     |  6 +-
 .../app/common/views/components/messaging.vue      |  2 +-
 .../views/components/misskey-flavored-markdown.ts  |  2 +-
 src/client/app/common/views/filters/user.ts        |  4 +-
 src/client/app/common/views/pages/follow.vue       |  4 +-
 .../views/components/messaging-room-window.vue     |  2 +-
 src/client/app/desktop/views/components/notes.vue  |  2 +-
 .../app/desktop/views/components/notifications.vue |  2 +-
 .../app/desktop/views/components/user-preview.vue  |  2 +-
 .../desktop/views/pages/deck/deck.notification.vue |  2 +-
 .../app/desktop/views/pages/messaging-room.vue     |  4 +-
 src/client/app/desktop/views/pages/user/user.vue   |  4 +-
 .../app/mobile/views/components/note-card.vue      |  2 +-
 src/client/app/mobile/views/components/notes.vue   |  2 +-
 .../views/components/notification-preview.vue      |  2 +-
 .../app/mobile/views/components/notification.vue   |  2 +-
 src/client/app/mobile/views/pages/followers.vue    |  4 +-
 src/client/app/mobile/views/pages/following.vue    |  2 +-
 .../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         |  2 +-
 src/index.ts                                       | 46 +++++-------
 src/mfm/parse/elements/mention.ts                  |  2 +-
 src/misc/acct/parse.ts                             |  4 +
 src/misc/acct/render.ts                            |  5 ++
 src/misc/cafy-id.ts                                | 33 +++++++++
 src/misc/cli/indicator.ts                          | 35 +++++++++
 src/misc/cli/progressbar.ts                        | 85 ++++++++++++++++++++++
 src/misc/dependencyInfo.ts                         | 33 +++++++++
 src/misc/environmentInfo.ts                        | 14 ++++
 src/misc/get-note-summary.ts                       | 50 +++++++++++++
 src/misc/get-notification-summary.ts               | 28 +++++++
 src/misc/get-reaction-emoji.ts                     | 14 ++++
 src/misc/get-user-name.ts                          |  5 ++
 src/misc/get-user-summary.ts                       | 18 +++++
 src/misc/logger.ts                                 | 53 ++++++++++++++
 src/misc/machineInfo.ts                            | 16 ++++
 src/notify.ts                                      | 62 ++++++++++++++++
 src/parse-opt.ts                                   | 17 -----
 src/publishers/notify.ts                           | 62 ----------------
 src/publishers/push-sw.ts                          | 52 -------------
 src/publishers/stream.ts                           | 77 --------------------
 src/push-sw.ts                                     | 52 +++++++++++++
 src/queue/processors/http/process-inbox.ts         |  2 +-
 src/renderers/get-note-summary.ts                  | 50 -------------
 src/renderers/get-notification-summary.ts          | 28 -------
 src/renderers/get-reaction-emoji.ts                | 14 ----
 src/renderers/get-user-name.ts                     |  5 --
 src/renderers/get-user-summary.ts                  | 18 -----
 src/server/activitypub.ts                          |  1 -
 src/server/api/common/read-messaging-message.ts    |  6 +-
 src/server/api/common/read-notification.ts         |  2 +-
 .../api/endpoints/aggregation/users/activity.ts    |  2 +-
 .../api/endpoints/aggregation/users/followers.ts   |  2 +-
 .../api/endpoints/aggregation/users/following.ts   |  2 +-
 src/server/api/endpoints/aggregation/users/post.ts |  2 +-
 .../api/endpoints/aggregation/users/reaction.ts    |  2 +-
 src/server/api/endpoints/app/show.ts               |  2 +-
 src/server/api/endpoints/drive/files.ts            |  2 +-
 src/server/api/endpoints/drive/files/create.ts     |  2 +-
 src/server/api/endpoints/drive/files/delete.ts     |  4 +-
 src/server/api/endpoints/drive/files/find.ts       |  2 +-
 src/server/api/endpoints/drive/files/show.ts       |  2 +-
 src/server/api/endpoints/drive/files/update.ts     |  4 +-
 .../api/endpoints/drive/files/upload_from_url.ts   |  2 +-
 src/server/api/endpoints/drive/folders.ts          |  2 +-
 src/server/api/endpoints/drive/folders/create.ts   |  4 +-
 src/server/api/endpoints/drive/folders/find.ts     |  2 +-
 src/server/api/endpoints/drive/folders/show.ts     |  2 +-
 src/server/api/endpoints/drive/folders/update.ts   |  4 +-
 src/server/api/endpoints/drive/stream.ts           |  2 +-
 src/server/api/endpoints/following/create.ts       |  2 +-
 src/server/api/endpoints/following/delete.ts       |  2 +-
 .../api/endpoints/following/requests/accept.ts     |  2 +-
 .../api/endpoints/following/requests/cancel.ts     |  2 +-
 .../api/endpoints/following/requests/reject.ts     |  2 +-
 src/server/api/endpoints/following/stalk.ts        |  2 +-
 src/server/api/endpoints/following/unstalk.ts      |  2 +-
 src/server/api/endpoints/games/reversi/games.ts    |  2 +-
 .../api/endpoints/games/reversi/games/show.ts      |  2 +-
 src/server/api/endpoints/games/reversi/match.ts    |  4 +-
 src/server/api/endpoints/i/favorites.ts            |  2 +-
 src/server/api/endpoints/i/notifications.ts        |  2 +-
 src/server/api/endpoints/i/pin.ts                  |  2 +-
 src/server/api/endpoints/i/regenerate_token.ts     |  2 +-
 src/server/api/endpoints/i/signin_history.ts       |  2 +-
 src/server/api/endpoints/i/update.ts               |  4 +-
 .../api/endpoints/i/update_client_setting.ts       |  2 +-
 src/server/api/endpoints/i/update_home.ts          | 15 ++--
 src/server/api/endpoints/i/update_mobile_home.ts   | 13 ++--
 src/server/api/endpoints/i/update_widget.ts        |  4 +-
 src/server/api/endpoints/messaging/messages.ts     |  2 +-
 .../api/endpoints/messaging/messages/create.ts     | 10 +--
 src/server/api/endpoints/mute/create.ts            |  2 +-
 src/server/api/endpoints/mute/delete.ts            |  2 +-
 src/server/api/endpoints/mute/list.ts              |  2 +-
 src/server/api/endpoints/notes.ts                  |  2 +-
 src/server/api/endpoints/notes/conversation.ts     |  2 +-
 src/server/api/endpoints/notes/create.ts           |  2 +-
 src/server/api/endpoints/notes/delete.ts           |  2 +-
 src/server/api/endpoints/notes/favorites/create.ts |  2 +-
 src/server/api/endpoints/notes/favorites/delete.ts |  2 +-
 src/server/api/endpoints/notes/global-timeline.ts  |  2 +-
 src/server/api/endpoints/notes/local-timeline.ts   |  2 +-
 src/server/api/endpoints/notes/mentions.ts         |  2 +-
 src/server/api/endpoints/notes/polls/vote.ts       |  6 +-
 src/server/api/endpoints/notes/reactions.ts        |  2 +-
 src/server/api/endpoints/notes/reactions/create.ts |  2 +-
 src/server/api/endpoints/notes/reactions/delete.ts |  2 +-
 src/server/api/endpoints/notes/replies.ts          |  2 +-
 src/server/api/endpoints/notes/reposts.ts          |  2 +-
 src/server/api/endpoints/notes/search_by_tag.ts    |  2 +-
 src/server/api/endpoints/notes/show.ts             |  2 +-
 src/server/api/endpoints/notes/timeline.ts         |  2 +-
 .../api/endpoints/notes/user-list-timeline.ts      |  2 +-
 .../endpoints/notifications/mark_as_read_all.ts    |  2 +-
 src/server/api/endpoints/users/followers.ts        |  2 +-
 src/server/api/endpoints/users/following.ts        |  2 +-
 .../users/get_frequently_replied_users.ts          |  2 +-
 src/server/api/endpoints/users/lists/push.ts       |  4 +-
 src/server/api/endpoints/users/lists/show.ts       |  2 +-
 src/server/api/endpoints/users/notes.ts            |  2 +-
 src/server/api/endpoints/users/show.ts             |  2 +-
 src/server/api/limitter.ts                         |  2 +-
 src/server/api/private/signin.ts                   |  2 +-
 src/server/api/service/twitter.ts                  |  2 +-
 src/server/api/stream/reversi-game.ts              |  2 +-
 src/server/api/stream/reversi.ts                   |  2 +-
 src/server/web/index.ts                            |  4 +-
 src/server/webfinger.ts                            |  2 +-
 src/services/drive/add-file.ts                     |  2 +-
 src/services/following/create.ts                   |  4 +-
 src/services/following/delete.ts                   |  2 +-
 src/services/following/requests/accept.ts          |  2 +-
 src/services/following/requests/cancel.ts          |  2 +-
 src/services/following/requests/create.ts          |  4 +-
 src/services/note/create.ts                        |  6 +-
 src/services/note/delete.ts                        |  2 +-
 src/services/note/reaction/create.ts               |  4 +-
 src/stream.ts                                      | 77 ++++++++++++++++++++
 src/utils/cli/indicator.ts                         | 35 ---------
 src/utils/cli/progressbar.ts                       | 85 ----------------------
 src/utils/dependencyInfo.ts                        | 33 ---------
 src/utils/environmentInfo.ts                       | 14 ----
 src/utils/logger.ts                                | 53 --------------
 src/utils/machineInfo.ts                           | 16 ----
 149 files changed, 753 insertions(+), 785 deletions(-)
 delete mode 100644 src/acct/parse.ts
 delete mode 100644 src/acct/render.ts
 delete mode 100644 src/cafy-id.ts
 create mode 100644 src/misc/acct/parse.ts
 create mode 100644 src/misc/acct/render.ts
 create mode 100644 src/misc/cafy-id.ts
 create mode 100644 src/misc/cli/indicator.ts
 create mode 100644 src/misc/cli/progressbar.ts
 create mode 100644 src/misc/dependencyInfo.ts
 create mode 100644 src/misc/environmentInfo.ts
 create mode 100644 src/misc/get-note-summary.ts
 create mode 100644 src/misc/get-notification-summary.ts
 create mode 100644 src/misc/get-reaction-emoji.ts
 create mode 100644 src/misc/get-user-name.ts
 create mode 100644 src/misc/get-user-summary.ts
 create mode 100644 src/misc/logger.ts
 create mode 100644 src/misc/machineInfo.ts
 create mode 100644 src/notify.ts
 delete mode 100644 src/parse-opt.ts
 delete mode 100644 src/publishers/notify.ts
 delete mode 100644 src/publishers/push-sw.ts
 delete mode 100644 src/publishers/stream.ts
 create mode 100644 src/push-sw.ts
 delete mode 100644 src/renderers/get-note-summary.ts
 delete mode 100644 src/renderers/get-notification-summary.ts
 delete mode 100644 src/renderers/get-reaction-emoji.ts
 delete mode 100644 src/renderers/get-user-name.ts
 delete mode 100644 src/renderers/get-user-summary.ts
 create mode 100644 src/stream.ts
 delete mode 100644 src/utils/cli/indicator.ts
 delete mode 100644 src/utils/cli/progressbar.ts
 delete mode 100644 src/utils/dependencyInfo.ts
 delete mode 100644 src/utils/environmentInfo.ts
 delete mode 100644 src/utils/logger.ts
 delete mode 100644 src/utils/machineInfo.ts

(limited to 'src')

diff --git a/src/acct/parse.ts b/src/acct/parse.ts
deleted file mode 100644
index 0c00fccef6..0000000000
--- a/src/acct/parse.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default (acct: string) => {
-	const splitted = acct.split('@', 2);
-	return { username: splitted[0], host: splitted[1] || null };
-};
diff --git a/src/acct/render.ts b/src/acct/render.ts
deleted file mode 100644
index c29bfb4764..0000000000
--- a/src/acct/render.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { IUser } from '../models/user';
-
-export default (user: IUser) => {
-	return user.host === null ? user.username : `${user.username}@${user.host}`;
-};
diff --git a/src/cafy-id.ts b/src/cafy-id.ts
deleted file mode 100644
index f3e1f5251b..0000000000
--- a/src/cafy-id.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as mongo from 'mongodb';
-import { Context } from 'cafy';
-
-export const isAnId = (x: any) => mongo.ObjectID.isValid(x);
-export const isNotAnId = (x: any) => !isAnId(x);
-
-/**
- * ID
- */
-export default class ID extends Context<mongo.ObjectID> {
-	constructor() {
-		super();
-
-		this.transform = v => {
-			if (isAnId(v) && !mongo.ObjectID.prototype.isPrototypeOf(v)) {
-				return new mongo.ObjectID(v);
-			} else {
-				return v;
-			}
-		};
-
-		this.push(v => {
-			if (!mongo.ObjectID.prototype.isPrototypeOf(v) && isNotAnId(v)) {
-				return new Error('must-be-an-id');
-			}
-			return true;
-		});
-	}
-
-	public getType() {
-		return super.getType('string');
-	}
-}
diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts
index 2e58649ac2..47499e5490 100644
--- a/src/client/app/common/scripts/compose-notification.ts
+++ b/src/client/app/common/scripts/compose-notification.ts
@@ -1,6 +1,6 @@
-import getNoteSummary from '../../../../renderers/get-note-summary';
-import getReactionEmoji from '../../../../renderers/get-reaction-emoji';
-import getUserName from '../../../../renderers/get-user-name';
+import getNoteSummary from '../../../../misc/get-note-summary';
+import getReactionEmoji from '../../../../misc/get-reaction-emoji';
+import getUserName from '../../../../misc/get-user-name';
 
 type Notification = {
 	title: string;
diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue
index 2ddec29984..6abfc92dca 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 '../../../../../acct/render';
+import getAcct from '../../../../../misc/acct/render';
 
 export default Vue.extend({
 	props: {
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.ts b/src/client/app/common/views/components/misskey-flavored-markdown.ts
index c321c76104..c93e09fb5f 100644
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import * as emojilib from 'emojilib';
 import parse from '../../../../../mfm/parse';
-import getAcct from '../../../../../acct/render';
+import getAcct from '../../../../../misc/acct/render';
 import { url } from '../../../config';
 import MkUrl from './url.vue';
 import MkGoogle from './google.vue';
diff --git a/src/client/app/common/views/filters/user.ts b/src/client/app/common/views/filters/user.ts
index c5bb39f674..ca0910fc53 100644
--- a/src/client/app/common/views/filters/user.ts
+++ b/src/client/app/common/views/filters/user.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import getAcct from '../../../../../acct/render';
-import getUserName from '../../../../../renderers/get-user-name';
+import getAcct from '../../../../../misc/acct/render';
+import getUserName from '../../../../../misc/get-user-name';
 
 Vue.filter('acct', user => {
 	return getAcct(user);
diff --git a/src/client/app/common/views/pages/follow.vue b/src/client/app/common/views/pages/follow.vue
index c8e838be85..4b8c2d3b7c 100644
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -31,8 +31,8 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import parseAcct from '../../../../../acct/parse';
-import getUserName from '../../../../../renderers/get-user-name';
+import parseAcct from '../../../../../misc/acct/parse';
+import getUserName from '../../../../../misc/get-user-name';
 import Progress from '../../../common/scripts/loading';
 
 export default Vue.extend({
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 cbb58b5e99..41b421b0e7 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 '../../../../../acct/render';
+import getAcct from '../../../../../misc/acct/render';
 
 export default Vue.extend({
 	props: ['user'],
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 1206eb7136..c959508020 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -34,7 +34,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import { url } from '../../../config';
-import getNoteSummary from '../../../../../renderers/get-note-summary';
+import getNoteSummary from '../../../../../misc/get-note-summary';
 
 import XNote from './notes.note.vue';
 
diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue
index 32b36994db..b291e1f54a 100644
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@@ -110,7 +110,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import getNoteSummary from '../../../../../renderers/get-note-summary';
+import getNoteSummary from '../../../../../misc/get-note-summary';
 
 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 788881ead5..933e701e58 100644
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -27,7 +27,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import * as anime from 'animejs';
-import parseAcct from '../../../../../acct/parse';
+import parseAcct from '../../../../../misc/acct/parse';
 
 export default Vue.extend({
 	props: {
diff --git a/src/client/app/desktop/views/pages/deck/deck.notification.vue b/src/client/app/desktop/views/pages/deck/deck.notification.vue
index a379adc69e..d0093ff282 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notification.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notification.vue
@@ -81,7 +81,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import getNoteSummary from '../../../../../../renderers/get-note-summary';
+import getNoteSummary from '../../../../../../misc/get-note-summary';
 import XNote from './deck.note.vue';
 
 export default Vue.extend({
diff --git a/src/client/app/desktop/views/pages/messaging-room.vue b/src/client/app/desktop/views/pages/messaging-room.vue
index 06c32776c9..1ebd53cef4 100644
--- a/src/client/app/desktop/views/pages/messaging-room.vue
+++ b/src/client/app/desktop/views/pages/messaging-room.vue
@@ -7,8 +7,8 @@
 <script lang="ts">
 import Vue from 'vue';
 import Progress from '../../../common/scripts/loading';
-import parseAcct from '../../../../../acct/parse';
-import getUserName from '../../../../../renderers/get-user-name';
+import parseAcct from '../../../../../misc/acct/parse';
+import getUserName from '../../../../../misc/get-user-name';
 
 export default Vue.extend({
 	data() {
diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue
index fc5c900037..64a4eaa872 100644
--- a/src/client/app/desktop/views/pages/user/user.vue
+++ b/src/client/app/desktop/views/pages/user/user.vue
@@ -27,8 +27,8 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import parseAcct from '../../../../../../acct/parse';
-import getUserName from '../../../../../../renderers/get-user-name';
+import parseAcct from '../../../../../../misc/acct/parse';
+import getUserName from '../../../../../../misc/get-user-name';
 import Progress from '../../../../common/scripts/loading';
 import XHeader from './user.header.vue';
 import XTimeline from './user.timeline.vue';
diff --git a/src/client/app/mobile/views/components/note-card.vue b/src/client/app/mobile/views/components/note-card.vue
index 89700b5e82..6d94c852be 100644
--- a/src/client/app/mobile/views/components/note-card.vue
+++ b/src/client/app/mobile/views/components/note-card.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import summary from '../../../../../renderers/get-note-summary';
+import summary from '../../../../../misc/get-note-summary';
 
 export default Vue.extend({
 	props: ['note'],
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 06d22c7258..01f3d76c74 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -37,7 +37,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import getNoteSummary from '../../../../../renderers/get-note-summary';
+import getNoteSummary from '../../../../../misc/get-note-summary';
 
 const displayLimit = 30;
 
diff --git a/src/client/app/mobile/views/components/notification-preview.vue b/src/client/app/mobile/views/components/notification-preview.vue
index 5e2306932b..be2c7a60ed 100644
--- a/src/client/app/mobile/views/components/notification-preview.vue
+++ b/src/client/app/mobile/views/components/notification-preview.vue
@@ -66,7 +66,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import getNoteSummary from '../../../../../renderers/get-note-summary';
+import getNoteSummary from '../../../../../misc/get-note-summary';
 
 export default Vue.extend({
 	props: ['notification'],
diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue
index bbcae05f10..ee90c6b46b 100644
--- a/src/client/app/mobile/views/components/notification.vue
+++ b/src/client/app/mobile/views/components/notification.vue
@@ -81,7 +81,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import getNoteSummary from '../../../../../renderers/get-note-summary';
+import getNoteSummary from '../../../../../misc/get-note-summary';
 
 export default Vue.extend({
 	props: ['notification'],
diff --git a/src/client/app/mobile/views/pages/followers.vue b/src/client/app/mobile/views/pages/followers.vue
index dfb9c62142..f53fadb589 100644
--- a/src/client/app/mobile/views/pages/followers.vue
+++ b/src/client/app/mobile/views/pages/followers.vue
@@ -19,8 +19,8 @@
 <script lang="ts">
 import Vue from 'vue';
 import Progress from '../../../common/scripts/loading';
-import parseAcct from '../../../../../acct/parse';
-import getUserName from '../../../../../renderers/get-user-name';
+import parseAcct from '../../../../../misc/acct/parse';
+import getUserName from '../../../../../misc/get-user-name';
 
 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 35461ea2fc..b28d7dd7b9 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 '../../../../../acct/parse';
+import parseAcct from '../../../../../misc/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 8b82b03fb9..35ae506761 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 '../../../../../acct/parse';
+import parseAcct from '../../../../../misc/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 057470efd9..8dcbc5d6c5 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 '../../../../../acct/render';
+import getAcct from '../../../../../misc/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 ba9de9f8a6..0b51c8b4ce 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -64,7 +64,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import * as age from 's-age';
-import parseAcct from '../../../../../acct/parse';
+import parseAcct from '../../../../../misc/acct/parse';
 import Progress from '../../../common/scripts/loading';
 import XHome from './user/home.vue';
 
diff --git a/src/index.ts b/src/index.ts
index 1a76044572..46bbb83b07 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -12,19 +12,17 @@ import chalk from 'chalk';
 import isRoot = require('is-root');
 import Xev from 'xev';
 
-import Logger from './utils/logger';
-import ProgressBar from './utils/cli/progressbar';
-import EnvironmentInfo from './utils/environmentInfo';
-import MachineInfo from './utils/machineInfo';
-import DependencyInfo from './utils/dependencyInfo';
+import Logger from './misc/logger';
+import ProgressBar from './misc/cli/progressbar';
+import EnvironmentInfo from './misc/environmentInfo';
+import MachineInfo from './misc/machineInfo';
+import DependencyInfo from './misc/dependencyInfo';
 import serverStats from './daemons/server-stats';
 import notesStats from './daemons/notes-stats';
 import db from './db/mongodb';
 import loadConfig from './config/load';
 import { Config } from './config/types';
 
-import parseOpt from './parse-opt';
-
 const clusterLog = debug('misskey:cluster');
 const ev = new Xev();
 
@@ -44,23 +42,21 @@ main();
  * Init process
  */
 function main() {
-	const opt = parseOpt(process.argv, 2);
-
 	if (cluster.isMaster) {
-		masterMain(opt);
+		masterMain();
 
 		ev.mount();
 		serverStats();
 		notesStats();
 	} else {
-		workerMain(opt);
+		workerMain();
 	}
 }
 
 /**
  * Init master process
  */
-async function masterMain(opt: any) {
+async function masterMain() {
 	let config: Config;
 
 	try {
@@ -75,32 +71,24 @@ async function masterMain(opt: any) {
 	Logger.info(chalk.green('Successfully initialized :)'));
 
 	spawnWorkers(() => {
-		if (!opt['only-processor']) {
-			Logger.info(chalk.bold.green(
-				`Now listening on port ${chalk.underline(config.port.toString())}`));
+		Logger.info(chalk.bold.green(
+			`Now listening on port ${chalk.underline(config.port.toString())}`));
 
-			Logger.info(chalk.bold.green(config.url));
-		}
+		Logger.info(chalk.bold.green(config.url));
 
-		if (!opt['only-server']) {
-			Logger.info(chalk.bold.green('Now processing jobs'));
-		}
+		Logger.info(chalk.bold.green('Now processing jobs'));
 	});
 }
 
 /**
  * Init worker process
  */
-async function workerMain(opt: any) {
-	if (!opt['only-processor']) {
-		// start server
-		await require('./server').default();
-	}
+async function workerMain() {
+	// start server
+	await require('./server').default();
 
-	if (!opt['only-server']) {
-		// start processor
-		require('./queue').default();
-	}
+	// start processor
+	require('./queue').default();
 
 	// Send a 'ready' message to parent process
 	process.send('ready');
diff --git a/src/mfm/parse/elements/mention.ts b/src/mfm/parse/elements/mention.ts
index eda60b530a..a95ec00384 100644
--- a/src/mfm/parse/elements/mention.ts
+++ b/src/mfm/parse/elements/mention.ts
@@ -1,7 +1,7 @@
 /**
  * Mention
  */
-import parseAcct from '../../../acct/parse';
+import parseAcct from '../../../misc/acct/parse';
 
 export type TextElementMention = {
 	type: 'mention'
diff --git a/src/misc/acct/parse.ts b/src/misc/acct/parse.ts
new file mode 100644
index 0000000000..0c00fccef6
--- /dev/null
+++ b/src/misc/acct/parse.ts
@@ -0,0 +1,4 @@
+export default (acct: string) => {
+	const splitted = acct.split('@', 2);
+	return { username: splitted[0], host: splitted[1] || null };
+};
diff --git a/src/misc/acct/render.ts b/src/misc/acct/render.ts
new file mode 100644
index 0000000000..20031883d3
--- /dev/null
+++ b/src/misc/acct/render.ts
@@ -0,0 +1,5 @@
+import { IUser } from '../../models/user';
+
+export default (user: IUser) => {
+	return user.host === null ? user.username : `${user.username}@${user.host}`;
+};
diff --git a/src/misc/cafy-id.ts b/src/misc/cafy-id.ts
new file mode 100644
index 0000000000..f3e1f5251b
--- /dev/null
+++ b/src/misc/cafy-id.ts
@@ -0,0 +1,33 @@
+import * as mongo from 'mongodb';
+import { Context } from 'cafy';
+
+export const isAnId = (x: any) => mongo.ObjectID.isValid(x);
+export const isNotAnId = (x: any) => !isAnId(x);
+
+/**
+ * ID
+ */
+export default class ID extends Context<mongo.ObjectID> {
+	constructor() {
+		super();
+
+		this.transform = v => {
+			if (isAnId(v) && !mongo.ObjectID.prototype.isPrototypeOf(v)) {
+				return new mongo.ObjectID(v);
+			} else {
+				return v;
+			}
+		};
+
+		this.push(v => {
+			if (!mongo.ObjectID.prototype.isPrototypeOf(v) && isNotAnId(v)) {
+				return new Error('must-be-an-id');
+			}
+			return true;
+		});
+	}
+
+	public getType() {
+		return super.getType('string');
+	}
+}
diff --git a/src/misc/cli/indicator.ts b/src/misc/cli/indicator.ts
new file mode 100644
index 0000000000..3e23f9b274
--- /dev/null
+++ b/src/misc/cli/indicator.ts
@@ -0,0 +1,35 @@
+import * as readline from 'readline';
+
+/**
+ * Indicator
+ */
+export default class {
+	private clock: NodeJS.Timer;
+
+	constructor(text: string) {
+		let i = 0; // Dots counter
+
+		draw();
+		this.clock = setInterval(draw, 300);
+
+		function draw(): void {
+			cll();
+			i = (i + 1) % 4;
+			const dots = new Array(i + 1).join('.');
+			process.stdout.write(text + dots); // Write text
+		}
+	}
+
+	public end(): void {
+		clearInterval(this.clock);
+		cll();
+	}
+}
+
+/**
+ * Clear current line
+ */
+function cll(): void {
+	readline.clearLine(process.stdout, 0); // Clear current text
+	readline.cursorTo(process.stdout, 0, null); // Move cursor to the head of line
+}
diff --git a/src/misc/cli/progressbar.ts b/src/misc/cli/progressbar.ts
new file mode 100644
index 0000000000..72496fdedc
--- /dev/null
+++ b/src/misc/cli/progressbar.ts
@@ -0,0 +1,85 @@
+import { EventEmitter } from 'events';
+import * as readline from 'readline';
+import chalk from 'chalk';
+
+/**
+ * Progress bar
+ */
+export default class extends EventEmitter {
+	public max: number;
+	public value: number;
+	public text: string;
+	private indicator: number;
+
+	constructor(max: number, text: string = null) {
+		super();
+		this.max = max;
+		this.value = 0;
+		this.text = text;
+		this.indicator = 0;
+		this.draw();
+
+		const iclock = setInterval(() => {
+			this.indicator = (this.indicator + 1) % 4;
+			this.draw();
+		}, 200);
+
+		this.on('complete', () => {
+			clearInterval(iclock);
+		});
+	}
+
+	public increment(): void {
+		this.value++;
+		this.draw();
+
+		// Check if it is fulfilled
+		if (this.value === this.max) {
+			this.indicator = null;
+
+			cll();
+			process.stdout.write(`${this.render()} -> ${chalk.bold('Complete')}\n`);
+
+			this.emit('complete');
+		}
+	}
+
+	public draw(): void {
+		const str = this.render();
+		cll();
+		process.stdout.write(str);
+	}
+
+	private render(): string {
+		const width = 30;
+		const t = this.text ? `${this.text} ` : '';
+
+		const v = Math.floor((this.value / this.max) * width);
+		const vs = new Array(v + 1).join('*');
+
+		const p = width - v;
+		const ps = new Array(p + 1).join(' ');
+
+		const percentage = Math.floor((this.value / this.max) * 100);
+		const percentages = chalk.gray(`(${percentage} %)`);
+
+		let i: string;
+		switch (this.indicator) {
+			case 0: i = '-'; break;
+			case 1: i = '\\'; break;
+			case 2: i = '|'; break;
+			case 3: i = '/'; break;
+			case null: i = '+'; break;
+		}
+
+		return `${i} ${t}[${vs}${ps}] ${this.value} / ${this.max} ${percentages}`;
+	}
+}
+
+/**
+ * Clear current line
+ */
+function cll(): void {
+	readline.clearLine(process.stdout, 0); // Clear current text
+	readline.cursorTo(process.stdout, 0, null); // Move cursor to the head of line
+}
diff --git a/src/misc/dependencyInfo.ts b/src/misc/dependencyInfo.ts
new file mode 100644
index 0000000000..89af0d20fb
--- /dev/null
+++ b/src/misc/dependencyInfo.ts
@@ -0,0 +1,33 @@
+import Logger from './logger';
+import { execSync } from 'child_process';
+
+export default class {
+	private logger: Logger;
+
+	constructor() {
+		this.logger = new Logger('Deps');
+	}
+
+	public showAll(): void {
+		this.show('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version:? (.*)\r?\n/));
+		this.show('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/));
+		this.show('ImageMagick', 'magick -version', x => x.match(/^Version: ImageMagick (.+?)\r?\n/));
+	}
+
+	public show(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void {
+		try {
+			// ステータス0以外のときにexecSyncはstderrをコンソール上に出力してしまうので
+			// プロセスからのstderrをすべて無視するように stdio オプションをセット
+			const x = execSync(command, { stdio: ['pipe', 'pipe', 'ignore'] });
+			const ver = transform(x.toString());
+			if (ver != null) {
+				this.logger.info(`${serviceName} ${ver[1]} found`);
+			} else {
+				this.logger.warn(`${serviceName} not found`);
+				this.logger.warn(`Regexp used for version check of ${serviceName} is probably messed up`);
+			}
+		} catch (e) {
+			this.logger.warn(`${serviceName} not found`);
+		}
+	}
+}
diff --git a/src/misc/environmentInfo.ts b/src/misc/environmentInfo.ts
new file mode 100644
index 0000000000..e6084cde0e
--- /dev/null
+++ b/src/misc/environmentInfo.ts
@@ -0,0 +1,14 @@
+import Logger from './logger';
+
+export default class {
+	public static show(): void {
+		const env = process.env.NODE_ENV;
+		const logger = new Logger('Env');
+		logger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`);
+
+		if (env !== 'production') {
+			logger.warn('The environment is not in production mode');
+			logger.warn('Do not use for production purpose');
+		}
+	}
+}
diff --git a/src/misc/get-note-summary.ts b/src/misc/get-note-summary.ts
new file mode 100644
index 0000000000..ec7c74cf9f
--- /dev/null
+++ b/src/misc/get-note-summary.ts
@@ -0,0 +1,50 @@
+/**
+ * 投稿を表す文字列を取得します。
+ * @param {*} note (packされた)投稿
+ */
+const summarize = (note: any): string => {
+	if (note.deletedAt) {
+		return '(削除された投稿)';
+	}
+
+	if (note.isHidden) {
+		return '(非公開の投稿)';
+	}
+
+	let summary = '';
+
+	// 本文
+	summary += note.text ? note.text : '';
+
+	// メディアが添付されているとき
+	if (note.media.length != 0) {
+		summary += ` (${note.media.length}つのメディア)`;
+	}
+
+	// 投票が添付されているとき
+	if (note.poll) {
+		summary += ' (投票)';
+	}
+
+	// 返信のとき
+	if (note.replyId) {
+		if (note.reply) {
+			summary += ` RE: ${summarize(note.reply)}`;
+		} else {
+			summary += ' RE: ...';
+		}
+	}
+
+	// Renoteのとき
+	if (note.renoteId) {
+		if (note.renote) {
+			summary += ` RP: ${summarize(note.renote)}`;
+		} else {
+			summary += ' RP: ...';
+		}
+	}
+
+	return summary.trim();
+};
+
+export default summarize;
diff --git a/src/misc/get-notification-summary.ts b/src/misc/get-notification-summary.ts
new file mode 100644
index 0000000000..71d4973ce9
--- /dev/null
+++ b/src/misc/get-notification-summary.ts
@@ -0,0 +1,28 @@
+import getUserName from './get-user-name';
+import getNoteSummary from './get-note-summary';
+import getReactionEmoji from './get-reaction-emoji';
+
+/**
+ * 通知を表す文字列を取得します。
+ * @param notification 通知
+ */
+export default function(notification: any): string {
+	switch (notification.type) {
+		case 'follow':
+			return `${getUserName(notification.user)}にフォローされました`;
+		case 'mention':
+			return `言及されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
+		case 'reply':
+			return `返信されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
+		case 'renote':
+			return `Renoteされました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
+		case 'quote':
+			return `引用されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
+		case 'reaction':
+			return `リアクションされました:\n${getUserName(notification.user)} <${getReactionEmoji(notification.reaction)}>「${getNoteSummary(notification.note)}」`;
+		case 'poll_vote':
+			return `投票されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
+		default:
+			return `<不明な通知タイプ: ${notification.type}>`;
+	}
+}
diff --git a/src/misc/get-reaction-emoji.ts b/src/misc/get-reaction-emoji.ts
new file mode 100644
index 0000000000..c661205379
--- /dev/null
+++ b/src/misc/get-reaction-emoji.ts
@@ -0,0 +1,14 @@
+export default function(reaction: string): string {
+	switch (reaction) {
+		case 'like': return '👍';
+		case 'love': return '❤️';
+		case 'laugh': return '😆';
+		case 'hmm': return '🤔';
+		case 'surprise': return '😮';
+		case 'congrats': return '🎉';
+		case 'angry': return '💢';
+		case 'confused': return '😥';
+		case 'pudding': return '🍮';
+		default: return '';
+	}
+}
diff --git a/src/misc/get-user-name.ts b/src/misc/get-user-name.ts
new file mode 100644
index 0000000000..acd5e6626d
--- /dev/null
+++ b/src/misc/get-user-name.ts
@@ -0,0 +1,5 @@
+import { IUser } from '../models/user';
+
+export default function(user: IUser): string {
+	return user.name || '名無し';
+}
diff --git a/src/misc/get-user-summary.ts b/src/misc/get-user-summary.ts
new file mode 100644
index 0000000000..625caf1f7e
--- /dev/null
+++ b/src/misc/get-user-summary.ts
@@ -0,0 +1,18 @@
+import { IUser, isLocalUser } from '../models/user';
+import getAcct from '../misc/acct/render';
+import getUserName from './get-user-name';
+
+/**
+ * ユーザーを表す文字列を取得します。
+ * @param user ユーザー
+ */
+export default function(user: IUser): string {
+	let string = `${getUserName(user)} (@${getAcct(user)})\n` +
+		`${user.notesCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`;
+
+	if (isLocalUser(user)) {
+		string += `場所: ${user.profile.location}、誕生日: ${user.profile.birthday}\n`;
+	}
+
+	return string + `「${user.description}」`;
+}
diff --git a/src/misc/logger.ts b/src/misc/logger.ts
new file mode 100644
index 0000000000..fae1042c39
--- /dev/null
+++ b/src/misc/logger.ts
@@ -0,0 +1,53 @@
+import chalk, { Chalk } from 'chalk';
+
+export type LogLevel = 'Error' | 'Warn' | 'Info';
+
+function toLevelColor(level: LogLevel): Chalk {
+	switch (level) {
+		case 'Error': return chalk.red;
+		case 'Warn': return chalk.yellow;
+		case 'Info': return chalk.blue;
+	}
+}
+
+export default class Logger {
+	private domain: string;
+
+	constructor(domain: string) {
+		this.domain = domain;
+	}
+
+	public static log(level: LogLevel, message: string): void {
+		const color = toLevelColor(level);
+		const time = (new Date()).toLocaleTimeString('ja-JP');
+		console.log(`[${time} ${color.bold(level.toUpperCase())}]: ${message}`);
+	}
+
+	public static error(message: string): void {
+		Logger.log('Error', message);
+	}
+
+	public static warn(message: string): void {
+		Logger.log('Warn', message);
+	}
+
+	public static info(message: string): void {
+		Logger.log('Info', message);
+	}
+
+	public log(level: LogLevel, message: string): void {
+		Logger.log(level, `[${this.domain}] ${message}`);
+	}
+
+	public error(message: string): void {
+		this.log('Error', message);
+	}
+
+	public warn(message: string): void {
+		this.log('Warn', message);
+	}
+
+	public info(message: string): void {
+		this.log('Info', message);
+	}
+}
diff --git a/src/misc/machineInfo.ts b/src/misc/machineInfo.ts
new file mode 100644
index 0000000000..0c189cc7ca
--- /dev/null
+++ b/src/misc/machineInfo.ts
@@ -0,0 +1,16 @@
+import * as os from 'os';
+import Logger from './logger';
+
+export default class {
+	public static show(): void {
+		const totalmem = (os.totalmem() / 1024 / 1024 / 1024).toFixed(1);
+		const freemem = (os.freemem() / 1024 / 1024 / 1024).toFixed(1);
+		const logger = new Logger('Machine');
+		logger.info(`Hostname: ${os.hostname()}`);
+		logger.info(`Platform: ${process.platform}`);
+		logger.info(`Architecture: ${process.arch}`);
+		logger.info(`Node.js: ${process.version}`);
+		logger.info(`CPU: ${os.cpus().length}core`);
+		logger.info(`MEM: ${totalmem}GB (available: ${freemem}GB)`);
+	}
+}
diff --git a/src/notify.ts b/src/notify.ts
new file mode 100644
index 0000000000..f55dea167c
--- /dev/null
+++ b/src/notify.ts
@@ -0,0 +1,62 @@
+import * as mongo from 'mongodb';
+import Notification from './models/notification';
+import Mute from './models/mute';
+import { pack } from './models/notification';
+import stream from './stream';
+import User from './models/user';
+import pushSw from './push-sw';
+
+export default (
+	notifiee: mongo.ObjectID,
+	notifier: mongo.ObjectID,
+	type: string,
+	content?: any
+) => new Promise<any>(async (resolve, reject) => {
+	if (notifiee.equals(notifier)) {
+		return resolve();
+	}
+
+	// Create notification
+	const notification = await Notification.insert(Object.assign({
+		createdAt: new Date(),
+		notifieeId: notifiee,
+		notifierId: notifier,
+		type: type,
+		isRead: false
+	}, content));
+
+	resolve(notification);
+
+	const packed = await pack(notification);
+
+	// Publish notification event
+	stream(notifiee, 'notification', packed);
+
+	// Update flag
+	User.update({ _id: notifiee }, {
+		$set: {
+			hasUnreadNotification: true
+		}
+	});
+
+	// 3秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
+	setTimeout(async () => {
+		const fresh = await Notification.findOne({ _id: notification._id }, { isRead: true });
+		if (!fresh.isRead) {
+			//#region ただしミュートしているユーザーからの通知なら無視
+			const mute = await Mute.find({
+				muterId: notifiee,
+				deletedAt: { $exists: false }
+			});
+			const mutedUserIds = mute.map(m => m.muteeId.toString());
+			if (mutedUserIds.indexOf(notifier.toString()) != -1) {
+				return;
+			}
+			//#endregion
+
+			stream(notifiee, 'unread_notification', packed);
+
+			pushSw(notifiee, 'notification', packed);
+		}
+	}, 3000);
+});
diff --git a/src/parse-opt.ts b/src/parse-opt.ts
deleted file mode 100644
index 29e5959c3e..0000000000
--- a/src/parse-opt.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import * as nopt from 'nopt';
-
-export default (vector: any, index: any) => {
-	const parsed = nopt({
-		'only-processor': Boolean,
-		'only-server': Boolean
-	}, {
-		p: ['--only-processor'],
-		s: ['--only-server']
-	}, vector, index);
-
-	if (parsed['only-processor'] && parsed['only-server']) {
-		throw 'only-processor option and only-server option cannot be set at the same time';
-	}
-
-	return parsed;
-};
diff --git a/src/publishers/notify.ts b/src/publishers/notify.ts
deleted file mode 100644
index 760d467393..0000000000
--- a/src/publishers/notify.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import * as mongo from 'mongodb';
-import Notification from '../models/notification';
-import Mute from '../models/mute';
-import { pack } from '../models/notification';
-import stream from './stream';
-import User from '../models/user';
-import pushSw from './push-sw
-
-export default (
-	notifiee: mongo.ObjectID,
-	notifier: mongo.ObjectID,
-	type: string,
-	content?: any
-) => new Promise<any>(async (resolve, reject) => {
-	if (notifiee.equals(notifier)) {
-		return resolve();
-	}
-
-	// Create notification
-	const notification = await Notification.insert(Object.assign({
-		createdAt: new Date(),
-		notifieeId: notifiee,
-		notifierId: notifier,
-		type: type,
-		isRead: false
-	}, content));
-
-	resolve(notification);
-
-	const packed = await pack(notification);
-
-	// Publish notification event
-	stream(notifiee, 'notification', packed);
-
-	// Update flag
-	User.update({ _id: notifiee }, {
-		$set: {
-			hasUnreadNotification: true
-		}
-	});
-
-	// 3秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
-	setTimeout(async () => {
-		const fresh = await Notification.findOne({ _id: notification._id }, { isRead: true });
-		if (!fresh.isRead) {
-			//#region ただしミュートしているユーザーからの通知なら無視
-			const mute = await Mute.find({
-				muterId: notifiee,
-				deletedAt: { $exists: false }
-			});
-			const mutedUserIds = mute.map(m => m.muteeId.toString());
-			if (mutedUserIds.indexOf(notifier.toString()) != -1) {
-				return;
-			}
-			//#endregion
-
-			stream(notifiee, 'unread_notification', packed);
-
-			pushSw(notifiee, 'notification', packed);
-		}
-	}, 3000);
-});
diff --git a/src/publishers/push-sw.ts b/src/publishers/push-sw.ts
deleted file mode 100644
index b0b4701155..0000000000
--- a/src/publishers/push-sw.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-const push = require('web-push');
-import * as mongo from 'mongodb';
-import Subscription from '../models/sw-subscription';
-import config from '../config';
-
-if (config.sw) {
-	// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
-	push.setVapidDetails(
-		config.maintainer.url,
-		config.sw.public_key,
-		config.sw.private_key);
-}
-
-export default async function(userId: mongo.ObjectID | string, type: string, body?: any) {
-	if (!config.sw) return;
-
-	if (typeof userId === 'string') {
-		userId = new mongo.ObjectID(userId);
-	}
-
-	// Fetch
-	const subscriptions = await Subscription.find({
-		userId: userId
-	});
-
-	subscriptions.forEach(subscription => {
-		const pushSubscription = {
-			endpoint: subscription.endpoint,
-			keys: {
-				auth: subscription.auth,
-				p256dh: subscription.publickey
-			}
-		};
-
-		push.sendNotification(pushSubscription, JSON.stringify({
-			type, body
-		})).catch((err: any) => {
-			//console.log(err.statusCode);
-			//console.log(err.headers);
-			//console.log(err.body);
-
-			if (err.statusCode == 410) {
-				Subscription.remove({
-					userId: userId,
-					endpoint: subscription.endpoint,
-					auth: subscription.auth,
-					publickey: subscription.publickey
-				});
-			}
-		});
-	});
-}
diff --git a/src/publishers/stream.ts b/src/publishers/stream.ts
deleted file mode 100644
index b573b65a65..0000000000
--- a/src/publishers/stream.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import * as mongo from 'mongodb';
-import * as redis from 'redis';
-import config from '../config';
-
-type ID = string | mongo.ObjectID;
-
-class MisskeyEvent {
-	private redisClient: redis.RedisClient;
-
-	constructor() {
-		// Connect to Redis
-		this.redisClient = redis.createClient(
-			config.redis.port, config.redis.host);
-	}
-
-	public publishUserStream(userId: ID, type: string, value?: any): void {
-		this.publish(`user-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishDriveStream(userId: ID, type: string, value?: any): void {
-		this.publish(`drive-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishNoteStream(noteId: ID, type: string, value?: any): void {
-		this.publish(`note-stream:${noteId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishUserListStream(listId: ID, type: string, value?: any): void {
-		this.publish(`user-list-stream:${listId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishMessagingStream(userId: ID, otherpartyId: ID, type: string, value?: any): void {
-		this.publish(`messaging-stream:${userId}-${otherpartyId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishMessagingIndexStream(userId: ID, type: string, value?: any): void {
-		this.publish(`messaging-index-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishReversiStream(userId: ID, type: string, value?: any): void {
-		this.publish(`reversi-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishReversiGameStream(gameId: ID, type: string, value?: any): void {
-		this.publish(`reversi-game-stream:${gameId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	public publishLocalTimelineStream(note: any): void {
-		this.redisClient.publish('misskey:local-timeline', JSON.stringify(note));
-	}
-
-	public publishGlobalTimelineStream(note: any): void {
-		this.redisClient.publish('misskey:global-timeline', JSON.stringify(note));
-	}
-
-	private publish(channel: string, type: string, value?: any): void {
-		const message = value == null ?
-			{ type: type } :
-			{ type: type, body: value };
-
-		this.redisClient.publish(`misskey:${channel}`, JSON.stringify(message));
-	}
-}
-
-const ev = new MisskeyEvent();
-
-export default ev.publishUserStream.bind(ev);
-
-export const publishLocalTimelineStream = ev.publishLocalTimelineStream.bind(ev);
-export const publishGlobalTimelineStream = ev.publishGlobalTimelineStream.bind(ev);
-export const publishDriveStream = ev.publishDriveStream.bind(ev);
-export const publishUserListStream = ev.publishUserListStream.bind(ev);
-export const publishNoteStream = ev.publishNoteStream.bind(ev);
-export const publishMessagingStream = ev.publishMessagingStream.bind(ev);
-export const publishMessagingIndexStream = ev.publishMessagingIndexStream.bind(ev);
-export const publishReversiStream = ev.publishReversiStream.bind(ev);
-export const publishReversiGameStream = ev.publishReversiGameStream.bind(ev);
diff --git a/src/push-sw.ts b/src/push-sw.ts
new file mode 100644
index 0000000000..cfed5f03cd
--- /dev/null
+++ b/src/push-sw.ts
@@ -0,0 +1,52 @@
+const push = require('web-push');
+import * as mongo from 'mongodb';
+import Subscription from './models/sw-subscription';
+import config from './config';
+
+if (config.sw) {
+	// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
+	push.setVapidDetails(
+		config.maintainer.url,
+		config.sw.public_key,
+		config.sw.private_key);
+}
+
+export default async function(userId: mongo.ObjectID | string, type: string, body?: any) {
+	if (!config.sw) return;
+
+	if (typeof userId === 'string') {
+		userId = new mongo.ObjectID(userId);
+	}
+
+	// Fetch
+	const subscriptions = await Subscription.find({
+		userId: userId
+	});
+
+	subscriptions.forEach(subscription => {
+		const pushSubscription = {
+			endpoint: subscription.endpoint,
+			keys: {
+				auth: subscription.auth,
+				p256dh: subscription.publickey
+			}
+		};
+
+		push.sendNotification(pushSubscription, JSON.stringify({
+			type, body
+		})).catch((err: any) => {
+			//console.log(err.statusCode);
+			//console.log(err.headers);
+			//console.log(err.body);
+
+			if (err.statusCode == 410) {
+				Subscription.remove({
+					userId: userId,
+					endpoint: subscription.endpoint,
+					auth: subscription.auth,
+					publickey: subscription.publickey
+				});
+			}
+		});
+	});
+}
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 0da442aefb..7b62f057bc 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -2,7 +2,7 @@ import * as kue from 'kue';
 import * as debug from 'debug';
 
 const httpSignature = require('http-signature');
-import parseAcct from '../../../acct/parse';
+import parseAcct from '../../../misc/acct/parse';
 import User, { IRemoteUser } from '../../../models/user';
 import perform from '../../../remote/activitypub/perform';
 import { resolvePerson } from '../../../remote/activitypub/models/person';
diff --git a/src/renderers/get-note-summary.ts b/src/renderers/get-note-summary.ts
deleted file mode 100644
index ec7c74cf9f..0000000000
--- a/src/renderers/get-note-summary.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 投稿を表す文字列を取得します。
- * @param {*} note (packされた)投稿
- */
-const summarize = (note: any): string => {
-	if (note.deletedAt) {
-		return '(削除された投稿)';
-	}
-
-	if (note.isHidden) {
-		return '(非公開の投稿)';
-	}
-
-	let summary = '';
-
-	// 本文
-	summary += note.text ? note.text : '';
-
-	// メディアが添付されているとき
-	if (note.media.length != 0) {
-		summary += ` (${note.media.length}つのメディア)`;
-	}
-
-	// 投票が添付されているとき
-	if (note.poll) {
-		summary += ' (投票)';
-	}
-
-	// 返信のとき
-	if (note.replyId) {
-		if (note.reply) {
-			summary += ` RE: ${summarize(note.reply)}`;
-		} else {
-			summary += ' RE: ...';
-		}
-	}
-
-	// Renoteのとき
-	if (note.renoteId) {
-		if (note.renote) {
-			summary += ` RP: ${summarize(note.renote)}`;
-		} else {
-			summary += ' RP: ...';
-		}
-	}
-
-	return summary.trim();
-};
-
-export default summarize;
diff --git a/src/renderers/get-notification-summary.ts b/src/renderers/get-notification-summary.ts
deleted file mode 100644
index 67c9654769..0000000000
--- a/src/renderers/get-notification-summary.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import getUserName from './get-user-name
-import getNoteSummary from './get-note-summary';
-import getReactionEmoji from './get-reaction-emoji';
-
-/**
- * 通知を表す文字列を取得します。
- * @param notification 通知
- */
-export default function(notification: any): string {
-	switch (notification.type) {
-		case 'follow':
-			return `${getUserName(notification.user)}にフォローされました`;
-		case 'mention':
-			return `言及されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
-		case 'reply':
-			return `返信されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
-		case 'renote':
-			return `Renoteされました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
-		case 'quote':
-			return `引用されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
-		case 'reaction':
-			return `リアクションされました:\n${getUserName(notification.user)} <${getReactionEmoji(notification.reaction)}>「${getNoteSummary(notification.note)}」`;
-		case 'poll_vote':
-			return `投票されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`;
-		default:
-			return `<不明な通知タイプ: ${notification.type}>`;
-	}
-}
diff --git a/src/renderers/get-reaction-emoji.ts b/src/renderers/get-reaction-emoji.ts
deleted file mode 100644
index c661205379..0000000000
--- a/src/renderers/get-reaction-emoji.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export default function(reaction: string): string {
-	switch (reaction) {
-		case 'like': return '👍';
-		case 'love': return '❤️';
-		case 'laugh': return '😆';
-		case 'hmm': return '🤔';
-		case 'surprise': return '😮';
-		case 'congrats': return '🎉';
-		case 'angry': return '💢';
-		case 'confused': return '😥';
-		case 'pudding': return '🍮';
-		default: return '';
-	}
-}
diff --git a/src/renderers/get-user-name.ts b/src/renderers/get-user-name.ts
deleted file mode 100644
index acd5e6626d..0000000000
--- a/src/renderers/get-user-name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { IUser } from '../models/user';
-
-export default function(user: IUser): string {
-	return user.name || '名無し';
-}
diff --git a/src/renderers/get-user-summary.ts b/src/renderers/get-user-summary.ts
deleted file mode 100644
index 1bd9a7fb47..0000000000
--- a/src/renderers/get-user-summary.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { IUser, isLocalUser } from '../models/user';
-import getAcct from '../acct/render';
-import getUserName from './get-user-name';
-
-/**
- * ユーザーを表す文字列を取得します。
- * @param user ユーザー
- */
-export default function(user: IUser): string {
-	let string = `${getUserName(user)} (@${getAcct(user)})\n` +
-		`${user.notesCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`;
-
-	if (isLocalUser(user)) {
-		string += `場所: ${user.profile.location}、誕生日: ${user.profile.birthday}\n`;
-	}
-
-	return string + `「${user.description}」`;
-}
diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts
index f8a01a6ffe..0448ae61b8 100644
--- a/src/server/activitypub.ts
+++ b/src/server/activitypub.ts
@@ -11,7 +11,6 @@ import renderNote from '../remote/activitypub/renderer/note';
 import renderKey from '../remote/activitypub/renderer/key';
 import renderPerson from '../remote/activitypub/renderer/person';
 import renderOrderedCollection from '../remote/activitypub/renderer/ordered-collection';
-import parseAcct from '../acct/parse';
 import config from '../config';
 
 // Init router
diff --git a/src/server/api/common/read-messaging-message.ts b/src/server/api/common/read-messaging-message.ts
index fd5e9f242c..bd5a04f1b0 100644
--- a/src/server/api/common/read-messaging-message.ts
+++ b/src/server/api/common/read-messaging-message.ts
@@ -1,9 +1,9 @@
 import * as mongo from 'mongodb';
 import Message from '../../../models/messaging-message';
 import { IMessagingMessage as IMessage } from '../../../models/messaging-message';
-import publishUserStream from '../../../publishers/stream';
-import { publishMessagingStream } from '../../../publishers/stream';
-import { publishMessagingIndexStream } from '../../../publishers/stream';
+import publishUserStream from '../../../stream';
+import { publishMessagingStream } from '../../../stream';
+import { publishMessagingIndexStream } from '../../../stream';
 import User from '../../../models/user';
 
 /**
diff --git a/src/server/api/common/read-notification.ts b/src/server/api/common/read-notification.ts
index 6505c58c39..fcebad6baa 100644
--- a/src/server/api/common/read-notification.ts
+++ b/src/server/api/common/read-notification.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import { default as Notification, INotification } from '../../../models/notification';
-import publishUserStream from '../../../publishers/stream';
+import publishUserStream from '../../../stream';
 import Mute from '../../../models/mute';
 import User from '../../../models/user';
 
diff --git a/src/server/api/endpoints/aggregation/users/activity.ts b/src/server/api/endpoints/aggregation/users/activity.ts
index 4afa6d1203..0ec3f0db76 100644
--- a/src/server/api/endpoints/aggregation/users/activity.ts
+++ b/src/server/api/endpoints/aggregation/users/activity.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import User from '../../../../../models/user';
 import Note from '../../../../../models/note';
 
diff --git a/src/server/api/endpoints/aggregation/users/followers.ts b/src/server/api/endpoints/aggregation/users/followers.ts
index 484c58ad3d..94eb83febc 100644
--- a/src/server/api/endpoints/aggregation/users/followers.ts
+++ b/src/server/api/endpoints/aggregation/users/followers.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import User from '../../../../../models/user';
 import FollowedLog from '../../../../../models/followed-log';
 
diff --git a/src/server/api/endpoints/aggregation/users/following.ts b/src/server/api/endpoints/aggregation/users/following.ts
index 16812a9f09..d2e4d256fe 100644
--- a/src/server/api/endpoints/aggregation/users/following.ts
+++ b/src/server/api/endpoints/aggregation/users/following.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import User from '../../../../../models/user';
 import FollowingLog from '../../../../../models/following-log';
 
diff --git a/src/server/api/endpoints/aggregation/users/post.ts b/src/server/api/endpoints/aggregation/users/post.ts
index 4965d3c7ac..090f6d2f09 100644
--- a/src/server/api/endpoints/aggregation/users/post.ts
+++ b/src/server/api/endpoints/aggregation/users/post.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import User from '../../../../../models/user';
 import Note from '../../../../../models/note';
 
diff --git a/src/server/api/endpoints/aggregation/users/reaction.ts b/src/server/api/endpoints/aggregation/users/reaction.ts
index 20b5e93d54..ce9e150966 100644
--- a/src/server/api/endpoints/aggregation/users/reaction.ts
+++ b/src/server/api/endpoints/aggregation/users/reaction.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import User from '../../../../../models/user';
 import Reaction from '../../../../../models/note-reaction';
 
diff --git a/src/server/api/endpoints/app/show.ts b/src/server/api/endpoints/app/show.ts
index 2b8a929543..2a8b4dc872 100644
--- a/src/server/api/endpoints/app/show.ts
+++ b/src/server/api/endpoints/app/show.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import App, { pack, IApp } from '../../../../models/app';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/drive/files.ts b/src/server/api/endpoints/drive/files.ts
index c0b6c3b069..000e4dcdd2 100644
--- a/src/server/api/endpoints/drive/files.ts
+++ b/src/server/api/endpoints/drive/files.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import DriveFile, { pack } from '../../../../models/drive-file';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index 5a2bef38ce..401ec23d82 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import { validateFileName, pack } from '../../../../../models/drive-file';
 import create from '../../../../../services/drive/add-file';
 import { ILocalUser } from '../../../../../models/user';
diff --git a/src/server/api/endpoints/drive/files/delete.ts b/src/server/api/endpoints/drive/files/delete.ts
index 992f0286f1..8a63be0e2f 100644
--- a/src/server/api/endpoints/drive/files/delete.ts
+++ b/src/server/api/endpoints/drive/files/delete.ts
@@ -1,7 +1,7 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFile from '../../../../../models/drive-file';
 import del from '../../../../../services/drive/delete-file';
-import { publishDriveStream } from '../../../../../publishers/stream';
+import { publishDriveStream } from '../../../../../stream';
 import { ILocalUser } from '../../../../../models/user';
 
 /**
diff --git a/src/server/api/endpoints/drive/files/find.ts b/src/server/api/endpoints/drive/files/find.ts
index ed76749739..8b166e2dbc 100644
--- a/src/server/api/endpoints/drive/files/find.ts
+++ b/src/server/api/endpoints/drive/files/find.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFile, { pack } from '../../../../../models/drive-file';
 import { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/drive/files/show.ts b/src/server/api/endpoints/drive/files/show.ts
index 2e4ac06bf6..02faa6d5a7 100644
--- a/src/server/api/endpoints/drive/files/show.ts
+++ b/src/server/api/endpoints/drive/files/show.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFile, { pack } from '../../../../../models/drive-file';
 import { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/drive/files/update.ts b/src/server/api/endpoints/drive/files/update.ts
index 73a193a56b..95dd6c2acc 100644
--- a/src/server/api/endpoints/drive/files/update.ts
+++ b/src/server/api/endpoints/drive/files/update.ts
@@ -1,7 +1,7 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFolder from '../../../../../models/drive-folder';
 import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file';
-import { publishDriveStream } from '../../../../../publishers/stream';
+import { publishDriveStream } from '../../../../../stream';
 import { ILocalUser } from '../../../../../models/user';
 
 /**
diff --git a/src/server/api/endpoints/drive/files/upload_from_url.ts b/src/server/api/endpoints/drive/files/upload_from_url.ts
index 7218b345b0..4af365c394 100644
--- a/src/server/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/server/api/endpoints/drive/files/upload_from_url.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import { pack } from '../../../../../models/drive-file';
 import uploadFromUrl from '../../../../../services/drive/upload-from-url';
 import { ILocalUser } from '../../../../../models/user';
diff --git a/src/server/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts
index 70f581f424..f1817ec42f 100644
--- a/src/server/api/endpoints/drive/folders.ts
+++ b/src/server/api/endpoints/drive/folders.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import DriveFolder, { pack } from '../../../../models/drive-folder';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/drive/folders/create.ts b/src/server/api/endpoints/drive/folders/create.ts
index 60c7383895..6205691e15 100644
--- a/src/server/api/endpoints/drive/folders/create.ts
+++ b/src/server/api/endpoints/drive/folders/create.ts
@@ -1,6 +1,6 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
-import { publishDriveStream } from '../../../../../publishers/stream';
+import { publishDriveStream } from '../../../../../stream';
 import { ILocalUser } from '../../../../../models/user';
 
 /**
diff --git a/src/server/api/endpoints/drive/folders/find.ts b/src/server/api/endpoints/drive/folders/find.ts
index 2e4a09b80d..64065d9379 100644
--- a/src/server/api/endpoints/drive/folders/find.ts
+++ b/src/server/api/endpoints/drive/folders/find.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFolder, { pack } from '../../../../../models/drive-folder';
 import { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/drive/folders/show.ts b/src/server/api/endpoints/drive/folders/show.ts
index edc8cb6f1c..5f56606215 100644
--- a/src/server/api/endpoints/drive/folders/show.ts
+++ b/src/server/api/endpoints/drive/folders/show.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFolder, { pack } from '../../../../../models/drive-folder';
 import { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts
index 744d8fcb12..b833655974 100644
--- a/src/server/api/endpoints/drive/folders/update.ts
+++ b/src/server/api/endpoints/drive/folders/update.ts
@@ -1,6 +1,6 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
-import { publishDriveStream } from '../../../../../publishers/stream';
+import { publishDriveStream } from '../../../../../stream';
 import { ILocalUser } from '../../../../../models/user';
 
 /**
diff --git a/src/server/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts
index a7aef926f0..39c878a1f8 100644
--- a/src/server/api/endpoints/drive/stream.ts
+++ b/src/server/api/endpoints/drive/stream.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import DriveFile, { pack } from '../../../../models/drive-file';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts
index ffd399d446..a902af023f 100644
--- a/src/server/api/endpoints/following/create.ts
+++ b/src/server/api/endpoints/following/create.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { pack, ILocalUser } from '../../../../models/user';
 import Following from '../../../../models/following';
 import create from '../../../../services/following/create';
diff --git a/src/server/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts
index 46fe13b2a9..f1d29e80b2 100644
--- a/src/server/api/endpoints/following/delete.ts
+++ b/src/server/api/endpoints/following/delete.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { pack, ILocalUser } from '../../../../models/user';
 import Following from '../../../../models/following';
 import deleteFollowing from '../../../../services/following/delete';
diff --git a/src/server/api/endpoints/following/requests/accept.ts b/src/server/api/endpoints/following/requests/accept.ts
index 722fdac607..49c29160b1 100644
--- a/src/server/api/endpoints/following/requests/accept.ts
+++ b/src/server/api/endpoints/following/requests/accept.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import acceptFollowRequest from '../../../../../services/following/requests/accept';
 import User, { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts
index 88c1b57f43..6c3539d757 100644
--- a/src/server/api/endpoints/following/requests/cancel.ts
+++ b/src/server/api/endpoints/following/requests/cancel.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import cancelFollowRequest from '../../../../../services/following/requests/cancel';
 import User, { pack, ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/following/requests/reject.ts b/src/server/api/endpoints/following/requests/reject.ts
index 7b7db2909d..f92ea52d46 100644
--- a/src/server/api/endpoints/following/requests/reject.ts
+++ b/src/server/api/endpoints/following/requests/reject.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import rejectFollowRequest from '../../../../../services/following/requests/reject';
 import User, { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/following/stalk.ts b/src/server/api/endpoints/following/stalk.ts
index 19c71cfd5a..eb4afb3116 100644
--- a/src/server/api/endpoints/following/stalk.ts
+++ b/src/server/api/endpoints/following/stalk.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Following from '../../../../models/following';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/following/unstalk.ts b/src/server/api/endpoints/following/unstalk.ts
index 03ee107835..b44ef68b96 100644
--- a/src/server/api/endpoints/following/unstalk.ts
+++ b/src/server/api/endpoints/following/unstalk.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Following from '../../../../models/following';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/games/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts
index 585e833ef1..50a8faa88c 100644
--- a/src/server/api/endpoints/games/reversi/games.ts
+++ b/src/server/api/endpoints/games/reversi/games.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import ReversiGame, { pack } from '../../../../../models/games/reversi/game';
 import { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/games/reversi/games/show.ts b/src/server/api/endpoints/games/reversi/games/show.ts
index 62c37f8e0a..8d7cd987a0 100644
--- a/src/server/api/endpoints/games/reversi/games/show.ts
+++ b/src/server/api/endpoints/games/reversi/games/show.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../../misc/cafy-id';
 import ReversiGame, { pack } from '../../../../../../models/games/reversi/game';
 import Reversi from '../../../../../../games/reversi/core';
 import { ILocalUser } from '../../../../../../models/user';
diff --git a/src/server/api/endpoints/games/reversi/match.ts b/src/server/api/endpoints/games/reversi/match.ts
index 77c014143a..4364531516 100644
--- a/src/server/api/endpoints/games/reversi/match.ts
+++ b/src/server/api/endpoints/games/reversi/match.ts
@@ -1,8 +1,8 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching';
 import ReversiGame, { pack as packGame } from '../../../../../models/games/reversi/game';
 import User, { ILocalUser } from '../../../../../models/user';
-import publishUserStream, { publishReversiStream } from '../../../../../publishers/stream';
+import publishUserStream, { publishReversiStream } from '../../../../../stream';
 import { eighteight } from '../../../../../games/reversi/maps';
 
 export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts
index 75b456ca58..d37632822a 100644
--- a/src/server/api/endpoints/i/favorites.ts
+++ b/src/server/api/endpoints/i/favorites.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Favorite, { pack } from '../../../../models/favorite';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index 1073b0369f..6a1ba07a3a 100644
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Notification from '../../../../models/notification';
 import Mute from '../../../../models/mute';
 import { pack } from '../../../../models/notification';
diff --git a/src/server/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts
index 1edc571737..ae03a86336 100644
--- a/src/server/api/endpoints/i/pin.ts
+++ b/src/server/api/endpoints/i/pin.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { ILocalUser } from '../../../../models/user';
 import Note from '../../../../models/note';
 import { pack } from '../../../../models/user';
diff --git a/src/server/api/endpoints/i/regenerate_token.ts b/src/server/api/endpoints/i/regenerate_token.ts
index 1f68e3abd7..5c30c4f496 100644
--- a/src/server/api/endpoints/i/regenerate_token.ts
+++ b/src/server/api/endpoints/i/regenerate_token.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import User, { ILocalUser } from '../../../../models/user';
-import event from '../../../../publishers/stream';
+import event from '../../../../stream';
 import generateUserToken from '../../common/generate-native-user-token';
 
 /**
diff --git a/src/server/api/endpoints/i/signin_history.ts b/src/server/api/endpoints/i/signin_history.ts
index 1315a2cfb6..a99a9e81ec 100644
--- a/src/server/api/endpoints/i/signin_history.ts
+++ b/src/server/api/endpoints/i/signin_history.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Signin, { pack } from '../../../../models/signin';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 08d17fa854..6d6cf3e4c5 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -1,6 +1,6 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack, ILocalUser } from '../../../../models/user';
-import event from '../../../../publishers/stream';
+import event from '../../../../stream';
 import DriveFile from '../../../../models/drive-file';
 import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
 import { IApp } from '../../../../models/app';
diff --git a/src/server/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts
index edcd3e7423..affaee37ee 100644
--- a/src/server/api/endpoints/i/update_client_setting.ts
+++ b/src/server/api/endpoints/i/update_client_setting.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import User, { ILocalUser } from '../../../../models/user';
-import event from '../../../../publishers/stream';
+import event from '../../../../stream';
 
 /**
  * Update myself
diff --git a/src/server/api/endpoints/i/update_home.ts b/src/server/api/endpoints/i/update_home.ts
index 03795ae8d9..c41ae7b3e8 100644
--- a/src/server/api/endpoints/i/update_home.ts
+++ b/src/server/api/endpoints/i/update_home.ts
@@ -1,16 +1,15 @@
 import $ from 'cafy';
 import User, { ILocalUser } from '../../../../models/user';
-import event from '../../../../publishers/stream';
+import event from '../../../../stream';
 
 export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	// Get 'home' parameter
-	const [home, homeErr] = $.arr(
-		$.obj.strict()
-			.have('name', $.str)
-			.have('id', $.str)
-			.have('place', $.str)
-			.have('data', $.obj))
-		.get(params.home);
+	const [home, homeErr] = $.arr($.obj({
+		name: $.str,
+		id: $.str,
+		place: $.str,
+		data: $.obj()
+	}).strict()).get(params.home);
 	if (homeErr) return rej('invalid home param');
 
 	await User.update(user._id, {
diff --git a/src/server/api/endpoints/i/update_mobile_home.ts b/src/server/api/endpoints/i/update_mobile_home.ts
index a2e2a13465..ca61e52600 100644
--- a/src/server/api/endpoints/i/update_mobile_home.ts
+++ b/src/server/api/endpoints/i/update_mobile_home.ts
@@ -1,15 +1,14 @@
 import $ from 'cafy';
 import User, { ILocalUser } from '../../../../models/user';
-import event from '../../../../publishers/stream';
+import event from '../../../../stream';
 
 export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	// Get 'home' parameter
-	const [home, homeErr] = $.arr(
-		$.obj.strict()
-			.have('name', $.str)
-			.have('id', $.str)
-			.have('data', $.obj))
-		.get(params.home);
+	const [home, homeErr] = $.arr($.obj({
+		name: $.str,
+		id: $.str,
+		data: $.obj()
+	}).strict()).get(params.home);
 	if (homeErr) return rej('invalid home param');
 
 	await User.update(user._id, {
diff --git a/src/server/api/endpoints/i/update_widget.ts b/src/server/api/endpoints/i/update_widget.ts
index 006916c9fe..a413ca7e9b 100644
--- a/src/server/api/endpoints/i/update_widget.ts
+++ b/src/server/api/endpoints/i/update_widget.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import User, { ILocalUser } from '../../../../models/user';
-import event from '../../../../publishers/stream';
+import event from '../../../../stream';
 
 export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
 	// Get 'id' parameter
@@ -8,7 +8,7 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	if (idErr) return rej('invalid id param');
 
 	// Get 'data' parameter
-	const [data, dataErr] = $.obj.get(params.data);
+	const [data, dataErr] = $.obj().get(params.data);
 	if (dataErr) return rej('invalid data param');
 
 	if (id == null && data == null) return rej('you need to set id and data params if home param unset');
diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts
index 6ac1cc980a..083fcd83f5 100644
--- a/src/server/api/endpoints/messaging/messages.ts
+++ b/src/server/api/endpoints/messaging/messages.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Message from '../../../../models/messaging-message';
 import User, { ILocalUser } from '../../../../models/user';
 import { pack } from '../../../../models/messaging-message';
diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index bcbbd9a1f4..c3d9824d69 100644
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import Message from '../../../../../models/messaging-message';
 import { isValidText } from '../../../../../models/messaging-message';
 import History from '../../../../../models/messaging-history';
@@ -6,9 +6,9 @@ import User, { ILocalUser } from '../../../../../models/user';
 import Mute from '../../../../../models/mute';
 import DriveFile from '../../../../../models/drive-file';
 import { pack } from '../../../../../models/messaging-message';
-import publishUserStream from '../../../../../publishers/stream';
-import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../publishers/stream';
-import pushSw from '../../../../../publishers/push-sw';
+import publishUserStream from '../../../../../stream';
+import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../stream';
+import pushSw from '../../../../../push-sw';
 import config from '../../../../../config';
 
 /**
@@ -116,7 +116,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 	}, 3000);
 
 	// Register to search database
-	if (message.text && config.elasticsearch.enable) {
+	if (message.text && config.elasticsearch) {
 		const es = require('../../../db/elasticsearch');
 
 		es.index({
diff --git a/src/server/api/endpoints/mute/create.ts b/src/server/api/endpoints/mute/create.ts
index 0f8d8fb09d..3e766bf170 100644
--- a/src/server/api/endpoints/mute/create.ts
+++ b/src/server/api/endpoints/mute/create.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { ILocalUser } from '../../../../models/user';
 import Mute from '../../../../models/mute';
 
diff --git a/src/server/api/endpoints/mute/delete.ts b/src/server/api/endpoints/mute/delete.ts
index bc3160c157..057baed2be 100644
--- a/src/server/api/endpoints/mute/delete.ts
+++ b/src/server/api/endpoints/mute/delete.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { ILocalUser } from '../../../../models/user';
 import Mute from '../../../../models/mute';
 
diff --git a/src/server/api/endpoints/mute/list.ts b/src/server/api/endpoints/mute/list.ts
index 89287c50a0..54ca84c61d 100644
--- a/src/server/api/endpoints/mute/list.ts
+++ b/src/server/api/endpoints/mute/list.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Mute from '../../../../models/mute';
 import { pack, ILocalUser } from '../../../../models/user';
 import { getFriendIds } from '../../common/get-friends';
diff --git a/src/server/api/endpoints/notes.ts b/src/server/api/endpoints/notes.ts
index dd8d09dcc4..029bc1a95e 100644
--- a/src/server/api/endpoints/notes.ts
+++ b/src/server/api/endpoints/notes.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import $ from 'cafy'; import ID from '../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../misc/cafy-id';
 import Note, { pack } from '../../../models/note';
 
 /**
diff --git a/src/server/api/endpoints/notes/conversation.ts b/src/server/api/endpoints/notes/conversation.ts
index e47b977279..2782d14155 100644
--- a/src/server/api/endpoints/notes/conversation.ts
+++ b/src/server/api/endpoints/notes/conversation.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note, { pack, INote } from '../../../../models/note';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index c2f128527e..2d331642c9 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note, { INote, isValidText, isValidCw, pack } from '../../../../models/note';
 import User, { ILocalUser, IUser } from '../../../../models/user';
 import DriveFile, { IDriveFile } from '../../../../models/drive-file';
diff --git a/src/server/api/endpoints/notes/delete.ts b/src/server/api/endpoints/notes/delete.ts
index 49907e4449..bebf7b2035 100644
--- a/src/server/api/endpoints/notes/delete.ts
+++ b/src/server/api/endpoints/notes/delete.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import deleteNote from '../../../../services/note/delete';
 import { ILocalUser } from '../../../../models/user';
diff --git a/src/server/api/endpoints/notes/favorites/create.ts b/src/server/api/endpoints/notes/favorites/create.ts
index 9ec75dbba6..280283d340 100644
--- a/src/server/api/endpoints/notes/favorites/create.ts
+++ b/src/server/api/endpoints/notes/favorites/create.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import Favorite from '../../../../../models/favorite';
 import Note from '../../../../../models/note';
 import { ILocalUser } from '../../../../../models/user';
diff --git a/src/server/api/endpoints/notes/favorites/delete.ts b/src/server/api/endpoints/notes/favorites/delete.ts
index f9916905bf..2cd00f876b 100644
--- a/src/server/api/endpoints/notes/favorites/delete.ts
+++ b/src/server/api/endpoints/notes/favorites/delete.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import Favorite from '../../../../../models/favorite';
 import Note from '../../../../../models/note';
 import { ILocalUser } from '../../../../../models/user';
diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts
index 6de83ddad0..b0068c8692 100644
--- a/src/server/api/endpoints/notes/global-timeline.ts
+++ b/src/server/api/endpoints/notes/global-timeline.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import Mute from '../../../../models/mute';
 import { pack } from '../../../../models/note';
diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts
index 3e96877c74..bbcc6303ca 100644
--- a/src/server/api/endpoints/notes/local-timeline.ts
+++ b/src/server/api/endpoints/notes/local-timeline.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import Mute from '../../../../models/mute';
 import { pack } from '../../../../models/note';
diff --git a/src/server/api/endpoints/notes/mentions.ts b/src/server/api/endpoints/notes/mentions.ts
index 82e3371ffa..c4e420602f 100644
--- a/src/server/api/endpoints/notes/mentions.ts
+++ b/src/server/api/endpoints/notes/mentions.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import { getFriendIds } from '../../common/get-friends';
 import { pack } from '../../../../models/note';
diff --git a/src/server/api/endpoints/notes/polls/vote.ts b/src/server/api/endpoints/notes/polls/vote.ts
index b86d319b37..4eb4b70eb9 100644
--- a/src/server/api/endpoints/notes/polls/vote.ts
+++ b/src/server/api/endpoints/notes/polls/vote.ts
@@ -1,10 +1,10 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import Vote from '../../../../../models/poll-vote';
 import Note from '../../../../../models/note';
 import Watching from '../../../../../models/note-watching';
 import watch from '../../../../../services/note/watch';
-import { publishNoteStream } from '../../../../../publishers/stream';
-import notify from '../../../../../publishers/notify';
+import { publishNoteStream } from '../../../../../stream';
+import notify from '../../../../..//notify';
 import { ILocalUser } from '../../../../../models/user';
 
 /**
diff --git a/src/server/api/endpoints/notes/reactions.ts b/src/server/api/endpoints/notes/reactions.ts
index 5e15ed3ec6..938ed6f514 100644
--- a/src/server/api/endpoints/notes/reactions.ts
+++ b/src/server/api/endpoints/notes/reactions.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import Reaction, { pack } from '../../../../models/note-reaction';
 import { ILocalUser } from '../../../../models/user';
diff --git a/src/server/api/endpoints/notes/reactions/create.ts b/src/server/api/endpoints/notes/reactions/create.ts
index 8b22e53225..f290ab00b4 100644
--- a/src/server/api/endpoints/notes/reactions/create.ts
+++ b/src/server/api/endpoints/notes/reactions/create.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import Note from '../../../../../models/note';
 import create from '../../../../../services/note/reaction/create';
 import { validateReaction } from '../../../../../models/note-reaction';
diff --git a/src/server/api/endpoints/notes/reactions/delete.ts b/src/server/api/endpoints/notes/reactions/delete.ts
index 81671751a0..6f662526d0 100644
--- a/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/src/server/api/endpoints/notes/reactions/delete.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import Reaction from '../../../../../models/note-reaction';
 import Note from '../../../../../models/note';
 import { ILocalUser } from '../../../../../models/user';
diff --git a/src/server/api/endpoints/notes/replies.ts b/src/server/api/endpoints/notes/replies.ts
index baefde3159..44c80afc4a 100644
--- a/src/server/api/endpoints/notes/replies.ts
+++ b/src/server/api/endpoints/notes/replies.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note, { pack } from '../../../../models/note';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/notes/reposts.ts b/src/server/api/endpoints/notes/reposts.ts
index 118e684a87..05e68302ba 100644
--- a/src/server/api/endpoints/notes/reposts.ts
+++ b/src/server/api/endpoints/notes/reposts.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note, { pack } from '../../../../models/note';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/notes/search_by_tag.ts b/src/server/api/endpoints/notes/search_by_tag.ts
index a6fcae5932..e092275fe8 100644
--- a/src/server/api/endpoints/notes/search_by_tag.ts
+++ b/src/server/api/endpoints/notes/search_by_tag.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import User, { ILocalUser } from '../../../../models/user';
 import Mute from '../../../../models/mute';
diff --git a/src/server/api/endpoints/notes/show.ts b/src/server/api/endpoints/notes/show.ts
index 0a27494962..3f94eeede5 100644
--- a/src/server/api/endpoints/notes/show.ts
+++ b/src/server/api/endpoints/notes/show.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note, { pack } from '../../../../models/note';
 import { ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts
index 43194c78c0..70908ef99f 100644
--- a/src/server/api/endpoints/notes/timeline.ts
+++ b/src/server/api/endpoints/notes/timeline.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import Mute from '../../../../models/mute';
 import { getFriends } from '../../common/get-friends';
diff --git a/src/server/api/endpoints/notes/user-list-timeline.ts b/src/server/api/endpoints/notes/user-list-timeline.ts
index 8a59857392..ef08f69c10 100644
--- a/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import Mute from '../../../../models/mute';
 import { pack } from '../../../../models/note';
diff --git a/src/server/api/endpoints/notifications/mark_as_read_all.ts b/src/server/api/endpoints/notifications/mark_as_read_all.ts
index 6e2b13fa8c..5011c72d54 100644
--- a/src/server/api/endpoints/notifications/mark_as_read_all.ts
+++ b/src/server/api/endpoints/notifications/mark_as_read_all.ts
@@ -1,5 +1,5 @@
 import Notification from '../../../../models/notification';
-import event from '../../../../publishers/stream';
+import event from '../../../../stream';
 import User, { ILocalUser } from '../../../../models/user';
 
 /**
diff --git a/src/server/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts
index f726976774..9411873573 100644
--- a/src/server/api/endpoints/users/followers.ts
+++ b/src/server/api/endpoints/users/followers.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { ILocalUser } from '../../../../models/user';
 import Following from '../../../../models/following';
 import { pack } from '../../../../models/user';
diff --git a/src/server/api/endpoints/users/following.ts b/src/server/api/endpoints/users/following.ts
index 1b2eb9c878..7a64d15d7b 100644
--- a/src/server/api/endpoints/users/following.ts
+++ b/src/server/api/endpoints/users/following.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { ILocalUser } from '../../../../models/user';
 import Following from '../../../../models/following';
 import { pack } from '../../../../models/user';
diff --git a/src/server/api/endpoints/users/get_frequently_replied_users.ts b/src/server/api/endpoints/users/get_frequently_replied_users.ts
index 98d662d29c..42b6ce20d6 100644
--- a/src/server/api/endpoints/users/get_frequently_replied_users.ts
+++ b/src/server/api/endpoints/users/get_frequently_replied_users.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import Note from '../../../../models/note';
 import User, { pack, ILocalUser } from '../../../../models/user';
 
diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts
index 0e7caea064..9e99d59fc1 100644
--- a/src/server/api/endpoints/users/lists/push.ts
+++ b/src/server/api/endpoints/users/lists/push.ts
@@ -1,7 +1,7 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import UserList from '../../../../../models/user-list';
 import User, { pack as packUser, isRemoteUser, getGhost, ILocalUser } from '../../../../../models/user';
-import { publishUserListStream } from '../../../../../publishers/stream';
+import { publishUserListStream } from '../../../../../stream';
 import ap from '../../../../../remote/activitypub/renderer';
 import renderFollow from '../../../../../remote/activitypub/renderer/follow';
 import { deliver } from '../../../../../queue';
diff --git a/src/server/api/endpoints/users/lists/show.ts b/src/server/api/endpoints/users/lists/show.ts
index 4716dd8211..f432cf44fb 100644
--- a/src/server/api/endpoints/users/lists/show.ts
+++ b/src/server/api/endpoints/users/lists/show.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
 import UserList, { pack } from '../../../../../models/user-list';
 import { ILocalUser } from '../../../../../models/user';
 
diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts
index 6d8d85ff5c..c60050d3cd 100644
--- a/src/server/api/endpoints/users/notes.ts
+++ b/src/server/api/endpoints/users/notes.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import getHostLower from '../../common/get-host-lower';
 import Note, { pack } from '../../../../models/note';
 import User, { ILocalUser } from '../../../../models/user';
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index 276e7c325b..8ec0eb8dd9 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../cafy-id';
+import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
 import User, { pack, ILocalUser } from '../../../../models/user';
 import resolveRemoteUser from '../../../../remote/resolve-user';
 
diff --git a/src/server/api/limitter.ts b/src/server/api/limitter.ts
index b84e16ecde..55cb660700 100644
--- a/src/server/api/limitter.ts
+++ b/src/server/api/limitter.ts
@@ -2,7 +2,7 @@ import * as Limiter from 'ratelimiter';
 import * as debug from 'debug';
 import limiterDB from '../../db/redis';
 import { Endpoint } from './endpoints';
-import getAcct from '../../acct/render';
+import getAcct from '../../misc/acct/render';
 import { IUser } from '../../models/user';
 
 const log = debug('misskey:limitter');
diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts
index 5450c7ad27..5abb96d029 100644
--- a/src/server/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@@ -3,7 +3,7 @@ import * as bcrypt from 'bcryptjs';
 import * as speakeasy from 'speakeasy';
 import User, { ILocalUser } from '../../../models/user';
 import Signin, { pack } from '../../../models/signin';
-import event from '../../../publishers/stream';
+import event from '../../../stream';
 import signin from '../common/signin';
 import config from '../../../config';
 
diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts
index 8c35509cce..080f5879a3 100644
--- a/src/server/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@@ -4,7 +4,7 @@ import * as uuid from 'uuid';
 import autwh from 'autwh';
 import redis from '../../../db/redis';
 import User, { pack, ILocalUser } from '../../../models/user';
-import event from '../../../publishers/stream';
+import event from '../../../stream';
 import config from '../../../config';
 import signin from '../common/signin';
 
diff --git a/src/server/api/stream/reversi-game.ts b/src/server/api/stream/reversi-game.ts
index 7a09e55ecd..faa4e2f38a 100644
--- a/src/server/api/stream/reversi-game.ts
+++ b/src/server/api/stream/reversi-game.ts
@@ -2,7 +2,7 @@ import * as websocket from 'websocket';
 import * as redis from 'redis';
 import * as CRC32 from 'crc-32';
 import ReversiGame, { pack } from '../../../models/games/reversi/game';
-import { publishReversiGameStream } from '../../../publishers/stream';
+import { publishReversiGameStream } from '../../../stream';
 import Reversi from '../../../games/reversi/core';
 import * as maps from '../../../games/reversi/maps';
 import { ParsedUrlQuery } from 'querystring';
diff --git a/src/server/api/stream/reversi.ts b/src/server/api/stream/reversi.ts
index 4e450297ff..a76685d51f 100644
--- a/src/server/api/stream/reversi.ts
+++ b/src/server/api/stream/reversi.ts
@@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
 import * as websocket from 'websocket';
 import * as redis from 'redis';
 import Matching, { pack } from '../../../models/games/reversi/matching';
-import publishUserStream from '../../../publishers/stream';
+import publishUserStream from '../../../stream';
 
 export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
 	// Subscribe reversi stream
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 4400fc1024..f54575e7ef 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -11,11 +11,11 @@ import * as views from 'koa-views';
 
 import docs from './docs';
 import User from '../../models/user';
-import parseAcct from '../../acct/parse';
+import parseAcct from '../../misc/acct/parse';
 import { fa } from '../../build/fa';
 import config from '../../config';
 import Note, { pack as packNote } from '../../models/note';
-import getNoteSummary from '../../renderers/get-note-summary';
+import getNoteSummary from '../../misc/get-note-summary';
 const consts = require('../../const.json');
 
 const client = `${__dirname}/../../client/`;
diff --git a/src/server/webfinger.ts b/src/server/webfinger.ts
index ce0cb82fe2..6c2afae79c 100644
--- a/src/server/webfinger.ts
+++ b/src/server/webfinger.ts
@@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
 import * as Router from 'koa-router';
 
 import config from '../config';
-import parseAcct from '../acct/parse';
+import parseAcct from '../misc/acct/parse';
 import User, { IUser } from '../models/user';
 
 // Init router
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 4167df0662..57c6589176 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -12,7 +12,7 @@ const prominence = require('prominence');
 import DriveFile, { IMetadata, getDriveFileBucket, IDriveFile } from '../../models/drive-file';
 import DriveFolder from '../../models/drive-folder';
 import { pack } from '../../models/drive-file';
-import event, { publishDriveStream } from '../../publishers/stream';
+import event, { publishDriveStream } from '../../stream';
 import { isLocalUser, IUser, IRemoteUser } from '../../models/user';
 import { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';
 import genThumbnail from '../../drive/gen-thumbnail';
diff --git a/src/services/following/create.ts b/src/services/following/create.ts
index 03db72c332..aa25ed8f91 100644
--- a/src/services/following/create.ts
+++ b/src/services/following/create.ts
@@ -2,8 +2,8 @@ import User, { isLocalUser, isRemoteUser, pack as packUser, IUser } from '../../
 import Following from '../../models/following';
 import FollowingLog from '../../models/following-log';
 import FollowedLog from '../../models/followed-log';
-import event from '../../publishers/stream';
-import notify from '../../publishers/notify';
+import event from '../../stream';
+import notify from '../..//notify';
 import pack from '../../remote/activitypub/renderer';
 import renderFollow from '../../remote/activitypub/renderer/follow';
 import renderAccept from '../../remote/activitypub/renderer/accept';
diff --git a/src/services/following/delete.ts b/src/services/following/delete.ts
index 4fc5d42476..75f2557519 100644
--- a/src/services/following/delete.ts
+++ b/src/services/following/delete.ts
@@ -2,7 +2,7 @@ import User, { isLocalUser, isRemoteUser, pack as packUser, IUser } from '../../
 import Following from '../../models/following';
 import FollowingLog from '../../models/following-log';
 import FollowedLog from '../../models/followed-log';
-import event from '../../publishers/stream';
+import event from '../../stream';
 import pack from '../../remote/activitypub/renderer';
 import renderFollow from '../../remote/activitypub/renderer/follow';
 import renderUndo from '../../remote/activitypub/renderer/undo';
diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts
index 2eaccbbd36..c874adc167 100644
--- a/src/services/following/requests/accept.ts
+++ b/src/services/following/requests/accept.ts
@@ -7,7 +7,7 @@ import { deliver } from '../../../queue';
 import Following from '../../../models/following';
 import FollowingLog from '../../../models/following-log';
 import FollowedLog from '../../../models/followed-log';
-import event from '../../../publishers/stream';
+import event from '../../../stream';
 
 export default async function(followee: IUser, follower: IUser) {
 	const following = await Following.insert({
diff --git a/src/services/following/requests/cancel.ts b/src/services/following/requests/cancel.ts
index 7e9dc5630f..1a4c0033dc 100644
--- a/src/services/following/requests/cancel.ts
+++ b/src/services/following/requests/cancel.ts
@@ -4,7 +4,7 @@ import pack from '../../../remote/activitypub/renderer';
 import renderFollow from '../../../remote/activitypub/renderer/follow';
 import renderUndo from '../../../remote/activitypub/renderer/undo';
 import { deliver } from '../../../queue';
-import event from '../../../publishers/stream';
+import event from '../../../stream';
 
 export default async function(followee: IUser, follower: IUser) {
 	if (isRemoteUser(followee)) {
diff --git a/src/services/following/requests/create.ts b/src/services/following/requests/create.ts
index fea82b57d8..a309229872 100644
--- a/src/services/following/requests/create.ts
+++ b/src/services/following/requests/create.ts
@@ -1,6 +1,6 @@
 import User, { isLocalUser, isRemoteUser, pack as packUser, IUser } from '../../../models/user';
-import event from '../../../publishers/stream';
-import notify from '../../../publishers/notify';
+import event from '../../../stream';
+import notify from '../../..//notify';
 import pack from '../../../remote/activitypub/renderer';
 import renderFollow from '../../../remote/activitypub/renderer/follow';
 import { deliver } from '../../../queue';
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 89f9a91c9b..61260b8b96 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -1,7 +1,7 @@
 import es from '../../db/elasticsearch';
 import Note, { pack, INote } from '../../models/note';
 import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user';
-import stream, { publishLocalTimelineStream, publishGlobalTimelineStream, publishUserListStream } from '../../publishers/stream';
+import stream, { publishLocalTimelineStream, publishGlobalTimelineStream, publishUserListStream } from '../../stream';
 import Following from '../../models/following';
 import { deliver } from '../../queue';
 import renderNote from '../../remote/activitypub/renderer/note';
@@ -9,11 +9,11 @@ import renderCreate from '../../remote/activitypub/renderer/create';
 import renderAnnounce from '../../remote/activitypub/renderer/announce';
 import packAp from '../../remote/activitypub/renderer';
 import { IDriveFile } from '../../models/drive-file';
-import notify from '../../publishers/notify';
+import notify from '../..//notify';
 import NoteWatching from '../../models/note-watching';
 import watch from './watch';
 import Mute from '../../models/mute';
-import event from '../../publishers/stream';
+import event from '../../stream';
 import parse from '../../mfm/parse';
 import { IApp } from '../../models/app';
 import UserList from '../../models/user-list';
diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts
index 3e928303d2..83f6cde88e 100644
--- a/src/services/note/delete.ts
+++ b/src/services/note/delete.ts
@@ -1,6 +1,6 @@
 import Note, { INote } from '../../models/note';
 import { IUser, isLocalUser } from '../../models/user';
-import { publishNoteStream } from '../../publishers/stream';
+import { publishNoteStream } from '../../stream';
 import renderDelete from '../../remote/activitypub/renderer/delete';
 import pack from '../../remote/activitypub/renderer';
 import { deliver } from '../../queue';
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index b3235e94dc..6d1f25470e 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -1,8 +1,8 @@
 import { IUser, isLocalUser, isRemoteUser } from '../../../models/user';
 import Note, { INote } from '../../../models/note';
 import NoteReaction from '../../../models/note-reaction';
-import { publishNoteStream } from '../../../publishers/stream';
-import notify from '../../../publishers/notify';
+import { publishNoteStream } from '../../../stream';
+import notify from '../../..//notify';
 import NoteWatching from '../../../models/note-watching';
 import watch from '../watch';
 import renderLike from '../../../remote/activitypub/renderer/like';
diff --git a/src/stream.ts b/src/stream.ts
new file mode 100644
index 0000000000..da2f9aecd7
--- /dev/null
+++ b/src/stream.ts
@@ -0,0 +1,77 @@
+import * as mongo from 'mongodb';
+import * as redis from 'redis';
+import config from './config';
+
+type ID = string | mongo.ObjectID;
+
+class MisskeyEvent {
+	private redisClient: redis.RedisClient;
+
+	constructor() {
+		// Connect to Redis
+		this.redisClient = redis.createClient(
+			config.redis.port, config.redis.host);
+	}
+
+	public publishUserStream(userId: ID, type: string, value?: any): void {
+		this.publish(`user-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishDriveStream(userId: ID, type: string, value?: any): void {
+		this.publish(`drive-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishNoteStream(noteId: ID, type: string, value?: any): void {
+		this.publish(`note-stream:${noteId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishUserListStream(listId: ID, type: string, value?: any): void {
+		this.publish(`user-list-stream:${listId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishMessagingStream(userId: ID, otherpartyId: ID, type: string, value?: any): void {
+		this.publish(`messaging-stream:${userId}-${otherpartyId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishMessagingIndexStream(userId: ID, type: string, value?: any): void {
+		this.publish(`messaging-index-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishReversiStream(userId: ID, type: string, value?: any): void {
+		this.publish(`reversi-stream:${userId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishReversiGameStream(gameId: ID, type: string, value?: any): void {
+		this.publish(`reversi-game-stream:${gameId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	public publishLocalTimelineStream(note: any): void {
+		this.redisClient.publish('misskey:local-timeline', JSON.stringify(note));
+	}
+
+	public publishGlobalTimelineStream(note: any): void {
+		this.redisClient.publish('misskey:global-timeline', JSON.stringify(note));
+	}
+
+	private publish(channel: string, type: string, value?: any): void {
+		const message = value == null ?
+			{ type: type } :
+			{ type: type, body: value };
+
+		this.redisClient.publish(`misskey:${channel}`, JSON.stringify(message));
+	}
+}
+
+const ev = new MisskeyEvent();
+
+export default ev.publishUserStream.bind(ev);
+
+export const publishLocalTimelineStream = ev.publishLocalTimelineStream.bind(ev);
+export const publishGlobalTimelineStream = ev.publishGlobalTimelineStream.bind(ev);
+export const publishDriveStream = ev.publishDriveStream.bind(ev);
+export const publishUserListStream = ev.publishUserListStream.bind(ev);
+export const publishNoteStream = ev.publishNoteStream.bind(ev);
+export const publishMessagingStream = ev.publishMessagingStream.bind(ev);
+export const publishMessagingIndexStream = ev.publishMessagingIndexStream.bind(ev);
+export const publishReversiStream = ev.publishReversiStream.bind(ev);
+export const publishReversiGameStream = ev.publishReversiGameStream.bind(ev);
diff --git a/src/utils/cli/indicator.ts b/src/utils/cli/indicator.ts
deleted file mode 100644
index 3e23f9b274..0000000000
--- a/src/utils/cli/indicator.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import * as readline from 'readline';
-
-/**
- * Indicator
- */
-export default class {
-	private clock: NodeJS.Timer;
-
-	constructor(text: string) {
-		let i = 0; // Dots counter
-
-		draw();
-		this.clock = setInterval(draw, 300);
-
-		function draw(): void {
-			cll();
-			i = (i + 1) % 4;
-			const dots = new Array(i + 1).join('.');
-			process.stdout.write(text + dots); // Write text
-		}
-	}
-
-	public end(): void {
-		clearInterval(this.clock);
-		cll();
-	}
-}
-
-/**
- * Clear current line
- */
-function cll(): void {
-	readline.clearLine(process.stdout, 0); // Clear current text
-	readline.cursorTo(process.stdout, 0, null); // Move cursor to the head of line
-}
diff --git a/src/utils/cli/progressbar.ts b/src/utils/cli/progressbar.ts
deleted file mode 100644
index 72496fdedc..0000000000
--- a/src/utils/cli/progressbar.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { EventEmitter } from 'events';
-import * as readline from 'readline';
-import chalk from 'chalk';
-
-/**
- * Progress bar
- */
-export default class extends EventEmitter {
-	public max: number;
-	public value: number;
-	public text: string;
-	private indicator: number;
-
-	constructor(max: number, text: string = null) {
-		super();
-		this.max = max;
-		this.value = 0;
-		this.text = text;
-		this.indicator = 0;
-		this.draw();
-
-		const iclock = setInterval(() => {
-			this.indicator = (this.indicator + 1) % 4;
-			this.draw();
-		}, 200);
-
-		this.on('complete', () => {
-			clearInterval(iclock);
-		});
-	}
-
-	public increment(): void {
-		this.value++;
-		this.draw();
-
-		// Check if it is fulfilled
-		if (this.value === this.max) {
-			this.indicator = null;
-
-			cll();
-			process.stdout.write(`${this.render()} -> ${chalk.bold('Complete')}\n`);
-
-			this.emit('complete');
-		}
-	}
-
-	public draw(): void {
-		const str = this.render();
-		cll();
-		process.stdout.write(str);
-	}
-
-	private render(): string {
-		const width = 30;
-		const t = this.text ? `${this.text} ` : '';
-
-		const v = Math.floor((this.value / this.max) * width);
-		const vs = new Array(v + 1).join('*');
-
-		const p = width - v;
-		const ps = new Array(p + 1).join(' ');
-
-		const percentage = Math.floor((this.value / this.max) * 100);
-		const percentages = chalk.gray(`(${percentage} %)`);
-
-		let i: string;
-		switch (this.indicator) {
-			case 0: i = '-'; break;
-			case 1: i = '\\'; break;
-			case 2: i = '|'; break;
-			case 3: i = '/'; break;
-			case null: i = '+'; break;
-		}
-
-		return `${i} ${t}[${vs}${ps}] ${this.value} / ${this.max} ${percentages}`;
-	}
-}
-
-/**
- * Clear current line
- */
-function cll(): void {
-	readline.clearLine(process.stdout, 0); // Clear current text
-	readline.cursorTo(process.stdout, 0, null); // Move cursor to the head of line
-}
diff --git a/src/utils/dependencyInfo.ts b/src/utils/dependencyInfo.ts
deleted file mode 100644
index 89af0d20fb..0000000000
--- a/src/utils/dependencyInfo.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import Logger from './logger';
-import { execSync } from 'child_process';
-
-export default class {
-	private logger: Logger;
-
-	constructor() {
-		this.logger = new Logger('Deps');
-	}
-
-	public showAll(): void {
-		this.show('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version:? (.*)\r?\n/));
-		this.show('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/));
-		this.show('ImageMagick', 'magick -version', x => x.match(/^Version: ImageMagick (.+?)\r?\n/));
-	}
-
-	public show(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void {
-		try {
-			// ステータス0以外のときにexecSyncはstderrをコンソール上に出力してしまうので
-			// プロセスからのstderrをすべて無視するように stdio オプションをセット
-			const x = execSync(command, { stdio: ['pipe', 'pipe', 'ignore'] });
-			const ver = transform(x.toString());
-			if (ver != null) {
-				this.logger.info(`${serviceName} ${ver[1]} found`);
-			} else {
-				this.logger.warn(`${serviceName} not found`);
-				this.logger.warn(`Regexp used for version check of ${serviceName} is probably messed up`);
-			}
-		} catch (e) {
-			this.logger.warn(`${serviceName} not found`);
-		}
-	}
-}
diff --git a/src/utils/environmentInfo.ts b/src/utils/environmentInfo.ts
deleted file mode 100644
index e6084cde0e..0000000000
--- a/src/utils/environmentInfo.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import Logger from './logger';
-
-export default class {
-	public static show(): void {
-		const env = process.env.NODE_ENV;
-		const logger = new Logger('Env');
-		logger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`);
-
-		if (env !== 'production') {
-			logger.warn('The environment is not in production mode');
-			logger.warn('Do not use for production purpose');
-		}
-	}
-}
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
deleted file mode 100644
index fae1042c39..0000000000
--- a/src/utils/logger.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import chalk, { Chalk } from 'chalk';
-
-export type LogLevel = 'Error' | 'Warn' | 'Info';
-
-function toLevelColor(level: LogLevel): Chalk {
-	switch (level) {
-		case 'Error': return chalk.red;
-		case 'Warn': return chalk.yellow;
-		case 'Info': return chalk.blue;
-	}
-}
-
-export default class Logger {
-	private domain: string;
-
-	constructor(domain: string) {
-		this.domain = domain;
-	}
-
-	public static log(level: LogLevel, message: string): void {
-		const color = toLevelColor(level);
-		const time = (new Date()).toLocaleTimeString('ja-JP');
-		console.log(`[${time} ${color.bold(level.toUpperCase())}]: ${message}`);
-	}
-
-	public static error(message: string): void {
-		Logger.log('Error', message);
-	}
-
-	public static warn(message: string): void {
-		Logger.log('Warn', message);
-	}
-
-	public static info(message: string): void {
-		Logger.log('Info', message);
-	}
-
-	public log(level: LogLevel, message: string): void {
-		Logger.log(level, `[${this.domain}] ${message}`);
-	}
-
-	public error(message: string): void {
-		this.log('Error', message);
-	}
-
-	public warn(message: string): void {
-		this.log('Warn', message);
-	}
-
-	public info(message: string): void {
-		this.log('Info', message);
-	}
-}
diff --git a/src/utils/machineInfo.ts b/src/utils/machineInfo.ts
deleted file mode 100644
index 0c189cc7ca..0000000000
--- a/src/utils/machineInfo.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as os from 'os';
-import Logger from './logger';
-
-export default class {
-	public static show(): void {
-		const totalmem = (os.totalmem() / 1024 / 1024 / 1024).toFixed(1);
-		const freemem = (os.freemem() / 1024 / 1024 / 1024).toFixed(1);
-		const logger = new Logger('Machine');
-		logger.info(`Hostname: ${os.hostname()}`);
-		logger.info(`Platform: ${process.platform}`);
-		logger.info(`Architecture: ${process.arch}`);
-		logger.info(`Node.js: ${process.version}`);
-		logger.info(`CPU: ${os.cpus().length}core`);
-		logger.info(`MEM: ${totalmem}GB (available: ${freemem}GB)`);
-	}
-}
-- 
cgit v1.2.3-freya