From aab4b43cc7a74926eb0ea72e2b3e0583d697e002 Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:04:28 +0100
Subject: [PATCH] Add logging to autoverification

---
 src/verify/login.rs      | 12 ++++++------
 src/verify/manual.rs     | 19 +++++++++++++------
 src/verify/membership.rs | 12 ++++++------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/verify/login.rs b/src/verify/login.rs
index 0885bca..c2cbf7e 100644
--- a/src/verify/login.rs
+++ b/src/verify/login.rs
@@ -217,6 +217,12 @@ pub(crate) async fn login_6(
             .await
             {
                 Ok(()) => {
+                    println!(
+                        "{} ({}) added via login{}",
+                        m.user.name,
+                        m.user.id,
+                        if fresher { " (fresher)" } else { "" }
+                    );
                     let mut mm = m.member.clone().unwrap();
                     crate::verify::apply_role(ctx, &mut mm, data.member).await?;
                     if fresher {
@@ -236,12 +242,6 @@ pub(crate) async fn login_6(
                             })
                     })
                     .await?;
-                    println!(
-                        "{} ({}) added via login{}",
-                        m.user.name,
-                        m.user.id,
-                        if fresher { " (fresher)" } else { "" }
-                    );
                     data.au_ch_id
                         .send_message(&ctx.http, |cm| {
                             cm.add_embed(|e| {
diff --git a/src/verify/manual.rs b/src/verify/manual.rs
index 0e5e5da..662465c 100644
--- a/src/verify/manual.rs
+++ b/src/verify/manual.rs
@@ -223,6 +223,8 @@ pub(crate) async fn manual_4(
         .await
         .unwrap_or_default();
 
+    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 {
             Ok(()) => {
@@ -230,16 +232,21 @@ pub(crate) async fn manual_4(
                     .await?
                     .unwrap()
                     .fresher;
-                let mut mm = m.member.clone().unwrap();
-                crate::verify::apply_role(ctx, &mut mm, data.member).await?;
+                println!(
+                    "{} ({}) added via manual{}",
+                    user.name,
+                    user.id,
+                    if fresher { " (fresher)" } else { "" }
+                );
+                crate::verify::apply_role(ctx, &mut member, data.member).await?;
                 if fresher {
-                    crate::verify::apply_role(ctx, &mut mm, data.fresher).await?;
+                    crate::verify::apply_role(ctx, &mut member, data.fresher).await?;
                 }
                 m.create_interaction_response(&ctx.http, |i| {
                     i.kind(serenity::InteractionResponseType::UpdateMessage)
                         .interaction_response_data(|d| {
                             d.components(|c| c).embed(|e| {
-                                e.thumbnail(m.user.avatar_url().unwrap_or(
+                                e.thumbnail(user.avatar_url().unwrap_or(
                                     "https://cdn.discordapp.com/embed/avatars/0.png".to_string(),
                                 ))
                                 .title("Member verified via manual")
@@ -249,7 +256,7 @@ pub(crate) async fn manual_4(
                             })
                         })
                 })
-                .await?
+                .await?;
             }
             Err(e) => {
                 eprintln!("Error: {e}");
@@ -263,7 +270,7 @@ pub(crate) async fn manual_4(
             }
         }
     } else {
-        println!("{} ({}) denied via manual", m.user.name, m.user.id);
+        println!("{} ({}) denied via manual", user.name, user.id);
         m.create_interaction_response(&ctx.http, |i| {
             i.kind(serenity::InteractionResponseType::UpdateMessage)
                 .interaction_response_data(|d| {
diff --git a/src/verify/membership.rs b/src/verify/membership.rs
index 432915b..c31bf53 100644
--- a/src/verify/membership.rs
+++ b/src/verify/membership.rs
@@ -143,6 +143,12 @@ pub(crate) async fn membership_3(
             .await
             .is_ok()
             {
+                println!(
+                    "{} ({}) added via membership{}",
+                    m.user.name,
+                    m.user.id,
+                    if fresher { " (fresher)" } else { "" }
+                );
                 let mut mm = m.member.clone().unwrap();
                 crate::verify::apply_role(ctx, &mut mm, data.member).await?;
                 if fresher {
@@ -162,12 +168,6 @@ pub(crate) async fn membership_3(
                         })
                 })
                 .await?;
-                println!(
-                    "{} ({}) added via membership{}",
-                    m.user.name,
-                    m.user.id,
-                    if fresher { " (fresher)" } else { "" }
-                );
                 data.au_ch_id
                     .send_message(&ctx.http, |cm| {
                         cm.add_embed(|e| {