Few more minor refactorings

src/cache/cache.rs

@@ -46,21 +46,21 @@ impl Cache {
             guilds: DashMap::new().into(),
             users: DashMap::new().into(),
             messages: stretto::AsyncCache::new(
-                (constants::MAX_MESSAGES * 10).try_into().unwrap(),
+                (constants::MAX_MESSAGES * 10) as usize,
                 constants::MAX_MESSAGES.into(),
                 tokio::spawn,
             )
             .unwrap(),
             autostar_channel_ids: autostar_channel_ids.into(),
             guild_vote_emojis: DashMap::new().into(),
             guild_autostar_channel_names: stretto::AsyncCache::new(
-                (constants::MAX_NAMES * 10).try_into().unwrap(),
+                (constants::MAX_NAMES * 10) as usize,
                 constants::MAX_NAMES.into(),
                 tokio::spawn,
             )
             .unwrap(),
             guild_starboard_names: stretto::AsyncCache::new(
-                (constants::MAX_NAMES * 10).try_into().unwrap(),
+                (constants::MAX_NAMES * 10) as usize,
                 constants::MAX_NAMES.into(),
                 tokio::spawn,
             )
@@ -92,9 +92,10 @@ impl Cache {
 
     // helper methods
     pub fn guild_emoji_exists(&self, guild_id: Id<GuildMarker>, emoji_id: Id<EmojiMarker>) -> bool {
-        self.guilds.with(&guild_id, |_, guild| match guild {
-            None => false,
-            Some(guild) => guild.emojis.contains(&emoji_id),
+        self.guilds.with(&guild_id, |_, guild| {
+            guild
+                .as_ref()
+                .map_or(false, |guild| guild.emojis.contains(&emoji_id))
         })
     }
 
@@ -114,7 +115,7 @@ impl Cache {
                 let guild = guild.as_ref().unwrap();
 
                 if let Some(thread_parent_id) = guild.active_thread_parents.get(&channel_id) {
-                    current_channel_id = Some(thread_parent_id.to_owned());
+                    current_channel_id = Some(*thread_parent_id);
                     return false;
                 }
 
@@ -245,10 +246,10 @@ impl Cache {
 
             // check if the channel_id is a known thread, and use the parent_id
             // if it is.
-            let channel_id = match guild.active_thread_parents.get(&channel_id) {
-                None => channel_id,
-                Some(parent_id) => *parent_id,
-            };
+            let channel_id = guild
+                .active_thread_parents
+                .get(&channel_id)
+                .map_or(channel_id, |&parent_id| parent_id);
 
             // check the cached nsfw/sfw channel list
             if let Some(channel) = guild.channels.get(&channel_id) {

src/cache/events/channel.rs

@@ -18,7 +18,7 @@ impl UpdateCache for ChannelCreate {
                 .insert(self.id, CachedChannel::from_channel(channel, self));
 
             guild
-        })
+        });
     }
 }
 
@@ -32,14 +32,13 @@ impl UpdateCache for ChannelDelete {
 
         cache.guilds.alter(&guild_id, |_, mut guild| {
             guild.channels.remove(&self.id);
-            guild.active_thread_parents = guild
+
+            guild
                 .active_thread_parents
-                .into_iter()
-                .filter(|(_, channel_id)| channel_id != &self.id)
-                .collect();
+                .retain(|_, &mut channel_id| channel_id != self.id);
 
             guild
-        })
+        });
     }
 }
 
@@ -58,6 +57,6 @@ impl UpdateCache for ChannelUpdate {
                 .insert(self.id, CachedChannel::from_channel(channel, self));
 
             guild
-        })
+        });
     }
 }

src/cache/events/message.rs

@@ -34,7 +34,7 @@ impl UpdateCache for MessageDelete {
 impl UpdateCache for MessageDeleteBulk {
     async fn update_cache(&self, cache: &Cache) {
         for id in &self.ids {
-            cache.messages.insert(id.clone(), None, 1).await;
+            cache.messages.insert(*id, None, 1).await;
         }
     }
 }

src/cache/events/thread.rs

@@ -22,7 +22,7 @@ impl UpdateCache for ThreadCreate {
         cache.guilds.alter(&guild_id, |_, mut guild| {
             guild.active_thread_parents.insert(self.id, parent_id);
             guild
-        })
+        });
     }
 }
 
@@ -32,7 +32,7 @@ impl UpdateCache for ThreadDelete {
         cache.guilds.alter(&self.guild_id, |_, mut guild| {
             guild.active_thread_parents.remove(&self.id);
             guild
-        })
+        });
     }
 }
 
@@ -60,7 +60,7 @@ impl UpdateCache for ThreadUpdate {
             }
 
             guild
-        })
+        });
     }
 }
 
@@ -84,7 +84,7 @@ impl UpdateCache for ThreadListSync {
                     .filter(|(_, parent_id)| !channel_ids.contains(parent_id))
                     .collect();
 
-                for thread in self.threads.iter() {
+                for thread in &self.threads {
                     if let Some(parent_id) = thread.parent_id {
                         threads.insert(thread.id, parent_id);
                     }
@@ -94,6 +94,6 @@ impl UpdateCache for ThreadListSync {
             }
 
             guild
-        })
+        });
     }
 }

src/client/config.rs

@@ -18,15 +18,15 @@ impl Config {
         };
         let token = env::var("DISCORD_TOKEN").expect("DISCORD_TOKEN not set");
         let shards = env::var("SHARDS")
-            .unwrap_or("1".to_string())
+            .unwrap_or_else(|_| "1".to_string())
             .parse()
             .unwrap();
         let db_url = env::var("SB_DATABASE_URL").expect("No database url specified.");
         let error_channel = env::var("ERROR_CHANNEL_ID")
             .ok()
             .map(|v| v.parse().expect("Invalid ID for error log channel."));
         let development = env::var("DEVELOPMENT")
-            .unwrap_or("false".to_string())
+            .unwrap_or_else(|_| "false".to_string())
             .parse()
             .expect("Invalid boolean for DEVELOPMENT.");
         let owner_ids = env::var("OWNER_IDS").ok().map(|var| {

src/client/cooldowns.rs

@@ -17,3 +17,9 @@ impl Cooldowns {
         }
     }
 }
+
+impl Default for Cooldowns {
+    fn default() -> Self {
+        Self::new()
+    }
+}

src/core/embedder/main.rs

@@ -20,9 +20,7 @@ impl Embedder<'_> {
     ) -> Result<twilight_http::Response<twilight_model::channel::Message>, twilight_http::Error>
     {
         bot.http
-            .create_message(Id::new(
-                self.config.starboard.channel_id.try_into().unwrap(),
-            ))
+            .create_message(Id::new(self.config.starboard.channel_id as u64))
             .content(&self.get_top_text(false))
             .unwrap()
             .exec()
@@ -37,10 +35,7 @@ impl Embedder<'_> {
     ) -> Result<twilight_http::Response<twilight_model::channel::Message>, twilight_http::Error>
     {
         bot.http
-            .update_message(
-                Id::new(self.config.starboard.channel_id.try_into().unwrap()),
-                message_id,
-            )
+            .update_message(Id::new(self.config.starboard.channel_id as u64), message_id)
             .content(Some(&self.get_top_text(trashed)))
             .unwrap()
             .exec()

src/core/emoji.rs

@@ -91,7 +91,7 @@ impl EmojiCommon for SimpleEmoji {
         // input. https://emojipedia.org/variation-selector-16/
         let input = input
             .strip_suffix('\u{fe0f}')
-            .map_or((&input).to_string(), |s| s.to_string());
+            .map_or_else(|| input.to_string(), |s| s.to_string());
 
         if emojis::get(&input).is_some() {
             Some(Self {
@@ -151,7 +151,7 @@ impl EmojiCommon for Vec<SimpleEmoji> {
 
     async fn from_user_input(input: String, bot: &StarboardBot, guild_id: Id<GuildMarker>) -> Self {
         let mut arr = Vec::new();
-        for piece in (&input).split(' ') {
+        for piece in input.split(' ') {
             let emoji = SimpleEmoji::from_user_input(piece.to_string(), bot, guild_id).await;
             if let Some(emoji) = emoji {
                 arr.push(emoji);

src/core/starboard/handle.rs

@@ -58,8 +58,8 @@ impl RefreshMessage<'_> {
     async fn get_configs(&mut self) -> sqlx::Result<Arc<Vec<StarboardConfig>>> {
         if self.configs.is_none() {
             let msg = self.get_sql_message().await?;
-            let guild_id = Id::new(msg.guild_id.try_into().unwrap());
-            let channel_id = Id::new(msg.channel_id.try_into().unwrap());
+            let guild_id = Id::new(msg.guild_id as u64);
+            let channel_id = Id::new(msg.channel_id as u64);
 
             let configs = StarboardConfig::list_for_channel(self.bot, guild_id, channel_id)
                 .await
@@ -132,7 +132,7 @@ impl<'this, 'bot> RefreshStarboard<'this, 'bot> {
             StarboardMessage::set_last_point_count(
                 &self.refresh.bot.pool,
                 sb_msg.starboard_message_id,
-                points.try_into().unwrap(),
+                points as i16,
             )
             .await?;
 
@@ -143,8 +143,8 @@ impl<'this, 'bot> RefreshStarboard<'this, 'bot> {
                         .bot
                         .http
                         .delete_message(
-                            Id::new(self.config.starboard.channel_id.try_into().unwrap()),
-                            Id::new(sb_msg.starboard_message_id.try_into().unwrap()),
+                            Id::new(self.config.starboard.channel_id as u64),
+                            Id::new(sb_msg.starboard_message_id as u64),
                         )
                         .exec()
                         .await;
@@ -154,7 +154,7 @@ impl<'this, 'bot> RefreshStarboard<'this, 'bot> {
                     let ret = embedder
                         .edit(
                             self.refresh.bot,
-                            Id::new(sb_msg.starboard_message_id.try_into().unwrap()),
+                            Id::new(sb_msg.starboard_message_id as u64),
                             false,
                         )
                         .await;
@@ -164,7 +164,7 @@ impl<'this, 'bot> RefreshStarboard<'this, 'bot> {
                     let ret = embedder
                         .edit(
                             self.refresh.bot,
-                            Id::new(sb_msg.starboard_message_id.try_into().unwrap()),
+                            Id::new(sb_msg.starboard_message_id as u64),
                             true,
                         )
                         .await;

src/core/starboard/msg_status.rs

@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use twilight_model::id::Id;
 
 use crate::{client::bot::StarboardBot, database::Message as DbMessage, errors::StarboardResult};
@@ -20,8 +18,8 @@ pub async fn get_message_status(
     message: &DbMessage,
     points: i32,
 ) -> StarboardResult<MessageStatus> {
-    let guild_id = Id::new(starboard_config.starboard.guild_id.try_into().unwrap());
-    let sb_channel_id = Id::new(starboard_config.starboard.channel_id.try_into().unwrap());
+    let guild_id = Id::new(starboard_config.starboard.guild_id as u64);
+    let sb_channel_id = Id::new(starboard_config.starboard.channel_id as u64);
     let sb_is_nsfw = bot
         .cache
         .fog_channel_nsfw(bot, guild_id, sb_channel_id)

src/core/starboard/reaction_events.rs

@@ -105,9 +105,9 @@ pub async fn handle_reaction_add(
         &emoji,
         configs,
         Id::new(event.user_id.try_into().unwrap()),
-        Id::new(orig_msg.message_id.try_into().unwrap()),
-        Id::new(orig_msg.channel_id.try_into().unwrap()),
-        Id::new(orig_msg.author_id.try_into().unwrap()),
+        Id::new(orig_msg.message_id as u64),
+        Id::new(orig_msg.channel_id as u64),
+        Id::new(orig_msg.author_id as u64),
         author_is_bot,
         None,
     )
@@ -200,9 +200,9 @@ pub async fn handle_reaction_remove(
         &emoji,
         configs,
         Id::new(event.user_id.try_into().unwrap()),
-        Id::new(orig.message_id.try_into().unwrap()),
-        Id::new(orig.channel_id.try_into().unwrap()),
-        Id::new(orig.author_id.try_into().unwrap()),
+        Id::new(orig.message_id as u64),
+        Id::new(orig.channel_id as u64),
+        Id::new(orig.author_id as u64),
         author.is_bot,
         None,
     )