Cleanup, and more logic fixes
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user