0.8.2 - Fix Discord RPC

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vrc-log"
-version = "0.8.0"
+version = "0.8.2"
 authors = ["Shayne Hartford <[email protected]>"]
 edition = "2021"
 description = "VRChat Local Cache Avatar ID Logger"

src/discord.rs

@@ -51,13 +51,12 @@ pub fn get_dev_id() -> String {
 #[once(option = true, sync_writes = true)]
 pub fn get_user_id() -> Option<String> {
     let discord = Discord::start();
-    let user = discord.user.lock().clone();
 
-    // block_until_event will never timeout
+    // block_until_event will never time out
     std::thread::sleep(Duration::from_secs(5));
     discord.client.shutdown().ok()?;
 
-    Some(match user {
+    let user_id = match discord.user.lock().clone() {
         None => get_dev_id(),
         Some(user) => {
             let userid = user.id.unwrap_or_else(get_dev_id);
@@ -75,5 +74,7 @@ pub fn get_user_id() -> Option<String> {
                 userid
             }
         }
-    })
+    };
+
+    Some(user_id)
 }

src/provider/avtrdb.rs

@@ -39,20 +39,18 @@ impl Provider for AvtrDB {
             .send()?;
 
         let status = response.status();
-        debug!("[{}] {status} | {}", Type::AvtrDB, response.text()?);
+        let text = response.text()?;
+        debug!("[{}] {status} | {text}", Type::AVTRDB);
 
         let unique = match status.as_u16() {
             200 | 404 => false,
             201 => true,
             429 => {
-                warn!("[{}] 429 Rate Limit, Please Wait 1 Minute...", Type::AvtrDB);
+                warn!("[{}] 429 Rate Limit, Please Wait 1 Minute...", Type::AVTRDB);
                 std::thread::sleep(Duration::from_secs(60));
                 self.send_avatar_id(avatar_id)?
             }
-            _ => {
-                error!("[{}] {status}", Type::AvtrDB);
-                false
-            }
+            _ => bail!("[{}] {status} | {text}", Type::AVTRDB),
         };
 
         Ok(unique)

src/provider/doughnut.rs

@@ -45,10 +45,7 @@ impl Provider for Doughnut {
         let unique = match status.as_u16() {
             200 => false,
             404 => true,
-            _ => {
-                error!("[{}] {status} | {text}", Type::DOUGHNUT);
-                false
-            }
+            _ => bail!("[{}] {status} | {text}", Type::DOUGHNUT),
         };
 
         Ok(unique)

src/provider/jeff.rs

@@ -45,10 +45,7 @@ impl Provider for Jeff {
         let unique = match status.as_u16() {
             200 => false,
             404 => true,
-            _ => {
-                error!("[{}] {status} | {text}", Type::JEFF);
-                false
-            }
+            _ => bail!("[{}] {status} | {text}", Type::JEFF),
         };
 
         Ok(unique)

src/provider/neko.rs

@@ -45,10 +45,7 @@ impl Provider for Neko {
         let unique = match status.as_u16() {
             200 => false,
             404 => true,
-            _ => {
-                error!("[{}] {status} | {text}", Type::NEKO);
-                false
-            }
+            _ => bail!("[{}] {status} | {text}", Type::NEKO),
         };
 
         Ok(unique)

src/provider/vrcdb.rs

@@ -55,10 +55,7 @@ impl Provider for VRCDB {
                 debug!("New Avatars can take up to a day to be processed");
                 true
             }
-            _ => {
-                error!("[{}] {status} | {text}", Type::VRCDB);
-                false
-            }
+            _ => bail!("[{}] {status} | {text}", Type::VRCDB),
         };
 
         Ok(unique)