Fix missing cache variable when temp_cache feature is enabled (#3384)

This fixes an issue introduced in [commit][cmt] when trying to rewrite with new
1.88 let-chains.

[cmt]: ffaf185

Author: NateDiamond13

src/model/channel/channel_id.rs

@@ -55,21 +55,24 @@ impl ChannelId {
         guild_id: Option<GuildId>,
     ) -> Result<GuildChannel> {
         #[cfg(feature = "cache")]
-        if let Some(cache) = cache_http.cache()
-            && let Some(guild_id) = guild_id
-            && let Some(guild) = cache.guild(guild_id)
-            && let Some(channel) = guild.channels.get(&self)
-        {
-            return Ok(channel.clone());
-        }
-
-        #[cfg(feature = "temp_cache")]
-        if let Some(temp_channel) = cache.temp_channels.get(&self) {
-            if guild_id.is_some_and(|id| temp_channel.base.guild_id != id) {
-                return Err(Error::Model(ModelError::ChannelNotFound));
+        // Ignore clippy, the two `if let`s must be separated
+        #[allow(clippy::collapsible_if)]
+        if let Some(cache) = cache_http.cache() {
+            if let Some(guild_id) = guild_id
+                && let Some(guild) = cache.guild(guild_id)
+                && let Some(channel) = guild.channels.get(&self)
+            {
+                return Ok(channel.clone());
             }
 
-            return Ok(GuildChannel::clone(&temp_channel));
+            #[cfg(feature = "temp_cache")]
+            if let Some(temp_channel) = cache.temp_channels.get(&self) {
+                if guild_id.is_some_and(|id| temp_channel.base.guild_id != id) {
+                    return Err(Error::Model(ModelError::ChannelNotFound));
+                }
+
+                return Ok(GuildChannel::clone(&temp_channel));
+            }
         }
 
         let channel = cache_http.http().get_channel(self.widen()).await?;

src/model/channel/thread.rs

@@ -33,21 +33,24 @@ impl ThreadId {
         guild_id: Option<GuildId>,
     ) -> Result<GuildThread> {
         #[cfg(feature = "cache")]
-        if let Some(cache) = cache_http.cache()
-            && let Some(guild_id) = guild_id
-            && let Some(guild) = cache.guild(guild_id)
-            && let Some(thread) = guild.threads.get(&self)
-        {
-            return Ok(thread.clone());
-        }
-
-        #[cfg(feature = "temp_cache")]
-        if let Some(temp_thread) = cache.temp_threads.get(&self) {
-            if guild_id.is_some_and(|id| temp_thread.base.guild_id != id) {
-                return Err(Error::Model(ModelError::ChannelNotFound));
+        // Ignore clippy, the two `if let`s must be separated
+        #[allow(clippy::collapsible_if)]
+        if let Some(cache) = cache_http.cache() {
+            if let Some(guild_id) = guild_id
+                && let Some(guild) = cache.guild(guild_id)
+                && let Some(thread) = guild.threads.get(&self)
+            {
+                return Ok(thread.clone());
             }
 
-            return Ok(GuildThread::clone(&temp_thread));
+            #[cfg(feature = "temp_cache")]
+            if let Some(temp_thread) = cache.temp_threads.get(&self) {
+                if guild_id.is_some_and(|id| temp_thread.base.guild_id != id) {
+                    return Err(Error::Model(ModelError::ChannelNotFound));
+                }
+
+                return Ok(GuildThread::clone(&temp_thread));
+            }
         }
 
         let channel = cache_http.http().get_channel(self.widen()).await?;