Merge pull request #25 from null8626/main

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "topgg"
-version = "1.4.1"
+version = "1.4.2"
 edition = "2021"
 authors = ["null (https://github.com/null8626)", "Top.gg <support@top.gg> (https://top.gg)"]
 description = "The official Rust wrapper for the Top.gg API"
@@ -53,4 +53,4 @@ webhook = ["urlencoding"]
 rocket = ["webhook", "dep:rocket"]
 axum = ["webhook", "async-trait", "serde_json", "dep:axum"]
 warp = ["webhook", "async-trait", "dep:warp"]
-actix-web = ["webhook", "dep:actix-web"]
+actix-web = ["webhook", "dep:actix-web"]

src/autoposter/mod.rs

@@ -1,11 +1,11 @@
-use crate::Stats;
+use crate::{Result, Stats};
 use core::{
   ops::{Deref, DerefMut},
   time::Duration,
 };
 use std::sync::Arc;
 use tokio::{
-  sync::{RwLock, RwLockWriteGuard, Semaphore},
+  sync::{mpsc, RwLock, RwLockWriteGuard, Semaphore},
   task::{spawn, JoinHandle},
   time::sleep,
 };
@@ -131,6 +131,7 @@ pub trait Handler: Send + Sync + 'static {
 pub struct Autoposter<H> {
   handler: Arc<H>,
   thread: JoinHandle<()>,
+  receiver: Option<mpsc::UnboundedReceiver<Result<()>>>,
 }
 
 impl<H> Autoposter<H>
@@ -156,6 +157,7 @@ where
 
     let client = client.as_client();
     let handler = Arc::new(handler);
+    let (sender, receiver) = mpsc::unbounded_channel();
 
     Self {
       handler: Arc::clone(&handler),
@@ -166,12 +168,15 @@ where
           {
             let stats = handler.stats().stats.read().await;
 
-            let _ = client.post_stats(&stats).await;
+            if sender.send(client.post_stats(&stats).await).is_err() {
+              break;
+            }
           };
 
           sleep(interval).await;
         }
       }),
+      receiver: Some(receiver),
     }
   }
 
@@ -180,6 +185,18 @@ where
   pub fn handler(&self) -> Arc<H> {
     Arc::clone(&self.handler)
   }
+
+  /// Returns a future that resolves every time the [`Autoposter`] has attempted to post the bot's stats. If you want to use the receiver directly, call [`receiver`].
+  #[inline(always)]
+  pub async fn recv(&mut self) -> Option<Result<()>> {
+    self.receiver.as_mut().expect("receiver is already taken from the receiver() method. please call recv() directly from the receiver.").recv().await
+  }
+
+  /// Takes the receiver responsible for [`recv`]. Subsequent calls to this function and [`recv`] after this call will panic.
+  #[inline(always)]
+  pub fn receiver(&mut self) -> mpsc::UnboundedReceiver<Result<()>> {
+    self.receiver.take().expect("receiver() can only be called once.")
+  }
 }
 
 impl<H> Deref for Autoposter<H> {

src/bot.rs

@@ -194,14 +194,16 @@ util::debug_struct! {
   #[derive(Clone, Serialize, Deserialize)]
   Stats {
     protected {
+      #[serde(skip_serializing_if = "Option::is_none")]
       shard_count: Option<usize>,
+      #[serde(skip_serializing_if = "Option::is_none")]
       server_count: Option<usize>,
     }
 
     private {
-      #[serde(default, deserialize_with = "util::deserialize_default")]
+      #[serde(default, skip_serializing_if = "Option::is_none", deserialize_with = "util::deserialize_default")]
       shards: Option<Vec<usize>>,
-      #[serde(default, deserialize_with = "util::deserialize_default")]
+      #[serde(default, skip_serializing_if = "Option::is_none", deserialize_with = "util::deserialize_default")]
       shard_id: Option<usize>,
     }