diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-04-02 13:18:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 13:18:01 +0900 |
| commit | 52262c7abc643b402a379738df4170f1f3dc94b5 (patch) | |
| tree | 2d44fc013296310c1a9baed62f45f89ec1fd179d /src/server/api/endpoints/i | |
| parent | Merge pull request #1361 from akihikodaki/misc (diff) | |
| parent | Introduce config module (diff) | |
| download | misskey-52262c7abc643b402a379738df4170f1f3dc94b5.tar.gz misskey-52262c7abc643b402a379738df4170f1f3dc94b5.tar.bz2 misskey-52262c7abc643b402a379738df4170f1f3dc94b5.zip | |
Merge pull request #1362 from akihikodaki/misc
Introduce config module
Diffstat (limited to 'src/server/api/endpoints/i')
| -rw-r--r-- | src/server/api/endpoints/i/2fa/register.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts index d2683fb617..dc7fb959bb 100644 --- a/src/server/api/endpoints/i/2fa/register.ts +++ b/src/server/api/endpoints/i/2fa/register.ts @@ -6,7 +6,7 @@ import * as bcrypt from 'bcryptjs'; import * as speakeasy from 'speakeasy'; import * as QRCode from 'qrcode'; import User from '../../../../../models/user'; -import config from '../../../../../conf'; +import config from '../../../../../config'; module.exports = async (params, user) => new Promise(async (res, rej) => { // Get 'password' parameter diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 76ceede8d9..c4ec413399 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -4,7 +4,7 @@ import $ from 'cafy'; import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user'; import event from '../../../../event'; -import config from '../../../../conf'; +import config from '../../../../config'; /** * Update myself |