Refactor

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

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

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

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 I18n from '../../misc/i18n';
-import { fa } from '../../build/fa';
+import { fa } from '../../misc/fa';
 import { licenseHtml } from '../../build/license';
 const constants = require('../../const.json');
 

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

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

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

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

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

webpack.config.ts

@@ -12,12 +12,12 @@ const WebpackOnBuildPlugin = require('on-build-webpack');
 //const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 
-import I18nReplacer from './src/build/i18n';
+import I18nReplacer from './src/misc/i18n';
 import { pattern as i18nPattern, replacement as i18nReplacement } from './webpack/i18n';
 import { pattern as faPattern, replacement as faReplacement } from './src/build/fa';
 const constants = require('./src/const.json');
 import config from './src/config';
-import { licenseHtml } from './src/build/license';
+import { licenseHtml } from './src/misc/license';
 
 const locales = require('./locales');
 const meta = require('./package.json');