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

Fixed channel or user lock checks from conflicting

Browse source 
Fixed dev commands not being recognised and/or channel commands not being recognised
This commit is contained in:
benji7425 2017-01-22 20:42:26 +00:00
parent d9d4f18fa1
commit 1f37736887
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
feed-bot.js
View file

@ -50,29 +50,28 @@ var DiscordClient = {
intervalFunc = DiscordClient.startup; //reassign the interval function to try restart the bot every 5 sec intervalFunc = DiscordClient.startup; //reassign the interval function to try restart the bot every 5 sec
}, },
onMessage: function (user, userID, channelID, message) { onMessage: function (user, userID, channelID, message) {
if (channelID === Config.channelID) { //contains a link, and is not the latest link from the rss feed
//contains a link, and is not the latest link from the rss feed if (channelID === Config.channelID && Links.messageContainsLink(message) && (message !== Links.latestFromFeedlatestFeedLink)) {
if (Links.messageContainsLink(message) && (message !== Links.latestFromFeedlatestFeedLink)) { Log.event("Detected posted link in this message: " + message, "Discord.io");
Log.event("Detected posted link in this message: " + message, "Discord.io");
//extract the url from the string, and cache it //extract the url from the string, and cache it
Uri.withinString(message, function (url) { Uri.withinString(message, function (url) {
Links.cache(Links.standardise(url)); Links.cache(Links.standardise(url));
return url; return url;
}); });
} }
else { else {
//iterate over all of our message triggers to see if the message sent requires any action //iterate over all of our message triggers to see if the message sent requires any action
for (var i = 0; i < DiscordClient.messageTriggers.length; i++) { for (var i = 0; i < DiscordClient.messageTriggers.length; i++) {
var messageTrigger = DiscordClient.messageTriggers[i]; var messageTrigger = DiscordClient.messageTriggers[i];
if (message === messageTrigger.message) { if (message === messageTrigger.message) {
//check if its locked to a channel or to a specific user //check if its locked to a channel or to a specific user
if ((messageTrigger.channelID && messageTrigger.channelID === channelID) || (messageTrigger.userIDs && messageTrigger.userIDs.includes(userID))) if ((messageTrigger.channelID && messageTrigger.channelID === channelID) || (messageTrigger.userIDs && messageTrigger.userIDs.includes(userID)))
messageTrigger.action(user, userID, channelID, message); messageTrigger.action(user, userID, channelID, message);
}
} }
} }
} }
}, },
checkPastMessagesForLinks: function () { checkPastMessagesForLinks: function () {
var limit = 100; var limit = 100;