summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-07-07 19:21:54 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-07-07 19:21:54 +0900
commitd92044cf6a68500c24e90da1b62b4bc6361f7d53 (patch)
treeeffcbec571821ae72cd40ca27f33871967accf0b /src
parentRefactorng (diff)
downloadsharkey-d92044cf6a68500c24e90da1b62b4bc6361f7d53.tar.gz
sharkey-d92044cf6a68500c24e90da1b62b4bc6361f7d53.tar.bz2
sharkey-d92044cf6a68500c24e90da1b62b4bc6361f7d53.zip
Refactor
Diffstat (limited to 'src')
-rw-r--r--src/misc/fa.ts (renamed from src/build/fa.ts)0
-rw-r--r--src/misc/get-user-summary.ts2
-rw-r--r--src/misc/i18n.ts (renamed from src/build/i18n.ts)0
-rw-r--r--src/misc/license.ts (renamed from src/build/license.ts)0
-rw-r--r--src/server/api/endpoints/notes/polls/vote.ts2
-rw-r--r--src/server/api/stream/reversi-game.ts2
-rw-r--r--src/server/web/docs.ts4
-rw-r--r--src/server/web/index.ts2
-rw-r--r--src/services/following/create.ts2
-rw-r--r--src/services/following/requests/create.ts2
-rw-r--r--src/services/note/create.ts2
-rw-r--r--src/services/note/reaction/create.ts2
12 files changed, 10 insertions, 10 deletions
diff --git a/src/build/fa.ts b/src/misc/fa.ts
index 077bb51e6d..077bb51e6d 100644
--- a/src/build/fa.ts
+++ b/src/misc/fa.ts
diff --git a/src/misc/get-user-summary.ts b/src/misc/get-user-summary.ts
index 625caf1f7e..87466d8bee 100644
--- a/src/misc/get-user-summary.ts
+++ b/src/misc/get-user-summary.ts
@@ -1,5 +1,5 @@
import { IUser, isLocalUser } from '../models/user';
-import getAcct from '../misc/acct/render';
+import getAcct from './acct/render
import getUserName from './get-user-name';
/**
diff --git a/src/build/i18n.ts b/src/misc/i18n.ts
index 4ed3c7a2df..4ed3c7a2df 100644
--- a/src/build/i18n.ts
+++ b/src/misc/i18n.ts
diff --git a/src/build/license.ts b/src/misc/license.ts
index d36af665cd..d36af665cd 100644
--- a/src/build/license.ts
+++ b/src/misc/license.ts
diff --git a/src/server/api/endpoints/notes/polls/vote.ts b/src/server/api/endpoints/notes/polls/vote.ts
index 4eb4b70eb9..8adecd7e89 100644
--- a/src/server/api/endpoints/notes/polls/vote.ts
+++ b/src/server/api/endpoints/notes/polls/vote.ts
@@ -4,7 +4,7 @@ import Note from '../../../../../models/note';
import Watching from '../../../../../models/note-watching';
import watch from '../../../../../services/note/watch';
import { publishNoteStream } from '../../../../../stream';
-import notify from '../../../../..//notify';
+import notify from '../../../../../notify;
import { ILocalUser } from '../../../../../models/user';
/**
diff --git a/src/server/api/stream/reversi-game.ts b/src/server/api/stream/reversi-game.ts
index faa4e2f38a..dc34eab673 100644
--- a/src/server/api/stream/reversi-game.ts
+++ b/src/server/api/stream/reversi-game.ts
@@ -1,6 +1,6 @@
import * as websocket from 'websocket';
import * as redis from 'redis';
-import * as CRC32 from 'crc-32';
+import * as CRC32 from 'crc-32/types/types';
import ReversiGame, { pack } from '../../../models/games/reversi/game';
import { publishReversiGameStream } from '../../../stream';
import Reversi from '../../../games/reversi/core';
diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts
index ceba14bd27..745d81b195 100644
--- a/src/server/web/docs.ts
+++ b/src/server/web/docs.ts
@@ -12,8 +12,8 @@ import * as glob from 'glob';
import * as yaml from 'js-yaml';
import ObjectContext from 'cafy/built/types/object';
import config from '../../config';
-import I18n from '../../build/i18n';
-import { fa } from '../../build/fa';
+import I18n from '../../misc/i18n';
+import { fa } from '../../misc/fa';
import { licenseHtml } from '../../build/license';
const constants = require('../../const.json');
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index f54575e7ef..7291f8a0a5 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -12,7 +12,7 @@ import * as views from 'koa-views';
import docs from './docs';
import User from '../../models/user';
import parseAcct from '../../misc/acct/parse';
-import { fa } from '../../build/fa';
+import { fa } from '../../misc/fa';
import config from '../../config';
import Note, { pack as packNote } from '../../models/note';
import getNoteSummary from '../../misc/get-note-summary';
diff --git a/src/services/following/create.ts b/src/services/following/create.ts
index aa25ed8f91..74d7ba159f 100644
--- a/src/services/following/create.ts
+++ b/src/services/following/create.ts
@@ -3,7 +3,7 @@ import Following from '../../models/following';
import FollowingLog from '../../models/following-log';
import FollowedLog from '../../models/followed-log';
import event from '../../stream';
-import notify from '../..//notify';
+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/requests/create.ts b/src/services/following/requests/create.ts
index a309229872..4e0de45e2f 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 '../../../stream';
-import notify from '../../..//notify';
+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 61260b8b96..6bb1fff5b2 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -9,7 +9,7 @@ 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 '../..//notify';
+import notify from '../../notify;
import NoteWatching from '../../models/note-watching';
import watch from './watch';
import Mute from '../../models/mute';
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index 6d1f25470e..84aaea83bf 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -2,7 +2,7 @@ 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 notify from '../../../notify;
import NoteWatching from '../../../models/note-watching';
import watch from '../watch';
import renderLike from '../../../remote/activitypub/renderer/like';