Merge branch 'develop'

1 files changed, 10 insertions, 1 deletions

diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index e96eb309fe..41ca6bad8b 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -1,11 +1,20 @@
 import * as Koa from 'koa';
+import * as request from 'request-promise-native';
 import summaly from 'summaly';
+import config from '../../config';
 
 module.exports = async (ctx: Koa.Context) => {
 	try {
-		const summary = await summaly(ctx.query.url, {
+		const summary = config.summalyProxy ? await request.get({
+			url: config.summalyProxy,
+			qs: {
+				url: ctx.query.url
+			},
+			json: true
+		}) : await summaly(ctx.query.url, {
 			followRedirects: false
 		});
+
 		summary.icon = wrap(summary.icon);
 		summary.thumbnail = wrap(summary.thumbnail);