From 8129d4dc2366aea07da60e21abe3440230387bfe Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 5 Feb 2019 14:14:23 +0900
Subject: Refactoring

---
 src/services/note/create.ts          | 4 ++--
 src/services/note/delete.ts          | 2 +-
 src/services/note/polls/vote.ts      | 4 ++--
 src/services/note/reaction/create.ts | 4 ++--
 src/services/note/reaction/delete.ts | 2 +-
 src/services/note/read.ts            | 2 +-
 src/services/note/unread.ts          | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/services/note')

diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 7b6120b1ed..9ccf3be9e8 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, IChoice } from '../../models/note';
 import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user';
-import { publishMainStream, publishHomeTimelineStream, publishLocalTimelineStream, publishHybridTimelineStream, publishGlobalTimelineStream, publishUserListStream, publishHashtagStream } from '../../stream';
+import { publishMainStream, publishHomeTimelineStream, publishLocalTimelineStream, publishHybridTimelineStream, publishGlobalTimelineStream, publishUserListStream, publishHashtagStream } from '../stream';
 import Following from '../../models/following';
 import { deliver } from '../../queue';
 import renderNote from '../../remote/activitypub/renderer/note';
@@ -9,7 +9,7 @@ import renderCreate from '../../remote/activitypub/renderer/create';
 import renderAnnounce from '../../remote/activitypub/renderer/announce';
 import { renderActivity } from '../../remote/activitypub/renderer';
 import DriveFile, { IDriveFile } from '../../models/drive-file';
-import notify from '../../notify';
+import notify from '../../services/create-notification';
 import NoteWatching from '../../models/note-watching';
 import watch from './watch';
 import Mute from '../../models/mute';
diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts
index aaaa79afdf..557872d751 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 '../../stream';
+import { publishNoteStream } from '../stream';
 import renderDelete from '../../remote/activitypub/renderer/delete';
 import { renderActivity } from '../../remote/activitypub/renderer';
 import { deliver } from '../../queue';
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index dafd59331e..115b071b45 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -2,8 +2,8 @@ import Vote from '../../../models/poll-vote';
 import Note, { INote } from '../../../models/note';
 import Watching from '../../../models/note-watching';
 import watch from '../../../services/note/watch';
-import { publishNoteStream } from '../../../stream';
-import notify from '../../../notify';
+import { publishNoteStream } from '../../stream';
+import notify from '../../../services/create-notification';
 import { isLocalUser, IUser } from '../../../models/user';
 
 export default (user: IUser, note: INote, choice: number) => new Promise(async (res, rej) => {
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index 96d1dd8e53..e6a9fe7d65 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 '../../../stream';
-import notify from '../../../notify';
+import { publishNoteStream } from '../../stream';
+import notify from '../../create-notification';
 import NoteWatching from '../../../models/note-watching';
 import watch from '../watch';
 import renderLike from '../../../remote/activitypub/renderer/like';
diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts
index 8689730433..ee3a9e13d8 100644
--- a/src/services/note/reaction/delete.ts
+++ b/src/services/note/reaction/delete.ts
@@ -1,7 +1,7 @@
 import { IUser, isLocalUser, isRemoteUser } from '../../../models/user';
 import Note, { INote } from '../../../models/note';
 import Reaction from '../../../models/note-reaction';
-import { publishNoteStream } from '../../../stream';
+import { publishNoteStream } from '../../stream';
 import renderLike from '../../../remote/activitypub/renderer/like';
 import renderUndo from '../../../remote/activitypub/renderer/undo';
 import { renderActivity } from '../../../remote/activitypub/renderer';
diff --git a/src/services/note/read.ts b/src/services/note/read.ts
index f2c1213363..8b52445cf0 100644
--- a/src/services/note/read.ts
+++ b/src/services/note/read.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import isObjectId from '../../misc/is-objectid';
-import { publishMainStream } from '../../stream';
+import { publishMainStream } from '../stream';
 import User from '../../models/user';
 import NoteUnread from '../../models/note-unread';
 
diff --git a/src/services/note/unread.ts b/src/services/note/unread.ts
index e84ac2a4bf..e70c63c765 100644
--- a/src/services/note/unread.ts
+++ b/src/services/note/unread.ts
@@ -2,7 +2,7 @@ import NoteUnread from '../../models/note-unread';
 import User, { IUser } from '../../models/user';
 import { INote } from '../../models/note';
 import Mute from '../../models/mute';
-import { publishMainStream } from '../../stream';
+import { publishMainStream } from '../stream';
 
 export default async function(user: IUser, note: INote, isSpecified = false) {
 	//#region ミュートしているなら無視
-- 
cgit v1.2.3-freya