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

Fixed feeds having seperate last posted times

Browse Source
This commit is contained in:
amki 2014-05-24 00:46:01 +00:00
parent fc4ba61e86
commit 61471e80dc
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/rss/rss.js
View File

@ -6,10 +6,13 @@ var FeedParser = require('feedparser')
, request = require('request'); , request = require('request');
var rss = function(dbot) { var rss = function(dbot) {
this.pollInterval = 60000;
var self = this; var self = this;
this.intervals = []; this.intervals = [];
this.internalAPI = { this.internalAPI = {
'makeRequest': function(server,channel,name,url) { 'makeRequest': function(id,server,channel,name) {
var url = dbot.db.feeds[id].url;
var lastPosted = dbot.db.feeds[id].lastPosted;
var req = request(url); var req = request(url);
var feedparser = new FeedParser(); var feedparser = new FeedParser();
req.on('error', function (error) { req.on('error', function (error) {
@ -36,17 +39,20 @@ var rss = function(dbot) {
, item; , item;
while (item = stream.read()) { while (item = stream.read()) {
if(item.pubdate - self.lastPosted > 0) if(item.pubdate - lastPosted > 0) {
lastPosted = item.pubdate;
dbot.say(server,channel,"["+name+"] ["+item.title+"] [Post by "+item.author+" in "+item.categories[0]+"] - "+item.link); dbot.say(server,channel,"["+name+"] ["+item.title+"] [Post by "+item.author+" in "+item.categories[0]+"] - "+item.link);
} }
}
}); });
}.bind(this), }.bind(this),
'reloadFeeds': function() { 'reloadFeeds': function() {
for(var i=0;i<dbot.db.feeds.length;++i) { for(var i=0;i<dbot.db.feeds.length;++i) {
var server = dbot.db.feeds[i].server, channel = dbot.db.feeds[i].channel, name = dbot.db.feeds[i].name, url = dbot.db.feeds[i].url; var server = dbot.db.feeds[i].server, channel = dbot.db.feeds[i].channel, name = dbot.db.feeds[i].name;
var id = i;
this.intervals.push(setInterval(function() { this.intervals.push(setInterval(function() {
self.internalAPI.makeRequest(server,channel,name,url) self.internalAPI.makeRequest(id,server,channel,name)
},300000)); },self.pollInterval));
} }
}.bind(this) }.bind(this)
}; };
@ -56,8 +62,9 @@ var rss = function(dbot) {
event.reply("GIMME TWO PARAMETERS DUDE"); event.reply("GIMME TWO PARAMETERS DUDE");
return; return;
} }
dbot.db.feeds.push({server:event.server, channel:event.channel.name, name:event.params[1], url:event.params[2]}); var now = Date.now();
this.intervals.push(setInterval(function() {self.internalAPI.makeRequest(event.server,event.channel.name,event.params[1],event.params[2])},300000)); dbot.db.feeds.push({server:event.server, channel:event.channel.name, name:event.params[1], url:event.params[2], lastPosted: now});
this.intervals.push(setInterval(function() {self.internalAPI.makeRequest(dbot.db.feeds.length-1,event.server,event.channel.name,event.params[1])},self.pollInterval));
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) {
@ -76,7 +83,6 @@ var rss = function(dbot) {
}; };
this.onLoad = function() { this.onLoad = function() {
this.internalAPI.reloadFeeds(); this.internalAPI.reloadFeeds();
self.lastPosted = new Date();
}; };
this.onDestroy = function() { this.onDestroy = function() {
for(var i=0;i<this.intervals.length;++i) { for(var i=0;i<this.intervals.length;++i) {