Georg/dbot
1
0
Fork 0
forked from GitHub/dbot
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #641 from amki/rss

Browse Source 
RSS module: URL shortener is now kinda optional + 2 bonus crashfixes
This commit is contained in:
Luke Slater 2015-04-04 02:27:55 +03:00
commit 0da96ea9ff
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/rss/rss.js
View File

@ -13,6 +13,7 @@ var rss = function(dbot) {
this.internalAPI = { this.internalAPI = {
'makeRequest': function(id,feed) { '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, var fid = id,
req = request(feed.url), req = request(feed.url),
feedparser = new FeedParser(); feedparser = new FeedParser();
@ -25,7 +26,6 @@ var rss = function(dbot) {
req.on('response', function (res) { req.on('response', function (res) {
var stream = this; var stream = this;
if (res.statusCode !== 200){ if (res.statusCode !== 200){
dbot.say(feed.server,feed.channel,"RSS: RSS server returned status code "+res.statusCode+". Bastard."); dbot.say(feed.server,feed.channel,"RSS: RSS server returned status code "+res.statusCode+". Bastard.");
return; return;
@ -51,12 +51,17 @@ var rss = function(dbot) {
if(!item.pubdate) { if(!item.pubdate) {
return; 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.lastPosted > 0) {
if(item.pubdate.getTime() > feed.newTime) { if(item.pubdate.getTime() > feed.newTime) {
feed.newTime = item.pubdate.getTime(); feed.newTime = item.pubdate.getTime();
} }
var rss = item; 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)) { if(!_.include(self.titleCache, rss.title)) {
var options = { var options = {
uri: 'https://www.googleapis.com/urlshortener/v1/url', uri: 'https://www.googleapis.com/urlshortener/v1/url',
@ -74,6 +79,14 @@ var rss = function(dbot) {
} }
rString += "- "+body.id; rString += "- "+body.id;
dbot.say(feed.server,feed.channel, rString); 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);
} }
}); });
@ -93,6 +106,10 @@ var rss = function(dbot) {
'checkFeeds': function() { 'checkFeeds': function() {
console.log("Checking feeds..."); 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) { for(var i=0;i<dbot.db.feeds.length;++i) {
this.internalAPI.makeRequest(i,dbot.db.feeds[i]); this.internalAPI.makeRequest(i,dbot.db.feeds[i]);
} }
@ -110,13 +127,17 @@ var rss = function(dbot) {
return; return;
} }
var now = Date.now(); var now = Date.now();
dbot.db.feeds.push({server:event.server, channel:event.channel.name, name:event.params[1], url:event.params[2], lastPosted: now, newTime: 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: 0, newTime: 0});
event.reply("Adding RSS feed named "+event.params[1]+" with URL "+event.params[2]); event.reply("Adding RSS feed named "+event.params[1]+" with URL "+event.params[2]);
}, },
'~rsstest': function(event) { '~rsstest': function(event) {
event.reply("I posted RSS last @ "+this.lastPosted); 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) { '~delrssfeed': function(event) {