diff options
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/bot/core.ts | 8 | ||||
| -rw-r--r-- | src/server/api/bot/interfaces/line.ts | 6 | ||||
| -rw-r--r-- | src/server/api/endpoints/drive/files/upload_from_url.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/othello/games/show.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/othello/match.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/create.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/show.ts | 2 | ||||
| -rw-r--r-- | src/server/api/limitter.ts | 2 | ||||
| -rw-r--r-- | src/server/api/stream/othello-game.ts | 4 |
9 files changed, 16 insertions, 16 deletions
diff --git a/src/server/api/bot/core.ts b/src/server/api/bot/core.ts index d636cc26e7..0faf9b4e4c 100644 --- a/src/server/api/bot/core.ts +++ b/src/server/api/bot/core.ts @@ -3,10 +3,10 @@ import * as bcrypt from 'bcryptjs'; import User, { IUser, init as initUser, ILocalUser } from '../../../models/user'; -import getPostSummary from '../../../common/get-post-summary'; -import getUserSummary from '../../../common/user/get-summary'; -import parseAcct from '../../../common/user/parse-acct'; -import getNotificationSummary from '../../../common/get-notification-summary'; +import getPostSummary from '../../../misc/get-post-summary'; +import getUserSummary from '../../../misc/user/get-summary'; +import parseAcct from '../../../misc/user/parse-acct'; +import getNotificationSummary from '../../../misc/get-notification-summary'; const hmm = [ '?', diff --git a/src/server/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts index 58fbb217bc..a6e70a138f 100644 --- a/src/server/api/bot/interfaces/line.ts +++ b/src/server/api/bot/interfaces/line.ts @@ -7,9 +7,9 @@ import config from '../../../../conf'; import BotCore from '../core'; import _redis from '../../../../db/redis'; import prominence = require('prominence'); -import getAcct from '../../../../common/user/get-acct'; -import parseAcct from '../../../../common/user/parse-acct'; -import getPostSummary from '../../../../common/get-post-summary'; +import getAcct from '../../../../misc/user/get-acct'; +import parseAcct from '../../../../misc/user/parse-acct'; +import getPostSummary from '../../../../misc/get-post-summary'; const redis = prominence(_redis); 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 01d8750553..ceb751a144 100644 --- a/src/server/api/endpoints/drive/files/upload_from_url.ts +++ b/src/server/api/endpoints/drive/files/upload_from_url.ts @@ -3,7 +3,7 @@ */ import $ from 'cafy'; import { pack } from '../../../../../models/drive-file'; -import uploadFromUrl from '../../../../../common/drive/upload_from_url'; +import uploadFromUrl from '../../../../../common/drive/upload-from-url'; /** * Create a file from a URL diff --git a/src/server/api/endpoints/othello/games/show.ts b/src/server/api/endpoints/othello/games/show.ts index 0d3b539652..0b1c9bc356 100644 --- a/src/server/api/endpoints/othello/games/show.ts +++ b/src/server/api/endpoints/othello/games/show.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import OthelloGame, { pack } from '../../../../../models/othello-game'; -import Othello from '../../../../../common/othello/core'; +import Othello from '../../../../../misc/othello/core'; module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'gameId' parameter diff --git a/src/server/api/endpoints/othello/match.ts b/src/server/api/endpoints/othello/match.ts index 992b93d418..d9c46aae13 100644 --- a/src/server/api/endpoints/othello/match.ts +++ b/src/server/api/endpoints/othello/match.ts @@ -3,7 +3,7 @@ import Matching, { pack as packMatching } from '../../../../models/othello-match import OthelloGame, { pack as packGame } from '../../../../models/othello-game'; import User from '../../../../models/user'; import publishUserStream, { publishOthelloStream } from '../../../../common/event'; -import { eighteight } from '../../../../common/othello/maps'; +import { eighteight } from '../../../../misc/othello/maps'; module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'userId' parameter diff --git a/src/server/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts index 4de9176947..c2e790a241 100644 --- a/src/server/api/endpoints/posts/create.ts +++ b/src/server/api/endpoints/posts/create.ts @@ -17,8 +17,8 @@ import { pack } from '../../../../models/post'; import watch from '../../common/watch-post'; import event, { pushSw, publishChannelStream } from '../../../../common/event'; import notify from '../../../../common/notify'; -import getAcct from '../../../../common/user/get-acct'; -import parseAcct from '../../../../common/user/parse-acct'; +import getAcct from '../../../../misc/user/get-acct'; +import parseAcct from '../../../../misc/user/parse-acct'; import config from '../../../../conf'; /** diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts index f7b37193b8..2b02799378 100644 --- a/src/server/api/endpoints/users/show.ts +++ b/src/server/api/endpoints/users/show.ts @@ -3,7 +3,7 @@ */ import $ from 'cafy'; import User, { pack } from '../../../../models/user'; -import resolveRemoteUser from '../../../../common/remote/resolve-user'; +import resolveRemoteUser from '../../../../remote/resolve-user'; const cursorOption = { fields: { data: false } }; diff --git a/src/server/api/limitter.ts b/src/server/api/limitter.ts index 88ea6c3679..93e03f5e4f 100644 --- a/src/server/api/limitter.ts +++ b/src/server/api/limitter.ts @@ -3,7 +3,7 @@ import * as debug from 'debug'; import limiterDB from '../../db/redis'; import { Endpoint } from './endpoints'; import { IAuthContext } from './authenticate'; -import getAcct from '../../common/user/get-acct'; +import getAcct from '../../misc/user/get-acct'; const log = debug('misskey:limitter'); diff --git a/src/server/api/stream/othello-game.ts b/src/server/api/stream/othello-game.ts index b11915f8ff..00367a824e 100644 --- a/src/server/api/stream/othello-game.ts +++ b/src/server/api/stream/othello-game.ts @@ -3,8 +3,8 @@ import * as redis from 'redis'; import * as CRC32 from 'crc-32'; import OthelloGame, { pack } from '../../../models/othello-game'; import { publishOthelloGameStream } from '../../../common/event'; -import Othello from '../../../common/othello/core'; -import * as maps from '../../../common/othello/maps'; +import Othello from '../../../misc/othello/core'; +import * as maps from '../../../misc/othello/maps'; import { ParsedUrlQuery } from 'querystring'; export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user?: any): void { |