From 3f54fb8a2a46da9ee24c893f70c2635a5ca33f9a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 25 May 2017 14:52:22 +0900
Subject: [PATCH] Use external service for rss xml to json

---
 package.json                                      |  3 +--
 .../app/desktop/tags/home-widgets/rss-reader.tag  | 14 ++++++--------
 src/web/server.ts                                 |  1 -
 src/web/service/rss-proxy.ts                      | 15 ---------------
 4 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 src/web/service/rss-proxy.ts

diff --git a/package.json b/package.json
index f749738c9a..72c5b8d6ee 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,6 @@
 		"typescript": "2.3.3",
 		"uuid": "3.0.1",
 		"vhost": "3.0.2",
-		"websocket": "1.0.24",
-		"xml2json": "0.11.0"
+		"websocket": "1.0.24"
 	}
 }
diff --git a/src/web/app/desktop/tags/home-widgets/rss-reader.tag b/src/web/app/desktop/tags/home-widgets/rss-reader.tag
index b8cfd8bddc..9a2b2fce1f 100644
--- a/src/web/app/desktop/tags/home-widgets/rss-reader.tag
+++ b/src/web/app/desktop/tags/home-widgets/rss-reader.tag
@@ -64,8 +64,6 @@
 
 	</style>
 	<script>
-		this.mixin('api');
-
 		this.url = 'http://news.yahoo.co.jp/pickup/rss.xml';
 		this.items = [];
 		this.initializing = true;
@@ -80,12 +78,12 @@
 		});
 
 		this.fetch = () => {
-			this.api('/api:rss', {
-				url: this.url
-			}).then(feed => {
-				this.update({
-					initializing: false,
-					items: feed.rss.channel.item
+			fetch(`https://api.rss2json.com/v1/api.json?rss_url=${this.url}`).then(res => {
+				res.json().then(feed => {
+					this.update({
+						initializing: false,
+						items: feed.items
+					});
 				});
 			});
 		};
diff --git a/src/web/server.ts b/src/web/server.ts
index d701d83b28..dde4eca5ec 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -47,7 +47,6 @@ app.use('/assets', express.static(`${__dirname}/assets`, {
  * Common API
  */
 app.get(/\/api:url/, require('./service/url-preview'));
-app.post(/\/api:rss/, require('./service/rss-proxy'));
 
 /**
  * Serve config
diff --git a/src/web/service/rss-proxy.ts b/src/web/service/rss-proxy.ts
deleted file mode 100644
index 6819427ff8..0000000000
--- a/src/web/service/rss-proxy.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as express from 'express';
-import * as request from 'request';
-import xml2json = require('xml2json');
-
-module.exports = (req: express.Request, res: express.Response) => {
-	const url: string = req.body.url;
-
-	request(url, (err, response, xml) => {
-		if (err) {
-			res.sendStatus(500);
-		} else {
-			res.send(xml2json.toJson(xml));
-		}
-	});
-};