From d3c0f3c251e8371d78d953f32f7311a38f4a1bdb Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Thu, 9 Apr 2020 23:42:23 +0900
Subject: Use node-fetch instead of request (#6228)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* requestをnode-fetchになど

* format

* fix error

* t

* Fix test
---
 src/server/web/url-preview.ts | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/server/web')

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'
 		});
-- 
cgit v1.2.3-freya