From eed613a50f4a3fa1e79c59a397cc74835600d53c Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Fri, 5 May 2023 15:05:57 +0200
Subject: [PATCH] change other value parsers

---
 common/src/comp/admin.rs | 23 +++++++++++++++++++++++
 server-cli/src/cli.rs    |  5 ++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/common/src/comp/admin.rs b/common/src/comp/admin.rs
index 9dc7361ac1..d9001f032e 100644
--- a/common/src/comp/admin.rs
+++ b/common/src/comp/admin.rs
@@ -12,6 +12,29 @@ pub enum AdminRole {
     Admin = 1,
 }
 
+
+impl core::str::FromStr for AdminRole {
+    type Err = &'static str;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "mod" | "moderator" => Ok(AdminRole::Moderator),
+            "admin" => Ok(AdminRole::Admin),
+            _ => Err("Could not parse AdminRole"),
+        }
+    }
+}
+
+impl ToString for AdminRole {
+    fn to_string(&self) -> String {
+        match self {
+            AdminRole::Moderator => "moderator",
+            AdminRole::Admin => "admin",
+        }
+        .into()
+    }
+}
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Admin(pub AdminRole);
 
diff --git a/server-cli/src/cli.rs b/server-cli/src/cli.rs
index 90148cd674..f383cbf9fa 100644
--- a/server-cli/src/cli.rs
+++ b/server-cli/src/cli.rs
@@ -2,7 +2,6 @@ use clap::Parser;
 use common::comp;
 use server::persistence::SqlLogMode;
 use std::sync::mpsc::Sender;
-use strum::VariantNames;
 use tracing::error;
 
 #[derive(Clone, Debug, Parser)]
@@ -12,7 +11,7 @@ pub enum Admin {
         /// Name of the admin to whom to assign a role
         username: String,
         /// role to assign to the admin
-        #[arg(ignore_case = true, value_parser = clap::builder::PossibleValuesParser::new(comp::AdminRole::VARIANTS))]
+        #[arg(ignore_case = true, value_parser =  clap::value_parser!(comp::AdminRole))]
         role: comp::AdminRole,
     },
     Remove {
@@ -63,7 +62,7 @@ pub enum Message {
     },
     /// Enable or disable sql logging
     SqlLogMode {
-        #[arg(default_value_t, value_parser = SqlLogMode::variants())]
+        #[arg(default_value_t, value_parser = clap::value_parser!(SqlLogMode))]
         mode: SqlLogMode,
     },
     /// Disconnects all connected clients