refactor: update parse_user_status to return both symbol and text representation

Author: Juliandev02

src/commands/user/memberlist.rs

@@ -27,9 +27,9 @@ async fn format_to_list(member_list: &[String], fmt_color: &str) -> String {
             };
 
             let status_raw = *STATUS.read().await.get_by_name(user.username.as_str());
-            let status = parse_user_status(status_raw, false);
+            let status_symbol = parse_user_status(status_raw).0;
 
-            format!("{C_RESET}{status}{fmt_color} {username} {badge}")
+            format!("{C_RESET}{status_symbol}{fmt_color} {username} {badge}")
         }
     });
 

src/commands/user/status.rs

@@ -11,7 +11,7 @@ pub fn status() -> commands::Command {
     async fn logic(ctx: &commands::Context) -> commands::CommandResponse {
         if ctx.args.is_empty() {
             let status = *STATUS.read().await.get_by_name(ctx.executor.username.as_str());
-            return Ok(Some(format!("{BOLD}{GREEN}Your current status: {C_RESET}{}", parse_user_status(status, true))))
+            return Ok(Some(format!("{BOLD}{GREEN}Your current status: {C_RESET}{}", parse_user_status(status).1)))
         }
 
         let arg_status = &ctx.args[0];
@@ -25,7 +25,7 @@ pub fn status() -> commands::Command {
 
         STATUS.write().await.append(ctx.executor.username.as_str(), status);
 
-        Ok(Some(format!("{BOLD}{GREEN}Changed your status to {C_RESET}{}", parse_user_status(status, true))))
+        Ok(Some(format!("{BOLD}{GREEN}Changed your status to {C_RESET}{}", parse_user_status(status).1)))
     }
 
     commands::Command {

src/commands/user/userinfo.rs

@@ -62,7 +62,7 @@ pub fn userinfo() -> commands::Command {
         let date = DateTime::from_timestamp(i64::from(user.creation_date), 0).unwrap();
 
         let status_raw = *STATUS.read().await.get_by_name(user.username.as_str());
-        let status = parse_user_status(status_raw, false);
+        let status = parse_user_status(status_raw).0;
 
         let message = format!(
             "

src/utilities.rs

@@ -123,22 +123,12 @@ pub fn create_badge_list(row: &str) -> String {
         })
 }
 
-pub fn parse_user_status(status: Status, with_text: bool) -> String {
-    if with_text {
-        match status {
-            Status::Online => format!("{GREEN}Online (🟢){C_RESET}"),
-            Status::Afk => format!("{YELLOW}Afk (🌙){C_RESET}"),
-            Status::DoNotDisturb => format!("{RED}Do not disturb (🔴){C_RESET}"),
-            Status::Offline => format!("{GRAY}{BOLD}Offline (〇){C_RESET}")
-        }
-    }
-    else {
-        match status {
-            Status::Online => format!("{GREEN}🟢{C_RESET}"),
-            Status::Afk => format!("{YELLOW}🌙{C_RESET}"),
-            Status::DoNotDisturb => format!("{RED}🔴{C_RESET}"),
-            Status::Offline => format!("{GRAY}{BOLD}〇{C_RESET}")
-        }
+pub fn parse_user_status(status: Status) -> (String, String) {
+    match status {
+        Status::Online => (format!("{GREEN}🟢{C_RESET}"), format!("{GREEN}Online (🟢){C_RESET}")),
+        Status::Afk => (format!("{YELLOW}🌙{C_RESET}"), format!("{YELLOW}Afk (🌙){C_RESET}")),
+        Status::DoNotDisturb => (format!("{RED}🔴{C_RESET}"), format!("{RED}Do not disturb (🔴){C_RESET}")),
+        Status::Offline => (format!("{GRAY}{BOLD}〇{C_RESET}"), format!("{GRAY}{BOLD}Offline (〇){C_RESET}"))
     }
 }