From 2b0a919fb5bb1e6b9a216234b1a8f75c9beb80dc Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 13 Oct 2018 13:13:15 +0900
Subject: Resolve #2894

---
 src/server/api/endpoints/users/recommendation.ts | 28 +++++++++++-------------
 src/server/api/service/github.ts                 |  1 +
 src/server/web/url-preview.ts                    |  1 +
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/server')

diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index f54326b566..df85343f0f 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -30,22 +30,20 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 			.replace('{{limit}}', limit)
 			.replace('{{offset}}', offset);
 
-			request(
-			{
-				url: url,
-				timeout: timeout,
-				json: true,
-				followRedirect: true,
-				followAllRedirects: true
-			},
-			(error: any, response: any, body: any) => {
-				if (!error && response.statusCode == 200) {
-					res(body);
-				} else {
-					res([]);
-				}
+		request({
+			url: url,
+			proxy: config.proxy,
+			timeout: timeout,
+			json: true,
+			followRedirect: true,
+			followAllRedirects: true
+		}, (error: any, response: any, body: any) => {
+			if (!error && response.statusCode == 200) {
+				res(body);
+			} else {
+				res([]);
 			}
-		);
+		});
 	} else {
 		// Get 'limit' parameter
 		const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index c8d588eaaf..ac18cf90ae 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -63,6 +63,7 @@ handler.on('status', event => {
 			// Fetch parent status
 			request({
 				url: `${parent.url}/statuses`,
+				proxy: config.proxy,
 				headers: {
 					'User-Agent': 'misskey'
 				}
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index 41ca6bad8b..eb835b05ac 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -7,6 +7,7 @@ module.exports = async (ctx: Koa.Context) => {
 	try {
 		const summary = config.summalyProxy ? await request.get({
 			url: config.summalyProxy,
+			proxy: config.proxy,
 			qs: {
 				url: ctx.query.url
 			},
-- 
cgit v1.2.3-freya