Skynet/discord-bot
7
1
Fork 3
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove RwLock for database
All checks were successful
/ check_lfs (pull_request) Successful in 9s
Details
/ lint_fmt (pull_request) Successful in 10s
Details
/ lint_clippy (pull_request) Successful in 30s
Details
/ build (pull_request) Successful in 1m19s
Details

Browse source
This commit is contained in:
Roman Moisieiev 2025-09-11 12:54:54 +01:00
parent d8f785b0db
commit 062f826d28
15 changed files with 39 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -41,13 +41,11 @@ impl EventHandler for Handler {
// handles previously linked accounts joining the server
async fn guild_member_addition(&self, ctx: Context, new_member: Member) {
let db_lock = {
let db = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Config in TypeMap.").clone()
};
let db = db_lock.read().await;
let config_lock = {
let data_read = ctx.data.read().await;
data_read.get::<Config>().expect("Expected Config in TypeMap.").clone()
@ -109,13 +107,11 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
// handles role updates
async fn guild_member_update(&self, ctx: Context, _old_data: Option<Member>, new_data: Option<Member>, _: GuildMemberUpdateEvent) {
// get config/db
let db_lock = {
let db = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Config in TypeMap.").clone()
};
let db = db_lock.read().await;
// check if the role changed is part of the ones for this server
if let Some(x) = new_data {
on_role_change(&db, &ctx, x).await;
@ -304,7 +300,7 @@ async fn main() {
let mut data = client.data.write().await;
data.insert::<Config>(Arc::new(RwLock::new(config)));
data.insert::<DataBase>(Arc::new(RwLock::new(db)));
data.insert::<DataBase>(Arc::new(db));
}
// Finally, start a single shard, and start listening to events.