6 files changed, 14 insertions, 14 deletions
diff --git a/src/server/api/common/drive/add-file.ts b/src/common/drive/add-file.ts
index 4551f55748..52a7713dd9 100644
--- a/src/server/api/common/drive/add-file.ts
+++ b/src/common/drive/add-file.ts
@@ -10,12 +10,12 @@ import * as debug from 'debug';
 import fileType = require('file-type');
 import prominence = require('prominence');
 
-import DriveFile, { getGridFSBucket } from '../../../../models/drive-file';
-import DriveFolder from '../../../../models/drive-folder';
-import { pack } from '../../../../models/drive-file';
-import event, { publishDriveStream } from '../../event';
-import getAcct from '../../../../common/user/get-acct';
-import config from '../../../../conf';
+import DriveFile, { getGridFSBucket } from '../../models/drive-file';
+import DriveFolder from '../../models/drive-folder';
+import { pack } from '../../models/drive-file';
+import event, { publishDriveStream } from '../event';
+import getAcct from '../user/get-acct';
+import config from '../../conf';
 
 const gm = _gm.subClass({
 	imageMagick: true
diff --git a/src/server/api/common/drive/upload_from_url.ts b/src/common/drive/upload_from_url.ts
index b825e4c531..5dd9695936 100644
--- a/src/server/api/common/drive/upload_from_url.ts
+++ b/src/common/drive/upload_from_url.ts
@@ -1,5 +1,5 @@
 import * as URL from 'url';
-import { IDriveFile, validateFileName } from '../../../../models/drive-file';
+import { IDriveFile, validateFileName } from '../../models/drive-file';
 import create from './add-file';
 import * as debug from 'debug';
 import * as tmp from 'tmp';
diff --git a/src/server/api/common/push-sw.ts b/src/common/push-sw.ts
index 13227af8d5..44c328e833 100644
--- a/src/server/api/common/push-sw.ts
+++ b/src/common/push-sw.ts
@@ -1,7 +1,7 @@
 const push = require('web-push');
 import * as mongo from 'mongodb';
-import Subscription from '../../../models/sw-subscription';
-import config from '../../../conf';
+import Subscription from '../models/sw-subscription';
+import config from '../conf';
 
 if (config.sw) {
 	// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
diff --git a/src/server/api/common/notify.ts b/src/server/api/common/notify.ts
index f90506cf3c..69bf8480b0 100644
--- a/src/server/api/common/notify.ts
+++ b/src/server/api/common/notify.ts
@@ -1,7 +1,7 @@
 import * as mongo from 'mongodb';
 import Notification from '../../../models/notification';
 import Mute from '../../../models/mute';
-import event from '../event';
+import event from '../../../common/event';
 import { pack } from '../../../models/notification';
 
 export default (
diff --git a/src/server/api/common/read-messaging-message.ts b/src/server/api/common/read-messaging-message.ts
index f728130bb3..127ea18651 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 '../event';
-import { publishMessagingStream } from '../event';
-import { publishMessagingIndexStream } from '../event';
+import publishUserStream from '../../../common/event';
+import { publishMessagingStream } from '../../../common/event';
+import { publishMessagingIndexStream } from '../../../common/event';
 
 /**
  * Mark as read message(s)
diff --git a/src/server/api/common/read-notification.ts b/src/server/api/common/read-notification.ts
index 27632c7ecd..9b2012182d 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 '../event';
+import publishUserStream from '../../../common/event';
 
 /**
  * Mark as read notification(s)