some cleanup

src/commands/moderation/userinfo.rs

@@ -4,15 +4,10 @@ use crate::utils::Emoji;
 use crate::utils::{CommandError, Error};
 use crate::{utils, CommandResult};
 use chrono::{DateTime, Utc};
-use log::debug;
-use serde::export::TryFrom;
-use std::borrow::Borrow;
 use std::sync::Arc;
-use std::time::Duration;
 use twilight::builders::embed::EmbedBuilder;
 use twilight::model::channel::Message;
 use twilight::model::guild::Permissions;
-use twilight::model::id::ChannelId;
 use twilight::model::user::UserFlags;
 
 pub async fn userinfo(ctx: Arc<Context>, msg: Message, mut parser: Parser) -> CommandResult {

src/core/context/logpump.rs

@@ -1,14 +1,18 @@
 use crate::core::Context;
+use crate::utils::Error;
 use crate::utils::LogType;
 use chrono::Utc;
 
 impl Context {
-    pub fn log(&self, guild_id: u64, log: LogType) {
+    pub fn log(&self, guild_id: u64, log: LogType) -> Result<(), Error> {
         match self.log_pumps.get(&guild_id) {
             Some(pump) => {
-                pump.value().send((Utc::now(), log));
+                pump.value()
+                    .send((Utc::now(), log))
+                    .map_err(|_| Error::LogError(guild_id))?;
+                Ok(())
             }
-            None => {}
-        };
+            None => Ok(()),
+        }
     }
 }

src/core/context/mod.rs

@@ -18,8 +18,6 @@ use twilight::model::gateway::payload::MemberChunk;
 use twilight::model::id::GuildId;
 use twilight::model::user::CurrentUser;
 
-const GIT_VERSION: &str = git_version!();
-
 pub struct Context {
     pub cache: InMemoryCache,
     pub cluster: Cluster,

src/core/handlers/general.rs

@@ -62,8 +62,8 @@ pub async fn handle_event(shard_id: u64, event: &Event, ctx: Arc<Context>) -> Re
                 Some(nonce) => {
                     debug!("waiter found: {}", ctx.chunk_requests.contains_key(nonce));
                     match ctx.chunk_requests.remove(nonce) {
-                        Some(mut waiter) => {
-                            waiter.1.send(chunk.clone());
+                        Some(waiter) => {
+                            waiter.1.send(chunk.clone()).expect("Something went wrong when trying to forward a member chunk to it's receiver");
                         }
                         None => {}
                     }

src/utils/errors.rs

@@ -30,6 +30,7 @@ pub enum Error {
     UnknownEmoji(String),
     Serde(serde_json::error::Error),
     ParseError(ParseError),
+    LogError(u64),
 }
 
 #[derive(Debug)]
@@ -120,6 +121,11 @@ impl fmt::Display for Error {
             Error::UnknownEmoji(e) => write!(f, "Unknown emoji: {}", e),
             Error::Serde(e) => write!(f, "Serde error: {}", e),
             Error::ParseError(e) => write!(f, "{}", e),
+            Error::LogError(guild_id) => write!(
+                f,
+                "Something went horribly wrong when trying to push to the logpump for guild {}",
+                guild_id
+            ),
         }
     }
 }