From 27c6ebebc0638c262a0531b12c64ba63f4290131 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 14 Jan 2017 10:51:48 +0900
Subject: Clean up proxy codes

Closes #35
---
 src/web/service/proxy/proxy.ts  | 31 -------------------------------
 src/web/service/proxy/server.ts | 17 -----------------
 src/web/service/url-preview.ts  |  4 +++-
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 src/web/service/proxy/proxy.ts
 delete mode 100644 src/web/service/proxy/server.ts

(limited to 'src/web')

diff --git a/src/web/service/proxy/proxy.ts b/src/web/service/proxy/proxy.ts
deleted file mode 100644
index 48c9fa4a53..0000000000
--- a/src/web/service/proxy/proxy.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as URL from 'url';
-import * as express from 'express';
-import * as request from 'request';
-import * as isUrl from 'is-url';
-
-module.exports = (req: express.Request, res: express.Response) => {
-	const url = req.params.url;
-
-	if (!url || !isUrl(url)) {
-		return;
-	}
-
-	request({
-		url: url + URL.parse(req.url, true).search,
-		encoding: null
-	}, (err, response, content) => {
-		if (err) {
-			console.error(err);
-			return;
-		}
-
-		const contentType = response.headers['content-type'];
-
-		if (/^text\//.test(contentType) || contentType === 'application/javascript') {
-			content = content.toString().replace(/http:\/\//g, `${config.secondary_scheme}://proxy.${config.secondary_host}/http://`);
-		}
-
-		res.header('Content-Type', contentType);
-		res.send(content);
-	});
-};
diff --git a/src/web/service/proxy/server.ts b/src/web/service/proxy/server.ts
deleted file mode 100644
index 5b1b8d106c..0000000000
--- a/src/web/service/proxy/server.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Forward Proxy Service
- */
-
-import * as express from 'express';
-import * as cors from 'cors';
-
-/**
- * Init app
- */
-const app = express();
-app.disable('x-powered-by');
-app.use(cors());
-
-app.get('/:url(*)', require('./proxy'));
-
-module.exports = app;
diff --git a/src/web/service/url-preview.ts b/src/web/service/url-preview.ts
index d1a345ef17..0c5fd8a78e 100644
--- a/src/web/service/url-preview.ts
+++ b/src/web/service/url-preview.ts
@@ -9,5 +9,7 @@ module.exports = async (req: express.Request, res: express.Response) => {
 };
 
 function wrap(url: string): string {
-	return `${config.proxy_url}/${url}`;
+	return url != null
+		? `https://images.weserv.nl/?url=${url.replace(/^https?:\/\//, '')}`
+		: null;
 }
-- 
cgit v1.2.3-freya