From 6cbf6dc718df9ffd80b9e9c5debdebb01f6c7003 Mon Sep 17 00:00:00 2001
From: Bradley Bickford <bradleybickford@gmail.com>
Date: Sat, 11 Nov 2023 20:17:59 -0500
Subject: [PATCH] Trying to unwind some async/await mess

---
 breadbot.js          | 40 +++++++++++++++++++---------------------
 utilities/sqlutil.js |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/breadbot.js b/breadbot.js
index 667f780..b5c3ffb 100644
--- a/breadbot.js
+++ b/breadbot.js
@@ -92,28 +92,26 @@ client.on(Events.GuildCreate, async guild => {
 client.on(Events.MessageCreate, async message => {
 	console.log("Message Create Fired")
 
-	sqlutil.isChannelRegistered(message.channelId).then(async channel_check => {
-		if(!channel_check) {
-			console.log(`Registering Channel ${message.channel.guild.name} - ${message.channel.name}`)
-			await sqlutil.registerChannel(message.channel.id, message.channel.guildId, message.channel.name)
+	var channel_registered = sqlutil.isChannelRegistered(message.channelId)
+	var user_registered = sqlutil.isUserRegistered(message.author.id)
+
+	await channel_registered
+	await user_registered
+
+	if(!channel_registered) {
+		await sqlutil.registerChannel(message.channel.id, message.channel.guildId, message.channel.name)
+	}
+
+	if(!user_registered) {
+		await sqlutil.registerUser(messsage.author.id, message.author.username, message.author.displayName)
+	}
+
+	sqlutil.registerMessage(message.id, message.channelId, message.author.id, message.content, message.createdAt).then(message_add => {
+		if(message_add) {
+			console.log("Message logged")
+		} else {
+			console.log("Failed to log message")
 		}
-
-		sqlutil.isUserRegistered(message.author.id).then(async user_check => {
-			if(!user_check) {
-				console.log(`Registering User ${messsage.author.username}`)
-				await sqlutil.registerUser(message.author.id, message.author.username, message.author.displayName)
-			}
-
-			console.log(`Registering message from ${message.channel.guild.name} - ${message.channel.name} - ${message.author.username}`)
-
-			sqlutil.registerMessage(message.id, message.channelId, message.author.id, message.content, message.createdAt).then(message_add => {
-				if(message_add) {
-					console.log("Message logged")
-				} else {
-					console.log("Failed to log message")
-				}
-			})
-		})
 	})
 })
 
diff --git a/utilities/sqlutil.js b/utilities/sqlutil.js
index 5e7dca1..e070e9d 100644
--- a/utilities/sqlutil.js
+++ b/utilities/sqlutil.js
@@ -145,7 +145,7 @@ async function registerUser(user_snowflake, user_name, user_displayname) {
 }
 
 async function registerMessage(message_snowflake, channel_snowflake, user_snowflake, message_content, message_timestamp) {
-    var sql = `INSERT INTO users VALUES (?, ?, ?, ?, ?);`
+    var sql = `INSERT INTO users VALUES (?, ?, ?, ?, ?, 0, 0);`
     var result = null
 
     await connection_pool.query(sql, [message_snowflake, channel_snowflake, user_snowflake, message_content, message_timestamp], (error, results, fields) => {