Merge pull request #273 from codeschool/remove_fivejs_from_rss

Joel Taylor · Joel Taylor · commit 4035a999db67 · 2015-07-14T20:27:39.000-04:00
Only include flow stories in RSS feed
diff --git a/server/routes/feed.js b/server/routes/feed.js
@@ -14,11 +14,7 @@ router.get('/rss', function(req, res, next) {
   };
   Articles.rss(function(news) {
     news.map(function(story){
-      if (story.new){
-        story.link = story.url
-      }else{
-        story.link = "https://javascript.com/news/" + story.slug
-      }
+      story.link = "https://javascript.com/news/" + story.slug
     });
     res.set('Content-Type', 'text/xml');
     res.render('feed/rss', { options: options, news: news });
diff --git a/server/services/articles.js b/server/services/articles.js
@@ -41,7 +41,7 @@ var Articles = {
 
   // Returns all stories that have been approved for RSS feed. Limit: 25
   rss(cb){
-    db.query('SELECT a.news, a.url, a.title, a.slug, a.body, a,published_at FROM articles as a WHERE a.approved = true ORDER BY published_at DESC', [], cb)
+    db.query('SELECT a.news, a.title, a.slug, a.body, a,published_at FROM articles as a WHERE a.approved = true AND a.news = false ORDER BY published_at DESC', [], cb)
   },
 
   // Returns article based on slug
