From d9d4f18fa16af201a6fb3186b83b2fc94a9ecc28 Mon Sep 17 00:00:00 2001 From: benji7425 Date: Sun, 22 Jan 2017 20:25:35 +0000 Subject: [PATCH 1/3] Revert "Fixed dev commands not being recognised outside of posting channel" This reverts commit a8d3f04ad4f03438efd73dc0f38354938b361fe3. --- feed-bot.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/feed-bot.js b/feed-bot.js index f714ad3..376be4c 100644 --- a/feed-bot.js +++ b/feed-bot.js @@ -61,15 +61,15 @@ var DiscordClient = { return url; }); } - } - else { - //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++) { - var messageTrigger = DiscordClient.messageTriggers[i]; - if (message === messageTrigger.message) { - //check if its locked to a channel or to a specific user - if ((messageTrigger.channelID && messageTrigger.channelID === channelID) || (messageTrigger.userIDs && messageTrigger.userIDs.includes(userID))) - messageTrigger.action(user, userID, channelID, message); + else { + //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++) { + var messageTrigger = DiscordClient.messageTriggers[i]; + if (message === messageTrigger.message) { + //check if its locked to a channel or to a specific user + if ((messageTrigger.channelID && messageTrigger.channelID === channelID) || (messageTrigger.userIDs && messageTrigger.userIDs.includes(userID))) + messageTrigger.action(user, userID, channelID, message); + } } } } From 1f377368873efcb1404a9ad83bde473bc11ae1c1 Mon Sep 17 00:00:00 2001 From: benji7425 Date: Sun, 22 Jan 2017 20:42:26 +0000 Subject: [PATCH 2/3] Fixed channel or user lock checks from conflicting Fixed dev commands not being recognised and/or channel commands not being recognised --- feed-bot.js | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/feed-bot.js b/feed-bot.js index 376be4c..8e7b7b7 100644 --- a/feed-bot.js +++ b/feed-bot.js @@ -50,29 +50,28 @@ var DiscordClient = { intervalFunc = DiscordClient.startup; //reassign the interval function to try restart the bot every 5 sec }, onMessage: function (user, userID, channelID, message) { - if (channelID === Config.channelID) { - //contains a link, and is not the latest link from the rss feed - if (Links.messageContainsLink(message) && (message !== Links.latestFromFeedlatestFeedLink)) { - Log.event("Detected posted link in this message: " + message, "Discord.io"); + //contains a link, and is not the latest link from the rss feed + if (channelID === Config.channelID && Links.messageContainsLink(message) && (message !== Links.latestFromFeedlatestFeedLink)) { + Log.event("Detected posted link in this message: " + message, "Discord.io"); - //extract the url from the string, and cache it - Uri.withinString(message, function (url) { - Links.cache(Links.standardise(url)); - return url; - }); - } - else { - //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++) { - var messageTrigger = DiscordClient.messageTriggers[i]; - if (message === messageTrigger.message) { - //check if its locked to a channel or to a specific user - if ((messageTrigger.channelID && messageTrigger.channelID === channelID) || (messageTrigger.userIDs && messageTrigger.userIDs.includes(userID))) - messageTrigger.action(user, userID, channelID, message); - } + //extract the url from the string, and cache it + Uri.withinString(message, function (url) { + Links.cache(Links.standardise(url)); + return url; + }); + } + else { + //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++) { + var messageTrigger = DiscordClient.messageTriggers[i]; + if (message === messageTrigger.message) { + //check if its locked to a channel or to a specific user + if ((messageTrigger.channelID && messageTrigger.channelID === channelID) || (messageTrigger.userIDs && messageTrigger.userIDs.includes(userID))) + messageTrigger.action(user, userID, channelID, message); } } } + }, checkPastMessagesForLinks: function () { var limit = 100; From 2afbf61915a83766f9f30022a037df9ef731edaa Mon Sep 17 00:00:00 2001 From: benji7425 Date: Sun, 22 Jan 2017 20:43:24 +0000 Subject: [PATCH 3/3] Updated changelog and package.json version --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d74d142..89e4f75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## v1.3.2 + +### Fixed + +- Fixed list posting channel messages being ignored + ## v1.3.1 ### Fixed diff --git a/package.json b/package.json index a20b65e..d8d8011 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "discord-feed-bot", - "version": "1.3.1", + "version": "1.3.2", "description": "discord-feed-bot", "main": "index.js", "scripts": {