diff --git a/src/cmds/members.rs b/src/cmds/members.rs index c354a14..ae7fa60 100644 --- a/src/cmds/members.rs +++ b/src/cmds/members.rs @@ -219,7 +219,7 @@ pub(crate) async fn insert_member_from_pending( match db::insert_member_from_pending(&ctx.data().db, id.user.id.into(), &nickname, fresher) .await { - Ok(()) => { + Ok(_) => { ctx.say(format!("Member moved from pending to members table: {id}")) .await? } @@ -237,7 +237,7 @@ pub(crate) async fn insert_member_from_manual( ) -> Result<(), Error> { tracing::info!("{} {}", ctx.author().name, id.user.name,); match db::insert_member_from_manual(&ctx.data().db, id.user.id.into()).await { - Ok(()) => { + Ok(_) => { ctx.say(format!("Member moved from manual to members table: {id}")) .await? } diff --git a/src/db/members.rs b/src/db/members.rs index 8811521..73aa020 100644 --- a/src/db/members.rs +++ b/src/db/members.rs @@ -131,7 +131,7 @@ pub(crate) async fn insert_member_from_pending( id: i64, nickname: &str, fresher: bool, -) -> Result<(), Error> { +) -> Result { let p = sqlx::query_as!( PendingMember, "delete from pending where discord_id=$1 returning *", @@ -149,11 +149,14 @@ pub(crate) async fn insert_member_from_pending( ) .execute(pool) .await?; - Ok(()) + Ok(p) } /// Add member entry to members table from manual table -pub(crate) async fn insert_member_from_manual(pool: &sqlx::PgPool, id: i64) -> Result<(), Error> { +pub(crate) async fn insert_member_from_manual( + pool: &sqlx::PgPool, + id: i64, +) -> Result { let m = sqlx::query_as!( ManualMember, "delete from manual where discord_id=$1 returning *", @@ -171,7 +174,7 @@ pub(crate) async fn insert_member_from_manual(pool: &sqlx::PgPool, id: i64) -> R ) .execute(pool) .await?; - Ok(()) + Ok(m) } /// Edit member shortcode field diff --git a/src/verify/login.rs b/src/verify/login.rs index 713e42f..1b00529 100644 --- a/src/verify/login.rs +++ b/src/verify/login.rs @@ -222,7 +222,7 @@ pub(crate) async fn login_6( ) .await { - Ok(()) => { + Ok(p) => { tracing::info!( "{} ({}) added via login{}", m.user.name, @@ -257,6 +257,8 @@ pub(crate) async fn login_6( .title("Member verified via login") .description(&m.user) .field("Fresher", fresher, true) + .field("Nickname", nickname, true) + .field("Name", p.realname, true) .timestamp(serenity::Timestamp::now()) }) }) diff --git a/src/verify/manual.rs b/src/verify/manual.rs index b08625c..91ec0b4 100644 --- a/src/verify/manual.rs +++ b/src/verify/manual.rs @@ -224,7 +224,7 @@ pub(crate) async fn manual_4( if verify { match crate::db::insert_member_from_manual(&data.db, user.id.into()).await { - Ok(()) => { + Ok(mm) => { let fresher = crate::db::get_member_by_id(&data.db, user.id.into()) .await? .unwrap() @@ -247,6 +247,8 @@ pub(crate) async fn manual_4( .title("Member verified via manual") .description(&user) .field("Fresher", fresher, true) + .field("Nickname", mm.nickname, true) + .field("Name", mm.realname, true) .timestamp(serenity::Timestamp::now()) }) }) diff --git a/src/verify/membership.rs b/src/verify/membership.rs index 549da5c..0bcce09 100644 --- a/src/verify/membership.rs +++ b/src/verify/membership.rs @@ -132,13 +132,14 @@ pub(crate) async fn membership_3( .await?; return Ok(()); }; + let realname = format!("{} {}", member.first_name, member.surname); if crate::db::insert_member( &data.db, crate::Member { discord_id: m.user.id.into(), shortcode, - nickname, - realname: format!("{} {}", member.first_name, member.surname), + nickname: nickname.clone(), + realname: realname.clone(), fresher, }, ) @@ -177,6 +178,8 @@ pub(crate) async fn membership_3( .title("Member verified via membership") .description(&m.user) .field("Fresher", fresher, true) + .field("Nickname", nickname, true) + .field("Name", realname, true) .timestamp(serenity::Timestamp::now()) }) })