cordlesscoder/discord-bot
1
0
Fork 0
forked from Skynet/discord-bot
Code Pull requests Activity

Update dependencies, remove unnecessary RwLock on database

Browse source
This commit is contained in:
Roman Moisieiev 2025-09-11 08:55:07 +01:00
parent 7526a82bb7
commit 7b5626c279
20 changed files with 1114 additions and 983 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/commands/minecraft.rs
View file

@ -23,11 +23,10 @@ pub(crate) mod user {
use sqlx::Error;
pub async fn run(command: &CommandInteraction, ctx: &Context) -> String {
let db_lock = {
let db = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Databse in TypeMap.").clone()
};
let db = db_lock.read().await;
let config_lock = {
let data_read = ctx.data.read().await;
@ -229,11 +228,10 @@ pub(crate) mod server {
return String::from("Expected Server ID");
};
let db_lock = {
let db = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Databse in TypeMap.").clone()
};
let db = db_lock.read().await;
match add_server(&db, &g_id, &server_minecraft).await {
Ok(_) => {}
@ -290,11 +288,10 @@ pub(crate) mod server {
Some(x) => x,
};
let db_lock = {
let db = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Databse in TypeMap.").clone()
};
let db = db_lock.read().await;
let servers = get_minecraft_config_server(&db, g_id).await;
@ -366,11 +363,10 @@ pub(crate) mod server {
return String::from("Expected Server ID");
};
let db_lock = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Databse in TypeMap.").clone()
let db = {
let data = ctx.data.read().await;
data.get::<DataBase>().expect("Expected Databse in TypeMap.").clone()
};
let db = db_lock.read().await;
match server_remove(&db, &g_id, &server_minecraft).await {
Ok(_) => {}