From 5e7f1470367d7eee5d0df8f6042f86315d76837e Mon Sep 17 00:00:00 2001 From: benji7425 Date: Sun, 22 Jan 2017 18:23:09 +0000 Subject: [PATCH 1/2] Added check for no errors before confirmation of (un)subscription --- feed-bot.js | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/feed-bot.js b/feed-bot.js index 45105cd..001ca5a 100644 --- a/feed-bot.js +++ b/feed-bot.js @@ -160,17 +160,20 @@ var Subscriptions = { serverID: Config.serverID, userID: userID, roleID: Config.subscribersRoleID - }, (err, response) => { - if (err) Log.raw(err); - Log.info(response); - }); + }, + (err) => { + if (err) Log.raw(err); //log the error if there is an error + else { //else go ahead and confirm subscription + Log.event("Subscribed user " + (user ? user + "(" + userID + ")" : userID)); + + DiscordClient.bot.sendMessage({ + to: channelID, + message: "You have successfully subscribed" + }, (err, response) => { setTimeout(() => { DiscordClient.bot.deleteMessage({ channelID: channelID, messageID: response.id }); }, Config.messageDeleteDelay); }); //delete the subscription confirmation message after a delay + } + }); - Log.event("Subscribed user " + (user ? user + "(" + userID + ")" : userID)); - DiscordClient.bot.sendMessage({ - to: channelID, - message: "You have successfully subscribed" - }, (err, response) => { setTimeout(() => { DiscordClient.bot.deleteMessage({ channelID: channelID, messageID: response.id }); }, Config.messageDeleteDelay); }); //delete the subscription confirmation message after a delay }, unsubscribe: function (user, userID, channelID, message) { @@ -178,17 +181,18 @@ var Subscriptions = { serverID: Config.serverID, userID: userID, roleID: Config.subscribersRoleID - }, (err, response) => { - if (err) Log.raw(err); - Log.info(response); - }); + }, + (err) => { + if (err) Log.raw(err); //log the error if there is an error + else { //else go ahead and confirm un-subscription + Log.event("Unsubscribed user " + (user ? user + "(" + userID + ")" : userID)); - Log.event("Unsubscribed user " + (user ? user + "(" + userID + ")" : userID)); - - DiscordClient.bot.sendMessage({ - to: channelID, - message: "You have successfully unsubscribed" - }, (err, response) => { setTimeout(() => { DiscordClient.bot.deleteMessage({ channelID: channelID, messageID: response.id }); }, Config.messageDeleteDelay); }); //delete the un-subscription confirmation message after a delay + DiscordClient.bot.sendMessage({ + to: channelID, + message: "You have successfully unsubscribed" + }, (err, response) => { setTimeout(() => { DiscordClient.bot.deleteMessage({ channelID: channelID, messageID: response.id }); }, Config.messageDeleteDelay); }); //delete the un-subscription confirmation message after a delay + } + }); }, mention: function () { From 1d22f28506ce74d2cef832ca234b79ae34522420 Mon Sep 17 00:00:00 2001 From: benji7425 Date: Sun, 22 Jan 2017 18:24:18 +0000 Subject: [PATCH 2/2] Added allowSubscriptions check before mentioning when posting --- feed-bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feed-bot.js b/feed-bot.js index 001ca5a..376be4c 100644 --- a/feed-bot.js +++ b/feed-bot.js @@ -196,7 +196,7 @@ var Subscriptions = { }, mention: function () { - return "<@&" + Config.subscribersRoleID + "> "; + return Config.allowSubscriptions ? "<@&" + Config.subscribersRoleID + "> " : ""; } };