summaryrefslogtreecommitdiff
path: root/src/server/api/service
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/service
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/service')
-rw-r--r--src/server/api/service/github.ts2
-rw-r--r--src/server/api/service/twitter.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index b4068c729e..4fd59c2a94 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -2,7 +2,7 @@ import * as EventEmitter from 'events';
import * as express from 'express';
//const crypto = require('crypto');
import User from '../../../models/user';
-import config from '../../../conf';
+import config from '../../../config';
import queue from '../../../queue';
module.exports = async (app: express.Application) => {
diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts
index 61a1d56397..69fa5f3c67 100644
--- a/src/server/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@@ -7,7 +7,7 @@ import autwh from 'autwh';
import redis from '../../../db/redis';
import User, { pack } from '../../../models/user';
import event from '../../../event';
-import config from '../../../conf';
+import config from '../../../config';
import signin from '../common/signin';
module.exports = (app: express.Application) => {