summaryrefslogtreecommitdiff
path: root/src/server/activitypub
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/activitypub
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/activitypub')
-rw-r--r--src/server/activitypub/outbox.ts2
-rw-r--r--src/server/activitypub/publickey.ts2
-rw-r--r--src/server/activitypub/user.ts2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts
index 2018d8797b..9ecb0c0711 100644
--- a/src/server/activitypub/outbox.ts
+++ b/src/server/activitypub/outbox.ts
@@ -2,7 +2,7 @@ import * as express from 'express';
import context from '../../remote/activitypub/renderer/context';
import renderNote from '../../remote/activitypub/renderer/note';
import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
-import config from '../../conf';
+import config from '../../config';
import Post from '../../models/post';
import withUser from './with-user';
diff --git a/src/server/activitypub/publickey.ts b/src/server/activitypub/publickey.ts
index a23d11c156..c564c437e6 100644
--- a/src/server/activitypub/publickey.ts
+++ b/src/server/activitypub/publickey.ts
@@ -1,7 +1,7 @@
import * as express from 'express';
import context from '../../remote/activitypub/renderer/context';
import render from '../../remote/activitypub/renderer/key';
-import config from '../../conf';
+import config from '../../config';
import withUser from './with-user';
const app = express();
diff --git a/src/server/activitypub/user.ts b/src/server/activitypub/user.ts
index 0d0b84bad4..baf2dc9a05 100644
--- a/src/server/activitypub/user.ts
+++ b/src/server/activitypub/user.ts
@@ -1,5 +1,5 @@
import * as express from 'express';
-import config from '../../conf';
+import config from '../../config';
import context from '../../remote/activitypub/renderer/context';
import render from '../../remote/activitypub/renderer/person';
import withUser from './with-user';