From 9fd8f3c2899723ba8ba9dd33bb365813c7811228 Mon Sep 17 00:00:00 2001 From: Bradley Bickford Date: Sat, 11 Nov 2023 22:09:26 -0500 Subject: [PATCH] Cleanup, and more logic fixes --- breadbot.js | 38 ------------- utilities/sqlutil.js | 133 ++----------------------------------------- 2 files changed, 5 insertions(+), 166 deletions(-) diff --git a/breadbot.js b/breadbot.js index 48970ce..c77ab89 100644 --- a/breadbot.js +++ b/breadbot.js @@ -105,44 +105,6 @@ client.on(Events.MessageCreate, async message => { } }) } - - /* - var channel_registered = sqlutil.isChannelRegistered(message.channelId) - var user_registered = sqlutil.isUserRegistered(message.author.id) - - if(!(await channel_registered).valueOf()) { - console.log(`Registering Channel ${message.channel.name} ${message.channel.guild.name}`) - - var channel_registered_result = await sqlutil.registerChannel(message.channel.id, message.channel.guildId, message.channel.name) - - if(channel_registered_result.valueOf()) { - console.log(`Channel Registered ${message.channel.name} ${message.channel.guild.name}`) - } else { - console.log(`Failed to register channel ${message.channel.name} ${message.channel.guild.name}`) - return - } - } - - if(!(await user_registered).valueOf()) { - console.log(`Registering user ${message.author.username}`) - - var user_registered_result = await sqlutil.registerUser(messsage.author.id, message.author.username, message.author.displayName) - - if(user_registered_result.valueOf()) { - console.log(`User Registered ${message.author.username}`) - } else { - console.log(`failed to register user ${message.author.username}`) - return - } - } - - 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") - } - })*/ }) client.once(Events.ClientReady, c => { diff --git a/utilities/sqlutil.js b/utilities/sqlutil.js index 857626b..b06673b 100644 --- a/utilities/sqlutil.js +++ b/utilities/sqlutil.js @@ -17,43 +17,6 @@ async function buildPool(db_name) { } } -async function isServerRegistered(server_snowflake) { - var resultLength = null - - await connection_pool.query(`SELECT * FROM servers WHERE server_snowflake = ?;`, [server_snowflake], (error, results, fields) => { - if (error) { - console.log(error) - } - - console.log(results) - - if(results) { - resultLength = results.length - } else { - resultLength = 0 - } - }) - - return resultLength != 0 -} - -async function registerServer(server_snowflake, server_name, server_description) { - var sql = `INSERT INTO servers VALUES (?, ?, ?);` - var result = null - - await connection_pool.query(sql, [server_snowflake, server_name, server_description], (error, results, fields) => { - if (error) { - console.log(error) - - result = false - } else { - result = true - } - }) - - return result -} - async function registerServerIfMissing(server_snowflake, server_name, server_description) { return connection_pool.query("SELECT * FROM servers WHERE server_snowflake = ?;", [server_snowflake]).then(async ([rows, fields]) => { if (rows) { @@ -86,43 +49,6 @@ async function unregisterServer(server_snowflake) { return result } -async function isChannelRegistered(channel_snowflake) { - var resultLength = null - - await connection_pool.query(`SELECT * FROM channels WHERE channel_snowflake = ?;`, [channel_snowflake], (error, results, fields) => { - if (error) { - console.log(error) - } - - console.log(results) - - if(results) { - resultLength = results.length - } else { - resultLength = 0 - } - }) - - return resultLength != 0 -} - -async function registerChannel(channel_snowflake, server_snowflake, channel_name) { - var sql = `INSERT INTO channels VALUES (?, ?, ?);` - var result = null - - await connection_pool.query(sql, [channel_snowflake, server_snowflake, channel_name], (error, results, fields) => { - if (error) { - console.log(error) - - result = false - } else { - result = true - } - }) - - return result -} - async function registerChannelIfMissing(channel_snowflake, server_snowflake, channel_name) { return connection_pool.query("SELECT * FROM channels WHERE channel_snowflake = ?;", [channel_snowflake]).then(async ([rows, fields]) => { if (rows.length != 0) { @@ -141,42 +67,6 @@ async function registerChannelIfMissing(channel_snowflake, server_snowflake, cha }) } -async function isUserRegistered(user_snowflake) { - var resultLength = null - - await connection_pool.query(`SELECT * FROM users WHERE user_snowflake = ?;`, [user_snowflake], (error, results, fields) => { - if (error) { - console.log(error) - } - - console.log(results) - - if(results) { - resultLength = results.length - } else { - resultLength = 0 - } - }) - - return resultLength != 0 -} - -async function registerUser(user_snowflake, user_name, user_displayname) { - var sql = `INSERT INTO users VALUES (?, ?, ?);` - var result = null - - await connection_pool.query(sql, [user_snowflake, user_name, user_displayname], (error, results, fields) => { - if (error) { - console.log(error) - - result = false - } else { - result = true - } - }) - - return result -} async function registerUserIfMissing(user_snowflake, user_name, user_displayname) { return connection_pool.query("SELECT * FROM users WHERE user_snowflake = ?;", [user_snowflake]).then(async ([rows, fields]) => { @@ -195,31 +85,18 @@ async function registerUserIfMissing(user_snowflake, user_name, user_displayname } async function registerMessage(message_snowflake, channel_snowflake, user_snowflake, message_content, message_timestamp) { - var sql = `INSERT INTO messages VALUES (?, ?, ?, ?, ?, 0, 0);` - var result = null + return connection_pool.query("INSERT INTO messages VALUES (?, ?, ?, ?, ?, 0, 0)", [message_snowflake, channel_snowflake, user_snowflake, message_content, message_timestamp]).then(([rows, fields]) => { + return true + }).catch((error) => { + console.log(error) - await connection_pool.query(sql, [message_snowflake, channel_snowflake, user_snowflake, message_content, message_timestamp], (error, results, fields) => { - if (error) { - console.log(error) - - result = false - } else { - result = true - } + return false }) - - return result } module.exports = { buildPool, - isServerRegistered, - registerServer, unregisterServer, - isChannelRegistered, - registerChannel, - isUserRegistered, - registerUser, registerMessage, registerServerIfMissing, registerChannelIfMissing,