From 9c5ec6f9d55e004b39c264798aa7a8ba6b3745da Mon Sep 17 00:00:00 2001
From: root <root@h2867845.stratoserver.net>
Date: Sun, 29 Aug 2021 22:07:22 +0200
Subject: [PATCH] Tweaks and fixes

---
 .gitignore      |  1 +
 bot.js          | 21 ++++++++++++---------
 buttsbot.config |  3 +--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd7c5b6..eb11e4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .env
 twitch.config
+buttsbot.config
 
 node_modules/
diff --git a/bot.js b/bot.js
index 70b7341..cef5bce 100644
--- a/bot.js
+++ b/bot.js
@@ -20,8 +20,6 @@ let defaultConfig = {
 	ignoredUsers: []
 };
 
-console.log(`* Startup: Loaded config: ${config}`);
-
 // Client
 client.on('message', onMessageHandler);
 client.on('connected', onConnectedHandler);
@@ -44,32 +42,37 @@ function isNumeric(n) {
 // Event handlers
 function onMessageHandler (channel, userstate, message, self) {
 	var message = message.trim();
-	var messageChannel = userstate['username'];
+	var messageChannel = "#" + userstate['username'];
 
 	if (channel === "#butt5b0t") {
 		if (message === "!subscribe") {
-			client.join("#" + messageChannel);
+			client.join(messageChannel);
 			client.say(channel, "Joined channel " + messageChannel);
 
 			if (!opts.channels.includes(messageChannel)) {
 				opts.channels.push(messageChannel);
-				fs.writeFileSync('twitch.config', opts);
+				fs.writeFileSync('twitch.config', JSON.stringify(opts));
 			}
 
 			if (!(messageChannel in configurations)) {
 				configurations[messageChannel] = defaultConfig;
-				fs.writeFileSync('buttsbot.config');
+				fs.writeFileSync('buttsbot.config', JSON.stringify(configurations));
 			}
 		}
 
 		if (message === "!unsubscribe") {
-			client.part("#" + messageChannel);
+			client.part(messageChannel);
 			client.say(channel, "Left channel " + messageChannel);
 
 			if (opts.channels.includes(messageChannel)) {
 				var indexChannel = opts.channels.indexOf(messageChannel);
-				opts.splice(indexChannel, 1);
-				fs.writeFileSync('twitch.config', opts);
+				opts.channels.splice(indexChannel, 1);
+				fs.writeFileSync('twitch.config', JSON.stringify(opts));
+			}
+
+			if (messageChannel in configurations) {
+				delete configurations[messageChannel];
+				fs.writeFileSync('buttsbot.config', JSON.stringify(configurations));
 			}
 		}
 	} else {
diff --git a/buttsbot.config b/buttsbot.config
index 7a73a41..d294f44 100644
--- a/buttsbot.config
+++ b/buttsbot.config
@@ -1,2 +1 @@
-{
-}
\ No newline at end of file
+{"#drmcmarco":{"word":"butt","chance":20,"limit":10,"ignoredUsers":[]}}
\ No newline at end of file