diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-04-02 13:46:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 13:46:31 +0900 |
| commit | 64da9afc334f6cab8701b89710b49688dbc069d6 (patch) | |
| tree | 00c3fa43af71e2fbd71940655d55adf5b8413887 /src/server/api | |
| parent | Merge pull request #1365 from akihikodaki/misc (diff) | |
| parent | Introduce acct directory (diff) | |
| download | misskey-64da9afc334f6cab8701b89710b49688dbc069d6.tar.gz misskey-64da9afc334f6cab8701b89710b49688dbc069d6.tar.bz2 misskey-64da9afc334f6cab8701b89710b49688dbc069d6.zip | |
Merge pull request #1366 from akihikodaki/misc
Introduce acct directory
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/bot/core.ts | 2 | ||||
| -rw-r--r-- | src/server/api/bot/interfaces/line.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/create.ts | 4 | ||||
| -rw-r--r-- | src/server/api/limitter.ts | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/api/bot/core.ts b/src/server/api/bot/core.ts index 7f9409660a..7e80f31e5e 100644 --- a/src/server/api/bot/core.ts +++ b/src/server/api/bot/core.ts @@ -5,7 +5,7 @@ import User, { IUser, init as initUser, ILocalUser } from '../../../models/user' import getPostSummary from '../../../renderers/get-post-summary'; import getUserSummary from '../../../renderers/get-user-summary'; -import parseAcct from '../../../user/parse-acct'; +import parseAcct from '../../../acct/parse'; import getNotificationSummary from '../../../renderers/get-notification-summary'; const hmm = [ diff --git a/src/server/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts index 17841a9f09..7847cbdeaa 100644 --- a/src/server/api/bot/interfaces/line.ts +++ b/src/server/api/bot/interfaces/line.ts @@ -7,8 +7,8 @@ import config from '../../../../config'; import BotCore from '../core'; import _redis from '../../../../db/redis'; import prominence = require('prominence'); -import getAcct from '../../../../user/get-acct'; -import parseAcct from '../../../../user/parse-acct'; +import getAcct from '../../../../acct/render'; +import parseAcct from '../../../../acct/parse'; import getPostSummary from '../../../../renderers/get-post-summary'; const redis = prominence(_redis); diff --git a/src/server/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts index 34a3aa1901..7c44e6f084 100644 --- a/src/server/api/endpoints/posts/create.ts +++ b/src/server/api/endpoints/posts/create.ts @@ -18,8 +18,8 @@ import watch from '../../common/watch-post'; import stream, { publishChannelStream } from '../../../../publishers/stream'; import notify from '../../../../publishers/notify'; import pushSw from '../../../../publishers/push-sw'; -import getAcct from '../../../../user/get-acct'; -import parseAcct from '../../../../user/parse-acct'; +import getAcct from '../../../../acct/render'; +import parseAcct from '../../../../acct/parse'; import config from '../../../../config'; /** diff --git a/src/server/api/limitter.ts b/src/server/api/limitter.ts index 81016457dc..638fac78be 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 '../../user/get-acct'; +import getAcct from '../../acct/render'; const log = debug('misskey:limitter'); |