From ba2c820d81af98397f480080c70315660f899c10 Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Thu, 1 Feb 2024 23:25:53 +0000
Subject: [PATCH] Remove redundant `avatar_url` code

---
 src/cmds/edit_members.rs | 4 ++--
 src/verify/login.rs      | 4 +---
 src/verify/manual.rs     | 8 +++-----
 src/verify/membership.rs | 2 +-
 src/verify/mod.rs        | 2 --
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/cmds/edit_members.rs b/src/cmds/edit_members.rs
index 1377736..8ccd286 100644
--- a/src/cmds/edit_members.rs
+++ b/src/cmds/edit_members.rs
@@ -1,4 +1,4 @@
-use crate::{db, verify, ACtx, Error};
+use crate::{db, ACtx, Error};
 use poise::{
     serenity_prelude::{self as serenity, CreateEmbed, CreateMessage},
     CreateReply,
@@ -31,7 +31,7 @@ pub(crate) async fn nick(
                 CreateMessage::new().embed(
                     CreateEmbed::new()
                         .title("Nick updated")
-                        .thumbnail(u.avatar_url().unwrap_or(verify::AVATAR.to_string()))
+                        .thumbnail(u.face())
                         .description(u.to_string())
                         .field("Old Nick", old_nickname, true)
                         .field("New Nick", nickname, true)
diff --git a/src/verify/login.rs b/src/verify/login.rs
index 3d2cdc0..36a8032 100644
--- a/src/verify/login.rs
+++ b/src/verify/login.rs
@@ -239,9 +239,7 @@ pub(crate) async fn login_6(
                             &ctx.http,
                             CreateMessage::new().embed(
                                 CreateEmbed::new()
-                                    .thumbnail(
-                                        m.user.avatar_url().unwrap_or(super::AVATAR.to_string()),
-                                    )
+                                    .thumbnail(m.user.face())
                                     .title("Member verified via login")
                                     .description(m.user.to_string())
                                     .field("Fresher", fresher.to_string(), true)
diff --git a/src/verify/manual.rs b/src/verify/manual.rs
index 5082c18..fc592e4 100644
--- a/src/verify/manual.rs
+++ b/src/verify/manual.rs
@@ -129,7 +129,7 @@ pub(crate) async fn manual_3(
                         .embed(
                             CreateEmbed::new()
                                 .title("New verification request from")
-                                .thumbnail(m.user.avatar_url().unwrap_or(super::AVATAR.to_string()))
+                                .thumbnail(m.user.face())
                                 .description(m.user.to_string())
                                 .field("Real Name (To be checked)", &realname, true)
                                 .field("Imperial Shortcode (To be checked", &shortcode, true)
@@ -246,9 +246,7 @@ pub(crate) async fn manual_4(
                             .components(vec![])
                             .embed(
                                 CreateEmbed::new()
-                                    .thumbnail(
-                                        user.avatar_url().unwrap_or(super::AVATAR.to_string()),
-                                    )
+                                    .thumbnail(user.face())
                                     .title("Member verified via manual")
                                     .description(user.to_string())
                                     .field("Fresher", fresher.to_string(), true)
@@ -290,7 +288,7 @@ pub(crate) async fn manual_4(
                         CreateEmbed::new()
                             .title("Member denied via manual")
                             .description(user.to_string())
-                            .thumbnail(user.avatar_url().unwrap_or(super::AVATAR.to_string()))
+                            .thumbnail(user.face())
                             .timestamp(serenity::Timestamp::now()),
                     ),
             ),
diff --git a/src/verify/membership.rs b/src/verify/membership.rs
index 7c15e57..f3ea7fd 100644
--- a/src/verify/membership.rs
+++ b/src/verify/membership.rs
@@ -179,7 +179,7 @@ pub(crate) async fn membership_3(
                         &ctx.http,
                         CreateMessage::new().embed(
                             CreateEmbed::new()
-                                .thumbnail(m.user.avatar_url().unwrap_or(super::AVATAR.to_string()))
+                                .thumbnail(m.user.face())
                                 .title("Member verified via membership")
                                 .description(m.user.to_string())
                                 .field("Fresher", fresher.to_string(), true)
diff --git a/src/verify/mod.rs b/src/verify/mod.rs
index 4726d54..f01937c 100644
--- a/src/verify/mod.rs
+++ b/src/verify/mod.rs
@@ -13,8 +13,6 @@ pub(crate) use membership::*;
 pub(crate) mod manual;
 pub(crate) use manual::*;
 
-pub(crate) const AVATAR: &str = "https://cdn.discordapp.com/embed/avatars/0.png";
-
 const INFO_MSG: &str = indoc::indoc! {"
     Nano is a Discord bot written with serenity-rs/poise and tokio-rs/axum.