summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/i
diff options
context:
space:
mode:
authorAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
committerAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
commit3fb6834f7d06d52163102b69afe353f8c65ee003 (patch)
tree2d44fc013296310c1a9baed62f45f89ec1fd179d /src/server/api/endpoints/i
parentAbolish common and misc directories (diff)
downloadsharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.gz
sharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.bz2
sharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.zip
Introduce config module
Diffstat (limited to 'src/server/api/endpoints/i')
-rw-r--r--src/server/api/endpoints/i/2fa/register.ts2
-rw-r--r--src/server/api/endpoints/i/update.ts2
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