From 82e3eb76c1a3d712c786e2ea46a76c1c7cd7a0d5 Mon Sep 17 00:00:00 2001 From: Aadi Desai <21363892+supleed2@users.noreply.github.com> Date: Mon, 25 Sep 2023 12:36:01 +0100 Subject: [PATCH] Replace conversions with type-safe `.into()` calls --- src/cmds.rs | 24 ++++++++++++------------ src/verify/login.rs | 6 +++--- src/verify/manual.rs | 12 ++++++------ src/verify/membership.rs | 6 +++--- src/verify/mod.rs | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/cmds.rs b/src/cmds.rs index d4d1613..b852781 100644 --- a/src/cmds.rs +++ b/src/cmds.rs @@ -89,7 +89,7 @@ pub(crate) async fn delete_member( remove_roles: Option, ) -> Result<(), Error> { println!("Cmd: ({}) delete_member {id}", ctx.author().name); - match db::delete_member_by_id(&ctx.data().db, id.user.id.0 as i64).await? { + match db::delete_member_by_id(&ctx.data().db, id.user.id.into()).await? { true => { if remove_roles.unwrap_or(true) { let mut m = id.clone(); @@ -136,7 +136,7 @@ pub(crate) async fn get_all_members(ctx: ACtx<'_>) -> Result<(), Error> { } } -/// Unreachable, used to create command folder +/// Unreachable, used to create get_member command folder #[poise::command( slash_command, subcommands( @@ -154,7 +154,7 @@ pub(crate) async fn get_member(_ctx: ACtx<'_>) -> Result<(), Error> { #[poise::command(slash_command, rename = "id")] pub(crate) async fn get_member_by_id(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { println!("Cmd: ({}) get_member_by_id {id}", ctx.author().name); - match db::get_member_by_id(&ctx.data().db, id.id.0 as i64).await? { + match db::get_member_by_id(&ctx.data().db, id.id.into()).await? { Some(m) => { ctx.say(format!("Member info for {id}:\n```rust\n{m:#?}\n```")) .await? @@ -247,7 +247,7 @@ pub(crate) async fn add_member( db::insert_member( &ctx.data().db, Member { - discord_id: id.user.id.0 as i64, + discord_id: id.user.id.into(), shortcode, nickname, realname, @@ -276,7 +276,7 @@ pub(crate) async fn insert_member_from_pending( "Cmd: ({}) insert_member_from_pending {id}", ctx.author().name ); - match db::insert_member_from_pending(&ctx.data().db, id.id.0 as i64, &nickname, fresher).await { + match db::insert_member_from_pending(&ctx.data().db, id.id.into(), &nickname, fresher).await { Ok(()) => { ctx.say(format!("Member moved from pending to members table: {id}")) .await? @@ -296,7 +296,7 @@ pub(crate) async fn insert_member_from_manual( "Cmd: ({}) insert_member_from_manual {id}", ctx.author().name ); - match db::insert_member_from_manual(&ctx.data().db, id.id.0 as i64).await { + match db::insert_member_from_manual(&ctx.data().db, id.id.into()).await { Ok(()) => { ctx.say(format!("Member moved from manual to members table: {id}")) .await? @@ -320,7 +320,7 @@ pub(crate) async fn count_pending(ctx: ACtx<'_>) -> Result<(), Error> { #[poise::command(slash_command)] pub(crate) async fn delete_pending(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { println!("Cmd: ({}) delete_pending {id}", ctx.author().name); - match db::delete_pending_by_id(&ctx.data().db, id.id.0 as i64).await? { + match db::delete_pending_by_id(&ctx.data().db, id.id.into()).await? { true => { ctx.say(format!("Successfully deleted pending member info for {id}")) .await? @@ -364,7 +364,7 @@ pub(crate) async fn get_all_pending(ctx: ACtx<'_>) -> Result<(), Error> { #[poise::command(slash_command)] pub(crate) async fn get_pending(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { println!("Cmd: ({}) get_pending {id}", ctx.author().name); - match db::get_pending_by_id(&ctx.data().db, id.id.0 as i64).await? { + match db::get_pending_by_id(&ctx.data().db, id.id.into()).await? { Some(p) => { ctx.say(format!("Pending info for {id}:\n```rust\n{p:#?}\n```")) .await? @@ -389,7 +389,7 @@ pub(crate) async fn add_pending( db::insert_pending( &ctx.data().db, PendingMember { - discord_id: id.id.0 as i64, + discord_id: id.id.into(), shortcode, realname, }, @@ -440,7 +440,7 @@ pub(crate) async fn count_manual(ctx: ACtx<'_>) -> Result<(), Error> { #[poise::command(slash_command)] pub(crate) async fn delete_manual(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { println!("Cmd: ({}) delete_manual {id}", ctx.author().name); - match db::delete_manual_by_id(&ctx.data().db, id.id.0 as i64).await? { + match db::delete_manual_by_id(&ctx.data().db, id.id.into()).await? { true => { ctx.say(format!("Successfully deleted manual member info for {id}")) .await? @@ -484,7 +484,7 @@ pub(crate) async fn get_all_manual(ctx: ACtx<'_>) -> Result<(), Error> { #[poise::command(slash_command)] pub(crate) async fn get_manual(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { println!("Cmd: ({}) get_manual {id}", ctx.author().name); - match db::get_manual_by_id(&ctx.data().db, id.id.0 as i64).await? { + match db::get_manual_by_id(&ctx.data().db, id.id.into()).await? { Some(m) => { ctx.say(format!("Manual info for {id}:\n```rust\n{m:#?}\n```")) .await? @@ -511,7 +511,7 @@ pub(crate) async fn add_manual( db::insert_manual( &ctx.data().db, ManualMember { - discord_id: id.id.0 as i64, + discord_id: id.id.into(), shortcode, nickname, realname, diff --git a/src/verify/login.rs b/src/verify/login.rs index 99707c1..0f6c9dc 100644 --- a/src/verify/login.rs +++ b/src/verify/login.rs @@ -56,7 +56,7 @@ pub(crate) async fn login_2( m: &serenity::MessageComponentInteraction, data: &Data, ) -> Result<(), Error> { - match crate::db::get_pending_by_id(&data.db, m.user.id.0 as i64).await { + match crate::db::get_pending_by_id(&data.db, m.user.id.into()).await { Err(e) => { eprintln!("Error in login_2: {e}"); m.create_interaction_response(&ctx.http, |i| { @@ -206,11 +206,11 @@ pub(crate) async fn login_6( match Nickname::parse(m.data.clone()) { Ok(Nickname { nickname }) => { // Delete from manual if exists - let _ = crate::db::delete_manual_by_id(&data.db, m.user.id.0 as i64).await; + let _ = crate::db::delete_manual_by_id(&data.db, m.user.id.into()).await; match crate::db::insert_member_from_pending( &data.db, - m.user.id.0 as i64, + m.user.id.into(), &nickname, fresher, ) diff --git a/src/verify/manual.rs b/src/verify/manual.rs index 83f6129..3ac6209 100644 --- a/src/verify/manual.rs +++ b/src/verify/manual.rs @@ -75,7 +75,7 @@ pub(crate) async fn manual_2( fresher: bool, ) -> Result<(), Error> { // Delete from manual if exists - let _ = crate::db::delete_manual_by_id(&data.db, m.user.id.0 as i64).await; + let _ = crate::db::delete_manual_by_id(&data.db, m.user.id.into()).await; m.create_interaction_response(&ctx.http, |i| { *i = Manual::create( @@ -118,7 +118,7 @@ pub(crate) async fn manual_3( } // Delete from pending if exists - let _ = crate::db::delete_pending_by_id(&data.db, m.user.id.0 as i64).await?; + let _ = crate::db::delete_pending_by_id(&data.db, m.user.id.into()).await?; let prompt_sent = data .au_ch_id @@ -160,7 +160,7 @@ pub(crate) async fn manual_3( let inserted = crate::db::insert_manual( &data.db, crate::ManualMember { - discord_id: m.user.id.0 as i64, + discord_id: m.user.id.into(), shortcode, nickname, realname, @@ -226,9 +226,9 @@ pub(crate) async fn manual_4( let mut member = data.server.member(&ctx.http, &user).await?; if verify { - match crate::db::insert_member_from_manual(&data.db, user.id.0 as i64).await { + match crate::db::insert_member_from_manual(&data.db, user.id.into()).await { Ok(()) => { - let fresher = crate::db::get_member_by_id(&data.db, user.id.0 as i64) + let fresher = crate::db::get_member_by_id(&data.db, user.id.into()) .await? .unwrap() .fresher; @@ -284,7 +284,7 @@ pub(crate) async fn manual_4( } } } else { - crate::db::delete_manual_by_id(&data.db, user.id.0 as i64).await?; + crate::db::delete_manual_by_id(&data.db, user.id.into()).await?; println!("{} ({}) denied via manual", user.name, user.id); m.create_interaction_response(&ctx.http, |i| { i.kind(serenity::InteractionResponseType::UpdateMessage) diff --git a/src/verify/membership.rs b/src/verify/membership.rs index acce1c0..2d9e2bb 100644 --- a/src/verify/membership.rs +++ b/src/verify/membership.rs @@ -67,10 +67,10 @@ pub(crate) async fn membership_2( fresher: bool, ) -> Result<(), Error> { // Delete from pending if exists - let _ = crate::db::delete_pending_by_id(&data.db, m.user.id.0 as i64).await; + let _ = crate::db::delete_pending_by_id(&data.db, m.user.id.into()).await; // Delete from manual if exists - let _ = crate::db::delete_manual_by_id(&data.db, m.user.id.0 as i64).await; + let _ = crate::db::delete_manual_by_id(&data.db, m.user.id.into()).await; m.create_interaction_response(&ctx.http, |i| { *i = Membership::create( @@ -133,7 +133,7 @@ pub(crate) async fn membership_3( if crate::db::insert_member( &data.db, crate::Member { - discord_id: m.user.id.0 as i64, + discord_id: m.user.id.into(), shortcode, nickname, realname: format!("{} {}", member.first_name, member.surname), diff --git a/src/verify/mod.rs b/src/verify/mod.rs index bceb965..2fe413f 100644 --- a/src/verify/mod.rs +++ b/src/verify/mod.rs @@ -59,7 +59,7 @@ pub(crate) async fn start( init: bool, ) -> Result<(), Error> { // Check if user is already verified - if let Some(member) = crate::db::get_member_by_id(&data.db, m.user.id.0 as i64).await? { + if let Some(member) = crate::db::get_member_by_id(&data.db, m.user.id.into()).await? { let mut mm = m.member.clone().unwrap(); apply_role(ctx, &mut mm, data.member).await?; if member.fresher {