Removed YQL, since it's deprecated. Just use xml2json instead.

Author: morsssss

amp-pwa-reader/package.json

@@ -30,7 +30,8 @@
     "memory-cache": "^0.2.0",
     "request": "^2.81.0",
     "uglify-es": "*",
-    "workbox-build": "^3.2.0"
+    "workbox-build": "^3.2.0",
+    "xml2json": "^0.11.2"
   },
   "engines": {
     "node": "6.16.0"

amp-pwa-reader/src/js/Backend.js

@@ -55,7 +55,8 @@ class Backend {
   }
 
   getRSSImage(entry) {
-    return entry.content ? entry.content[entry.content.length - 1].url : '';
+    const content = entry['media:content'];
+    return content ? content[content.length - 1].url : '';
   }
 
   getRSSDescription(entry) {

amp-pwa-reader/src/js/FeedReader.js

@@ -23,20 +23,19 @@ class FeedReader {
   fetch(category, attempts = 0) {
 
     let rssUrl = shadowReader.backend.getRSSUrl(category);
-    let yqlQuery = 'select * from feed where url = \'' + encodeURIComponent(rssUrl) + '\'';
-    let yqlUrl = '/feed?q=' + yqlQuery;
+    let feedUrl = '/feed?q=' + rssUrl;
 
-    return fetch(yqlUrl)
+    return fetch(feedUrl)
       .then(response => response.json() )
-      .then(rss => {
+      .then(json => {
 
         // sadly, the Guardian's RSS feeds seem to be having intermittent failures right now,
         // so rerequest if that happens
-        if(!rss.query.results && attempts < 10) {
+        if(!json.rss && attempts < 10) {
           return this.fetch(category, (attempts || 0) + 1);
         }
 
-        var entries = rss.query.results ? rss.query.results.item : [];
+        var entries = (json.rss.channel && json.rss.channel.item) || [];
 
         return entries.map(entry => {
           return {

amp-pwa-reader/src/js/Nav.js

@@ -223,7 +223,7 @@ class Nav {
     // hide menu
     this.hide();
 
-    // fetch new nav entries via RSS via YQL
+    // fetch new nav entries via RSS via our server
     return this.feedReader.fetch(category).then(entries => {
 
       // if this is the first time loading cards, now would

amp-pwa-reader/src/server/server.js

@@ -22,6 +22,7 @@ const memCache = require('memory-cache');
 const pubBackend = require('./Backend.js');
 const enforce = require('express-sslify');
 const helmet = require('helmet');
+const xmlParser = require('xml2json');
 
 const ENVIRONMENT_PRODUCTION = 'production';
 
@@ -38,21 +39,20 @@ if (app.get('env') === ENVIRONMENT_PRODUCTION) {
 
 // how long (in seconds) to cache requests for main feed and for any article
 const cacheDurations = {feed: 600, article: 3600};
-const feedURL = 'https://query.yahooapis.com/v1/public/yql';
 
 const staticFilesMiddleware = express.static('dist');
 app.use(staticFilesMiddleware);
 
-// Proxy the feed request so that we can cache it.
-// YQL expects a query in the "q" parameter.
+// Here, we cache the feed, and we convert it to JSON.
 app.get('/feed', cache(cacheDurations.feed), function(req, res, next) {
   const options = {
-    url: feedURL + '?format=json&q=' + req.query.q
+    url: req.query.q
   };
 
+
   request(options, (error, response, body) => {
     if (!error) {
-      res.send(body);
+      res.send(xmlParser.toJson(body));
     } else {
       res.json({error: 'An error occurred in /feed route'});
     }