From 15b5611a9acac11042c2268a7b923c6a2aa40c46 Mon Sep 17 00:00:00 2001
From: benji7425 <benji7425@outlook.com>
Date: Mon, 9 Jan 2017 22:55:05 +0000
Subject: [PATCH] Added deletion of subscription command responses after a
 delay

---
 config.json |  1 +
 feed-bot.js | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config.json b/config.json
index 08f2d90..94faf26 100644
--- a/config.json
+++ b/config.json
@@ -3,6 +3,7 @@
     "channelID": "264420391282409473",
     "pollingInterval": 5000,
     "numLinksToCache": 10,
+    "messageDeleteDelay": 10000,
     "youtubeMode": true,
     "logFile": "./log",
     "subscribersFile": "./subscribers.json",
diff --git a/feed-bot.js b/feed-bot.js
index 64466c7..8a77ca1 100644
--- a/feed-bot.js
+++ b/feed-bot.js
@@ -37,6 +37,7 @@ var DiscordClient = {
 
 		DiscordClient.checkPastMessagesForLinks(); //we need to check past messages for links on startup, but also on reconnect because we don't know what has happened during the downtime
 
+		//set the interval function to check the feed
 		intervalFunc = () => {
 			Feed.check((err, articles) => {
 				Links.validate(err, articles, DiscordClient.post);
@@ -112,12 +113,12 @@ var DiscordClient = {
 	messageTriggers: [
 		{
 			message: Config.userCommands.subscribe,
-			action: (user, userID, channelID, message) => { Subscriptions.subscribe(channelID, userID, user); },
+			action: (user, userID, channelID, message) => { Subscriptions.subscribe(user, userID, channelID, message); },
 			channelID: Config.channelID
 		},
 		{
 			message: Config.userCommands.unsubscribe,
-			action: (user, userID, channelID, message) => { Subscriptions.unsubscribe(channelID, userID, user); },
+			action: (user, userID, channelID, message) => { Subscriptions.unsubscribe(user, userID, channelID, message); },
 			channelID: Config.channelID
 		},
 		{
@@ -126,7 +127,7 @@ var DiscordClient = {
 				DiscordClient.bot.sendMessage({
 					to: Config.channelID,
 					message: DiscordClient.bot.fixMessage("<@" + Subscriptions.subscribers.join("> <@") + ">")
-				});
+				}, (err, response) => { setTimeout(() => { DiscordClient.bot.deleteMessage({ channelID: channelID, messageID: response.id }); }, Config.messageDeleteDelay); });
 			},
 			channelID: Config.channelID
 		},
@@ -171,7 +172,7 @@ var Subscriptions = {
 			this.subscribers = obj || [];
 		});
 	},
-	subscribe: function (channelID, userID, user) {
+	subscribe: function (user, userID, channelID, message) {
 		if (this.subscribers.indexOf(userID) === -1) {
 			this.subscribers.push(userID); //subscribe the user if they aren't already subscribed
 			this.writeToFile();
@@ -180,10 +181,10 @@ var Subscriptions = {
 			DiscordClient.bot.sendMessage({
 				to: channelID,
 				message: "You have successfully subscribed"
-			});
+			}, (err, response) => { setTimeout(() => { DiscordClient.bot.deleteMessage({ channelID: channelID, messageID: response.id }); }, Config.messageDeleteDelay); });
 		}
 	},
-	unsubscribe: function (channelID, userID, user) {
+	unsubscribe: function (user, userID, channelID, message) {
 		if (this.subscribers.indexOf(userID) > -1) {
 			this.subscribers.splice(this.subscribers.indexOf(userID), 1);
 			this.writeToFile();
@@ -192,7 +193,7 @@ var Subscriptions = {
 			DiscordClient.bot.sendMessage({
 				to: channelID,
 				message: "You have successfully unsubscribed"
-			});
+			}, (err, response) => { setTimeout(() => { DiscordClient.bot.deleteMessage({ channelID: channelID, messageID: response.id }); }, Config.messageDeleteDelay); });
 		}
 	},
 	writeToFile: function () {