summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-23 08:13:17 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-23 08:13:17 +0900
commit0d272b1fb05c4098c31feb92ade9efa3bdfc9675 (patch)
tree4f3fb7e0567f56c8b2ffad3cec44416f7cc617d1 /src/server/web
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadsharkey-0d272b1fb05c4098c31feb92ade9efa3bdfc9675.tar.gz
sharkey-0d272b1fb05c4098c31feb92ade9efa3bdfc9675.tar.bz2
sharkey-0d272b1fb05c4098c31feb92ade9efa3bdfc9675.zip
Resolve #3376
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/url-preview.ts7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index eb835b05ac..7be9a75765 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -2,11 +2,14 @@ import * as Koa from 'koa';
import * as request from 'request-promise-native';
import summaly from 'summaly';
import config from '../../config';
+import fetchMeta from '../../misc/fetch-meta';
module.exports = async (ctx: Koa.Context) => {
+ const meta = await fetchMeta();
+
try {
- const summary = config.summalyProxy ? await request.get({
- url: config.summalyProxy,
+ const summary = meta.summalyProxy ? await request.get({
+ url: meta.summalyProxy,
proxy: config.proxy,
qs: {
url: ctx.query.url