From 4e02a258027a3705a83b476ce824bdefd790be82 Mon Sep 17 00:00:00 2001 From: Puechberty Arthur Date: Fri, 10 Apr 2026 18:14:09 +0200 Subject: [PATCH] =?UTF-8?q?dossier=20events=20a=20=C3=A9t=C3=A9=20normalis?= =?UTF-8?q?=C3=A9=20en=20=E2=80=9C1=20fichier=20=3D=201=20=C3=A9v=C3=A9nem?= =?UTF-8?q?ent=E2=80=9D=20avec=20noms=20align=C3=A9s=20sur=20l=E2=80=99?= =?UTF-8?q?=C3=A9v=C3=A9nement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/events/channel_create.rs | 8 ++++ src/events/channel_delete.rs | 8 ++++ .../{channel_event.rs => channel_update.rs} | 8 ---- ...{guild_create_event.rs => guild_create.rs} | 0 src/events/guild_member_addition.rs | 9 +++++ src/events/guild_member_removal.rs | 8 ++++ ...member_event.rs => guild_member_update.rs} | 9 ----- ..._create_event.rs => interaction_create.rs} | 0 src/events/{message_event.rs => message.rs} | 0 ...sage_delete_event.rs => message_delete.rs} | 0 ...sage_update_event.rs => message_update.rs} | 0 src/events/mod.rs | 26 ++++++++----- src/events/{ready_event.rs => ready.rs} | 0 src/events/role_create.rs | 8 ++++ src/events/{role_event.rs => role_delete.rs} | 8 ---- src/events/role_update.rs | 8 ++++ ..._update_event.rs => voice_state_update.rs} | 0 src/utils/events_handler.rs | 39 +++++++++---------- 18 files changed, 84 insertions(+), 55 deletions(-) create mode 100644 src/events/channel_create.rs create mode 100644 src/events/channel_delete.rs rename src/events/{channel_event.rs => channel_update.rs} (52%) rename src/events/{guild_create_event.rs => guild_create.rs} (100%) create mode 100644 src/events/guild_member_addition.rs create mode 100644 src/events/guild_member_removal.rs rename src/events/{guild_member_event.rs => guild_member_update.rs} (72%) rename src/events/{interaction_create_event.rs => interaction_create.rs} (100%) rename src/events/{message_event.rs => message.rs} (100%) rename src/events/{message_delete_event.rs => message_delete.rs} (100%) rename src/events/{message_update_event.rs => message_update.rs} (100%) rename src/events/{ready_event.rs => ready.rs} (100%) create mode 100644 src/events/role_create.rs rename src/events/{role_event.rs => role_delete.rs} (55%) create mode 100644 src/events/role_update.rs rename src/events/{voice_state_update_event.rs => voice_state_update.rs} (100%) diff --git a/src/events/channel_create.rs b/src/events/channel_create.rs new file mode 100644 index 0000000..335f488 --- /dev/null +++ b/src/events/channel_create.rs @@ -0,0 +1,8 @@ +use serenity::model::prelude::*; +use serenity::prelude::*; + +use crate::commands::logs_service; + +pub async fn handle_channel_create(ctx: &Context, channel: &GuildChannel) { + logs_service::on_channel_create(ctx, channel).await; +} diff --git a/src/events/channel_delete.rs b/src/events/channel_delete.rs new file mode 100644 index 0000000..832cd8f --- /dev/null +++ b/src/events/channel_delete.rs @@ -0,0 +1,8 @@ +use serenity::model::prelude::*; +use serenity::prelude::*; + +use crate::commands::logs_service; + +pub async fn handle_channel_delete(ctx: &Context, channel: &GuildChannel) { + logs_service::on_channel_delete(ctx, channel).await; +} diff --git a/src/events/channel_event.rs b/src/events/channel_update.rs similarity index 52% rename from src/events/channel_event.rs rename to src/events/channel_update.rs index 548199d..9dc72e2 100644 --- a/src/events/channel_event.rs +++ b/src/events/channel_update.rs @@ -3,10 +3,6 @@ use serenity::prelude::*; use crate::commands::logs_service; -pub async fn handle_channel_create(ctx: &Context, channel: &GuildChannel) { - logs_service::on_channel_create(ctx, channel).await; -} - pub async fn handle_channel_update( ctx: &Context, old_data_if_available: Option, @@ -14,7 +10,3 @@ pub async fn handle_channel_update( ) { logs_service::on_channel_update(ctx, old_data_if_available, new).await; } - -pub async fn handle_channel_delete(ctx: &Context, channel: &GuildChannel) { - logs_service::on_channel_delete(ctx, channel).await; -} diff --git a/src/events/guild_create_event.rs b/src/events/guild_create.rs similarity index 100% rename from src/events/guild_create_event.rs rename to src/events/guild_create.rs diff --git a/src/events/guild_member_addition.rs b/src/events/guild_member_addition.rs new file mode 100644 index 0000000..06bf39e --- /dev/null +++ b/src/events/guild_member_addition.rs @@ -0,0 +1,9 @@ +use serenity::model::prelude::*; +use serenity::prelude::*; + +use crate::commands::{ancien, logs_service}; + +pub async fn handle_member_addition(ctx: &Context, new_member: &Member) { + logs_service::on_member_join(ctx, new_member.guild_id, &new_member.user).await; + ancien::maybe_assign_ancien_role(ctx, new_member.guild_id, new_member.user.id).await; +} diff --git a/src/events/guild_member_removal.rs b/src/events/guild_member_removal.rs new file mode 100644 index 0000000..bfd29b9 --- /dev/null +++ b/src/events/guild_member_removal.rs @@ -0,0 +1,8 @@ +use serenity::model::prelude::*; +use serenity::prelude::*; + +use crate::commands::logs_service; + +pub async fn handle_member_removal(ctx: &Context, guild_id: GuildId, user: &User) { + logs_service::on_member_leave(ctx, guild_id, user).await; +} diff --git a/src/events/guild_member_event.rs b/src/events/guild_member_update.rs similarity index 72% rename from src/events/guild_member_event.rs rename to src/events/guild_member_update.rs index bccaf13..80e995d 100644 --- a/src/events/guild_member_event.rs +++ b/src/events/guild_member_update.rs @@ -3,15 +3,6 @@ use serenity::prelude::*; use crate::commands::{ancien, logs_service}; -pub async fn handle_member_addition(ctx: &Context, new_member: &Member) { - logs_service::on_member_join(ctx, new_member.guild_id, &new_member.user).await; - ancien::maybe_assign_ancien_role(ctx, new_member.guild_id, new_member.user.id).await; -} - -pub async fn handle_member_removal(ctx: &Context, guild_id: GuildId, user: &User) { - logs_service::on_member_leave(ctx, guild_id, user).await; -} - pub async fn handle_member_update( ctx: &Context, old_if_available: Option, diff --git a/src/events/interaction_create_event.rs b/src/events/interaction_create.rs similarity index 100% rename from src/events/interaction_create_event.rs rename to src/events/interaction_create.rs diff --git a/src/events/message_event.rs b/src/events/message.rs similarity index 100% rename from src/events/message_event.rs rename to src/events/message.rs diff --git a/src/events/message_delete_event.rs b/src/events/message_delete.rs similarity index 100% rename from src/events/message_delete_event.rs rename to src/events/message_delete.rs diff --git a/src/events/message_update_event.rs b/src/events/message_update.rs similarity index 100% rename from src/events/message_update_event.rs rename to src/events/message_update.rs diff --git a/src/events/mod.rs b/src/events/mod.rs index 05932f0..343eedd 100644 --- a/src/events/mod.rs +++ b/src/events/mod.rs @@ -1,12 +1,18 @@ -pub mod channel_event; -pub mod guild_create_event; -pub mod guild_member_event; +pub mod channel_create; +pub mod channel_delete; +pub mod channel_update; +pub mod guild_create; +pub mod guild_member_addition; +pub mod guild_member_removal; +pub mod guild_member_update; #[path = "../utils/events_handler.rs"] pub mod handler; -pub mod interaction_create_event; -pub mod message_delete_event; -pub mod message_event; -pub mod message_update_event; -pub mod ready_event; -pub mod role_event; -pub mod voice_state_update_event; +pub mod interaction_create; +pub mod message; +pub mod message_delete; +pub mod message_update; +pub mod ready; +pub mod role_create; +pub mod role_delete; +pub mod role_update; +pub mod voice_state_update; diff --git a/src/events/ready_event.rs b/src/events/ready.rs similarity index 100% rename from src/events/ready_event.rs rename to src/events/ready.rs diff --git a/src/events/role_create.rs b/src/events/role_create.rs new file mode 100644 index 0000000..26b33dd --- /dev/null +++ b/src/events/role_create.rs @@ -0,0 +1,8 @@ +use serenity::model::prelude::*; +use serenity::prelude::*; + +use crate::commands::logs_service; + +pub async fn handle_role_create(ctx: &Context, new: &Role) { + logs_service::on_role_create(ctx, new.guild_id, new).await; +} diff --git a/src/events/role_event.rs b/src/events/role_delete.rs similarity index 55% rename from src/events/role_event.rs rename to src/events/role_delete.rs index 3812027..d3af5fc 100644 --- a/src/events/role_event.rs +++ b/src/events/role_delete.rs @@ -3,14 +3,6 @@ use serenity::prelude::*; use crate::commands::logs_service; -pub async fn handle_role_create(ctx: &Context, new: &Role) { - logs_service::on_role_create(ctx, new.guild_id, new).await; -} - -pub async fn handle_role_update(ctx: &Context, old_data_if_available: Option, new: &Role) { - logs_service::on_role_update(ctx, new.guild_id, old_data_if_available.as_ref(), new).await; -} - pub async fn handle_role_delete( ctx: &Context, guild_id: GuildId, diff --git a/src/events/role_update.rs b/src/events/role_update.rs new file mode 100644 index 0000000..f7cedc2 --- /dev/null +++ b/src/events/role_update.rs @@ -0,0 +1,8 @@ +use serenity::model::prelude::*; +use serenity::prelude::*; + +use crate::commands::logs_service; + +pub async fn handle_role_update(ctx: &Context, old_data_if_available: Option, new: &Role) { + logs_service::on_role_update(ctx, new.guild_id, old_data_if_available.as_ref(), new).await; +} diff --git a/src/events/voice_state_update_event.rs b/src/events/voice_state_update.rs similarity index 100% rename from src/events/voice_state_update_event.rs rename to src/events/voice_state_update.rs diff --git a/src/utils/events_handler.rs b/src/utils/events_handler.rs index 6cdc6d4..375f656 100644 --- a/src/utils/events_handler.rs +++ b/src/utils/events_handler.rs @@ -3,9 +3,9 @@ use serenity::model::prelude::*; use serenity::prelude::*; use crate::events::{ - channel_event, guild_create_event, guild_member_event, interaction_create_event, - message_delete_event, message_event, message_update_event, ready_event, role_event, - voice_state_update_event, + channel_create, channel_delete, channel_update, guild_create, guild_member_addition, + guild_member_removal, guild_member_update, interaction_create, message, message_delete, + message_update, ready, role_create, role_delete, role_update, voice_state_update, }; pub struct Handler; @@ -13,19 +13,19 @@ pub struct Handler; #[async_trait] impl EventHandler for Handler { async fn ready(&self, ctx: Context, ready: Ready) { - ready_event::handle_ready(&ctx, &ready).await; + ready::handle_ready(&ctx, &ready).await; } async fn message(&self, ctx: Context, msg: Message) { - message_event::handle_message(&ctx, &msg).await; + message::handle_message(&ctx, &msg).await; } async fn guild_create(&self, ctx: Context, guild: Guild, _is_new: Option) { - guild_create_event::handle_guild_create(&ctx, &guild).await; + guild_create::handle_guild_create(&ctx, &guild).await; } async fn interaction_create(&self, ctx: Context, interaction: Interaction) { - interaction_create_event::handle_interaction_create(&ctx, &interaction).await; + interaction_create::handle_interaction_create(&ctx, &interaction).await; } async fn message_delete( @@ -35,8 +35,7 @@ impl EventHandler for Handler { deleted_message_id: MessageId, guild_id: Option, ) { - message_delete_event::handle_message_delete(&ctx, channel_id, deleted_message_id, guild_id) - .await; + message_delete::handle_message_delete(&ctx, channel_id, deleted_message_id, guild_id).await; } async fn message_update( @@ -46,15 +45,15 @@ impl EventHandler for Handler { new: Option, event: MessageUpdateEvent, ) { - message_update_event::handle_message_update(&ctx, old_if_available, new, &event).await; + message_update::handle_message_update(&ctx, old_if_available, new, &event).await; } async fn voice_state_update(&self, ctx: Context, old: Option, new: VoiceState) { - voice_state_update_event::handle_voice_state_update(&ctx, old, &new).await; + voice_state_update::handle_voice_state_update(&ctx, old, &new).await; } async fn guild_member_addition(&self, ctx: Context, new_member: Member) { - guild_member_event::handle_member_addition(&ctx, &new_member).await; + guild_member_addition::handle_member_addition(&ctx, &new_member).await; } async fn guild_member_removal( @@ -64,7 +63,7 @@ impl EventHandler for Handler { user: User, _member_data_if_available: Option, ) { - guild_member_event::handle_member_removal(&ctx, guild_id, &user).await; + guild_member_removal::handle_member_removal(&ctx, guild_id, &user).await; } async fn guild_member_update( @@ -74,11 +73,11 @@ impl EventHandler for Handler { new: Option, event: GuildMemberUpdateEvent, ) { - guild_member_event::handle_member_update(&ctx, old_if_available, new, &event).await; + guild_member_update::handle_member_update(&ctx, old_if_available, new, &event).await; } async fn guild_role_create(&self, ctx: Context, new: Role) { - role_event::handle_role_create(&ctx, &new).await; + role_create::handle_role_create(&ctx, &new).await; } async fn guild_role_update( @@ -87,7 +86,7 @@ impl EventHandler for Handler { old_data_if_available: Option, new: Role, ) { - role_event::handle_role_update(&ctx, old_data_if_available, &new).await; + role_update::handle_role_update(&ctx, old_data_if_available, &new).await; } async fn guild_role_delete( @@ -97,7 +96,7 @@ impl EventHandler for Handler { removed_role_id: RoleId, removed_role_data_if_available: Option, ) { - role_event::handle_role_delete( + role_delete::handle_role_delete( &ctx, guild_id, removed_role_id, @@ -107,11 +106,11 @@ impl EventHandler for Handler { } async fn channel_create(&self, ctx: Context, guild_channel: GuildChannel) { - channel_event::handle_channel_create(&ctx, &guild_channel).await; + channel_create::handle_channel_create(&ctx, &guild_channel).await; } async fn channel_update(&self, ctx: Context, old: Option, new: GuildChannel) { - channel_event::handle_channel_update(&ctx, old, &new).await; + channel_update::handle_channel_update(&ctx, old, &new).await; } async fn channel_delete( @@ -120,6 +119,6 @@ impl EventHandler for Handler { channel: GuildChannel, _messages: Option>, ) { - channel_event::handle_channel_delete(&ctx, &channel).await; + channel_delete::handle_channel_delete(&ctx, &channel).await; } }