From 09399db97688819843b099552c5271aa42475159 Mon Sep 17 00:00:00 2001
From: Loic Bersier <loic.bersier1@gmail.com>
Date: Mon, 25 Feb 2019 03:18:04 +0100
Subject: [PATCH] added blacklist system and log what people send and by who

---
 commands/general/tweet.js | 32 ++++++++++++++++++++------------
 json/twiBlacklist.json    |  1 +
 2 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 json/twiBlacklist.json

diff --git a/commands/general/tweet.js b/commands/general/tweet.js
index 7fa4c6c4..196782a8 100644
--- a/commands/general/tweet.js
+++ b/commands/general/tweet.js
@@ -1,13 +1,16 @@
 const { Command } = require('discord-akairo');
 const Twitter = require('twitter-lite');
 const rand = require('../../rand.js');
-const { twiConsumer, twiConsumerSecret, twiToken, twiTokenSecret } = require('../../config.json');
+const { twiConsumer, twiConsumerSecret, twiToken, twiTokenSecret, twiChannel } = require('../../config.json');
+const blacklist = require('../../json/twiBlacklist.json');
 
 class tweetCommand extends Command {
 	constructor() {
 		super('tweet', {
 			aliases: ['tweet'],
 			category: 'general',
+			cooldown: 86400,
+			ratelimit: 2,
 			args: [
 				{
 					id: 'text',
@@ -24,27 +27,29 @@ class tweetCommand extends Command {
 	}
 
 	async exec(message, args) {
+		const channel = this.client.channels.get(twiChannel);
+
+		if (blacklist.includes(message.author.id)) {
+			return message.channel.send('You have been blacklisted from this command... be less naughty next time.');
+		}
+
 		let text = args.text;
 		if (!text)
 			return;
 
 		//Basic filter, hopefully i wont get banned from twitter
 		text = text.replace(/n[\w\W]+gg[\w\W]+|f[aA\W*-_0-9]gg[\w\W]+|f[aA\W*-_0-9]g|kys/gi, '❤');
-		console.log(text);
-
 
 		text = rand.random(text, message);
 
-
-
-		let client = new Twitter({
-			consumer_key: twiConsumer,
-			consumer_secret: twiConsumerSecret,
-			access_token_key: twiToken,
-			access_token_secret: twiTokenSecret
-		});
-
 		try {
+			let client = new Twitter({
+				consumer_key: twiConsumer,
+				consumer_secret: twiConsumerSecret,
+				access_token_key: twiToken,
+				access_token_secret: twiTokenSecret
+			});
+
 			const response = await client.post('statuses/update', {
 				status: text
 			});
@@ -52,6 +57,9 @@ class tweetCommand extends Command {
 			const tweetid = response.id_str;
 	
 			//	  Send the final text
+
+			channel.send(`AUTHOR: ${message.author.username} (${message.author.id}) Sent: ${text}`);
+
 			return message.channel.send(`Go see ur epic tweet https://twitter.com/HahaYesDB/status/${tweetid}`);
 		} catch(err) {
 			console.error(err);
diff --git a/json/twiBlacklist.json b/json/twiBlacklist.json
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/json/twiBlacklist.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file