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

Fixed a bunch of wrong references from quick copy-pastes

Browse source
This commit is contained in:
benji7425 2016-12-03 01:52:16 +00:00
parent 124a8a1668
commit 1624b3a8b0
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
feed-bot.js
View file

@ -107,10 +107,10 @@ var YouTube = {
share: "http://youtu.be/", share: "http://youtu.be/",
full: "http://www.youtube.com/watch?v=", full: "http://www.youtube.com/watch?v=",
convertShareToFull: function (shareUrl) { convertShareToFull: function (shareUrl) {
return shareUrl.replace(YouTube.share, YouTube.full); return shareUrl.replace(YouTube.url.share, YouTube.url.full);
}, },
convertFullToShare: function (fullUrl) { convertFullToShare: function (fullUrl) {
var shareUrl = fullUrl.replace(YouTube.share, YouTube.full); var shareUrl = fullUrl.replace(YouTube.url.full, YouTube.url.share);
if (shareUrl.includes("&")) if (shareUrl.includes("&"))
shareUrl = shareUrl.slice(0, fullUrl.indexOf("&")); shareUrl = shareUrl.slice(0, fullUrl.indexOf("&"));
@ -127,6 +127,11 @@ var Links = {
cache: function (link) { cache: function (link) {
//cheaty way to get around http and https not matching //cheaty way to get around http and https not matching
link = link.replace("https://", "http://"); link = link.replace("https://", "http://");
if(Config.youtubeMode && link.includes(YouTube.url.full)){
link = YouTube.url.convertFullToShare(link);
}
//store the new link if not stored already //store the new link if not stored already
if (!Links.cached.includes(link)) { if (!Links.cached.includes(link)) {
Links.cached.push(link); Links.cached.push(link);
@ -138,7 +143,7 @@ var Links = {
}, },
checkCache: function (link) { checkCache: function (link) {
if (Config.youtubeMode && link.includes(link)) { if (Config.youtubeMode && link.includes(link)) {
return Links.cached.includes(YouTube.convertFullToShare(link)); return Links.cached.includes(YouTube.url.convertFullToShare(link));
} }
return Links.cached.includes(link); return Links.cached.includes(link);
}, },
@ -150,8 +155,8 @@ var Links = {
//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)) {
if (Config.youtubeMode && latestLink.includes(YouTube.fullUrl)) if (Config.youtubeMode && latestLink.includes(YouTube.url.full))
latestLink = YouTube.convertFullToShare(latestLink); latestLink = YouTube.url.convertFullToShare(latestLink);
Log.info("Attempting to post new link: " + latestLink); Log.info("Attempting to post new link: " + latestLink);
//send a messsage containing the new feed link to our discord channel //send a messsage containing the new feed link to our discord channel
@ -190,9 +195,9 @@ 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) //check that we have an internet connection (well not exactly - check that we have a connection to the host of the feedUrl)
Dns.resolve(Links.urlObj.host, function (err) { Dns.resolve(Feed.urlObj.host, function (err) {
if (err) Log.error("CONNECTION ERROR: Cannot resolve host (you are probably not connected to the internet)", err); if (err) Log.error("CONNECTION ERROR: Cannot resolve host (you are probably not connected to the internet)", err);
else FeedRead(Config.feedUrl, Links.checkAndPost); else FeedRead(Config.feedUrl, Links.validateAndPost);
}); });
} }
}; };