From 1756ae84ef06b833b0b787a3ffa0bbd4dcdee2f1 Mon Sep 17 00:00:00 2001
From: amki <amki@amki.eu>
Date: Sat, 4 Apr 2015 00:28:36 +0200
Subject: [PATCH 1/2] Fixed 2 crashes when rss database was empty

---
 modules/rss/rss.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/rss/rss.js b/modules/rss/rss.js
index ced2c4b..7a4cb5e 100644
--- a/modules/rss/rss.js
+++ b/modules/rss/rss.js
@@ -93,6 +93,10 @@ var rss = function(dbot) {
 
         'checkFeeds': function() {
             console.log("Checking feeds...");
+            if(dbot.db.feeds == null) {
+                console.log("No active feeds...");
+                return;
+            }
             for(var i=0;i<dbot.db.feeds.length;++i) {
                 this.internalAPI.makeRequest(i,dbot.db.feeds[i]);
             }
@@ -110,13 +114,17 @@ var rss = function(dbot) {
                 return;
             }
             var now = Date.now();
+            if(dbot.db.feeds == null)
+                dbot.db.feeds = [];
             dbot.db.feeds.push({server:event.server, channel:event.channel.name, name:event.params[1], url:event.params[2], lastPosted: now, newTime: now});
             event.reply("Adding RSS feed named "+event.params[1]+" with URL "+event.params[2]);
         },
 
         '~rsstest': function(event) {
             event.reply("I posted RSS last @ "+this.lastPosted);
-            event.reply("Nothing to test. Go home.");
+            event.reply("Checking feeds manually...");
+            this.internalAPI.checkFeeds();
+            event.reply("Call got through!");
         },
 
         '~delrssfeed': function(event) {

From db0c61b369b370bbdc6d032cbd66f446a075a150 Mon Sep 17 00:00:00 2001
From: amki <amki@amki.eu>
Date: Sat, 4 Apr 2015 01:24:50 +0200
Subject: [PATCH 2/2] URL shortener is now optional, errors are being pasted to
 console

---
 modules/rss/rss.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/rss/rss.js b/modules/rss/rss.js
index 7a4cb5e..f6aa9ea 100644
--- a/modules/rss/rss.js
+++ b/modules/rss/rss.js
@@ -13,6 +13,7 @@ var rss = function(dbot) {
 
     this.internalAPI = {
         'makeRequest': function(id,feed) {
+            dbot.say(feed.server,feed.channel,"RSS: I am making a request for feed "+feed.name+" to "+feed.url+" and I like it.");
             var fid = id,
                 req = request(feed.url),
                 feedparser = new FeedParser();
@@ -25,7 +26,6 @@ var rss = function(dbot) {
 
             req.on('response', function (res) {
                 var stream = this;
-
                 if (res.statusCode !== 200){
                     dbot.say(feed.server,feed.channel,"RSS: RSS server returned status code "+res.statusCode+". Bastard.");
                     return;
@@ -51,12 +51,17 @@ var rss = function(dbot) {
                     if(!item.pubdate) {
                         return;
                     }
+                    if(dbot.config.debugMode) {
+                        dbot.say(feed.server,feed.channel,"RSS: Should post question: Is "+(item.pubdate.getTime()-feed.lastPosted)+" > 0?");
+                    }
                     if(item.pubdate.getTime() - feed.lastPosted > 0) {
                         if(item.pubdate.getTime() > feed.newTime) {
                             feed.newTime = item.pubdate.getTime();
                         }
                         var rss = item;
-
+                        if(dbot.config.debugMode) {
+                            dbot.say(feed.server,feed.channel,"RSS: I shall post a new link! PERFECT.");
+                        }
                         if(!_.include(self.titleCache, rss.title)) {
                             var options = {
                                 uri: 'https://www.googleapis.com/urlshortener/v1/url',
@@ -74,6 +79,14 @@ var rss = function(dbot) {
                                     }
                                     rString += "- "+body.id;
                                     dbot.say(feed.server,feed.channel, rString);
+                                } else {
+                                    var rString = "["+feed.name+"] ["+rss.title+"] "; 
+                                    if(rss.author !== null && !_.isUndefined(rss.categories[0])) {
+                                        rString += "[Post by "+rss.author+" in "+rss.categories[0]+"] ";
+                                    }
+                                    rString += "- "+rss.link;
+                                    dbot.say(feed.server,feed.channel, rString);
+                                    console.log("RSS: Url shortener request returned error statuscode "+response.statusCode+": "+body.error.message);
                                 }
                             });
 
@@ -116,7 +129,7 @@ var rss = function(dbot) {
             var now = Date.now();
             if(dbot.db.feeds == null)
                 dbot.db.feeds = [];
-            dbot.db.feeds.push({server:event.server, channel:event.channel.name, name:event.params[1], url:event.params[2], lastPosted: now, newTime: now});
+            dbot.db.feeds.push({server:event.server, channel:event.channel.name, name:event.params[1], url:event.params[2], lastPosted: 0, newTime: 0});
             event.reply("Adding RSS feed named "+event.params[1]+" with URL "+event.params[2]);
         },