summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2020-04-09 23:42:23 +0900
committerGitHub <noreply@github.com>2020-04-09 23:42:23 +0900
commitd3c0f3c251e8371d78d953f32f7311a38f4a1bdb (patch)
treeef746ec79b4cc53ad15da2680b2e5d6280d39867 /src/server/web
parentCreate aiscript.ja-JP.md (diff)
downloadmisskey-d3c0f3c251e8371d78d953f32f7311a38f4a1bdb.tar.gz
misskey-d3c0f3c251e8371d78d953f32f7311a38f4a1bdb.tar.bz2
misskey-d3c0f3c251e8371d78d953f32f7311a38f4a1bdb.zip
Use node-fetch instead of request (#6228)
* requestをnode-fetchになど * format * fix error * t * Fix test
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/url-preview.ts15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index 2526ed0f83..4dae6baafb 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -1,10 +1,10 @@
import * as Koa from 'koa';
-import * as request from 'request-promise-native';
import summaly from 'summaly';
import { fetchMeta } from '../../misc/fetch-meta';
import Logger from '../../services/logger';
import config from '../../config';
import { query } from '../../prelude/url';
+import { getJson } from '../../misc/fetch';
const logger = new Logger('url-preview');
@@ -16,15 +16,10 @@ module.exports = async (ctx: Koa.Context) => {
: `Getting preview of ${ctx.query.url}@${ctx.query.lang} ...`);
try {
- const summary = meta.summalyProxy ? await request.get({
- url: meta.summalyProxy,
- qs: {
- url: ctx.query.url,
- lang: ctx.query.lang || 'ja-JP'
- },
- forever: true,
- json: true
- }) : await summaly(ctx.query.url, {
+ const summary = meta.summalyProxy ? await getJson(`${meta.summalyProxy}?${query({
+ url: ctx.query.url,
+ lang: ctx.query.lang || 'ja-JP'
+ })}`) : await summaly(ctx.query.url, {
followRedirects: false,
lang: ctx.query.lang || 'ja-JP'
});