oreolek/discord-bot-rss-feed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactored comment positions

Browse source
This commit is contained in:
benji7425 2016-12-30 15:37:13 +00:00
parent 11715d0a3b
commit fb61f2ee90
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
feed-bot.js
View file

@ -68,7 +68,6 @@ var DiscordClient = {
}); });
} }
}, },
//gets last 100 messages and extracts any links found (for use on startup)
checkPastMessagesForLinks: function () { checkPastMessagesForLinks: function () {
var limit = 100; var limit = 100;
Log.info("Attempting to check past " + limit + " messages for links"); Log.info("Attempting to check past " + limit + " messages for links");
@ -82,14 +81,12 @@ var DiscordClient = {
else { else {
Log.info("Pulled last " + messages.length + " messages, scanning for links"); Log.info("Pulled last " + messages.length + " messages, scanning for links");
//extract an array of strings from the array of message objects var messageContents = messages.map((x) => { return x.content; }).reverse(); //extract an array of strings from the array of message objects
var messageContents = messages.map((x) => { return x.content; }).reverse();
for (var messageIdx in messageContents) { for (var messageIdx in messageContents) {
var message = messageContents[messageIdx]; var message = messageContents[messageIdx];
//test if the message contains a url if (Links.messageContainsLink(message)) //test if the message contains a url
if (Links.messageContainsLink(message))
//detect the url inside the string, and cache it //detect the url inside the string, and cache it
Uri.withinString(message, function (url) { Uri.withinString(message, function (url) {
Links.cache(url); Links.cache(url);
@ -121,8 +118,7 @@ var YouTube = {
var Links = { var Links = {
standardise: function (link) { standardise: function (link) {
//cheaty way to get around http and https not matching, and quick way to chop off stuff like &feature=youtube etc return link.replace("https://", "http://").split("&")[0]; //cheaty way to get around http and https not matching, and quick way to chop off stuff like &feature=youtube etc
return link.replace("https://", "http://").split("&")[0];
}, },
messageContainsLink: function (message) { messageContainsLink: function (message) {
var messageLower = message.toLowerCase(); var messageLower = message.toLowerCase();
@ -157,8 +153,7 @@ var Links = {
validateAndPost: function (err, articles) { validateAndPost: function (err, articles) {
if (err) Log.error("FEED ERROR: Error reading RSS feed.", err); if (err) Log.error("FEED ERROR: Error reading RSS feed.", err);
else { else {
//get the latest link and check if it has already been posted and cached var latestLink = Links.standardise(articles[0].link); //get the latest link and check if it has already been posted and cached
var latestLink = Links.standardise(articles[0].link);
//check whether the latest link out the feed exists in our cache //check whether the latest link out the feed exists in our cache
if (!Links.checkCache(latestLink)) { if (!Links.checkCache(latestLink)) {
@ -179,21 +174,17 @@ var Links = {
else { else {
Log.error("DiscordClient appears to be disconnected! Attempting to reconnect...", err); Log.error("DiscordClient appears to be disconnected! Attempting to reconnect...", err);
//attempt to reconnect DiscordClient.bot.connect(); //attempt to reconnect
DiscordClient.bot.connect();
} }
} }
}); });
//finally make sure the link is cached, so it doesn't get posted again Links.cache(latestLink); //finally make sure the link is cached, so it doesn't get posted again
Links.cache(latestLink);
} }
else if (Links.latestFromFeed != latestLink) else if (Links.latestFromFeed != latestLink)
//alternatively, if we have a new link from the feed, but its been posted already, just alert the console Log.info("Didn't post new feed link because already detected as posted " + latestLink); //alternatively, if we have a new link from the feed, but its been posted already, just alert the console
Log.info("Didn't post new feed link because already detected as posted " + latestLink);
//ensure our latest feed link variable is up to date, so we can track when the feed updates Links.latestFromFeed = latestLink; //ensure our latest feed link variable is up to date, so we can track when the feed updates
Links.latestFromFeed = latestLink;
} }
} }
}; };
@ -201,8 +192,7 @@ var Links = {
var Feed = { var Feed = {
urlObj: Url.parse(Config.feedUrl), urlObj: Url.parse(Config.feedUrl),
checkAndPost: function () { checkAndPost: function () {
//check that we have an internet connection (well not exactly - check that we have a connection to the host of the feedUrl) Dns.resolve(Feed.urlObj.host, function (err) { //check that we have an internet connection (well not exactly - check that we have a connection to the host of the feedUrl)
Dns.resolve(Feed.urlObj.host, function (err) {
if (err) Log.error("CONNECTION ERROR: Cannot resolve host.", err); if (err) Log.error("CONNECTION ERROR: Cannot resolve host.", err);
else FeedRead(Config.feedUrl, Links.validateAndPost); else FeedRead(Config.feedUrl, Links.validateAndPost);
}); });