From 509743fd40664de742e1e84149ba076f35226dfa Mon Sep 17 00:00:00 2001
From: Gnome! <david2005thomas@Gmail.com>
Date: Mon, 9 Oct 2023 03:22:45 +0100
Subject: [PATCH] Fix compiling with latest serenity (#199)

---
 examples/serenity/voice/src/main.rs         |  3 ++-
 examples/serenity/voice_receive/src/main.rs | 15 ++++++---------
 src/id.rs                                   |  6 +++---
 src/manager.rs                              |  8 +++-----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/examples/serenity/voice/src/main.rs b/examples/serenity/voice/src/main.rs
index 8e4377b..e66ed21 100644
--- a/examples/serenity/voice/src/main.rs
+++ b/examples/serenity/voice/src/main.rs
@@ -31,7 +31,8 @@ use serenity::{
     framework::{
         standard::{
             macros::{command, group},
-            Args, CommandResult,
+            Args,
+            CommandResult,
         },
         StandardFramework,
     },
diff --git a/examples/serenity/voice_receive/src/main.rs b/examples/serenity/voice_receive/src/main.rs
index 0c4d03b..5218c56 100644
--- a/examples/serenity/voice_receive/src/main.rs
+++ b/examples/serenity/voice_receive/src/main.rs
@@ -234,16 +234,13 @@ async fn main() {
 #[command]
 #[only_in(guilds)]
 async fn join(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let connect_to = match args.single::<std::num::NonZeroU64>() {
-        Ok(id) => ChannelId(id),
-        Err(_) => {
-            check_msg(
-                msg.reply(ctx, "Requires a valid voice channel ID be given")
-                    .await,
-            );
+    let Ok(connect_to) = args.single::<ChannelId>() else {
+        check_msg(
+            msg.reply(ctx, "Requires a valid voice channel ID be given")
+                .await,
+        );
 
-            return Ok(());
-        },
+        return Ok(());
     };
 
     let guild_id = msg.guild_id.unwrap();
diff --git a/src/id.rs b/src/id.rs
index eba6e7f..494f992 100644
--- a/src/id.rs
+++ b/src/id.rs
@@ -45,7 +45,7 @@ impl From<NonZeroU64> for ChannelId {
 #[cfg(feature = "serenity")]
 impl From<SerenityChannel> for ChannelId {
     fn from(id: SerenityChannel) -> Self {
-        Self(id.0)
+        Self(NonZeroU64::new(id.get()).unwrap())
     }
 }
 
@@ -71,7 +71,7 @@ impl From<NonZeroU64> for GuildId {
 #[cfg(feature = "serenity")]
 impl From<SerenityGuild> for GuildId {
     fn from(id: SerenityGuild) -> Self {
-        Self(id.0)
+        Self(NonZeroU64::new(id.get()).unwrap())
     }
 }
 
@@ -104,7 +104,7 @@ impl From<NonZeroU64> for UserId {
 #[cfg(feature = "serenity")]
 impl From<SerenityUser> for UserId {
     fn from(id: SerenityUser) -> Self {
-        Self(id.0)
+        Self(NonZeroU64::new(id.get()).unwrap())
     }
 }
 
diff --git a/src/manager.rs b/src/manager.rs
index b0032f8..c363370 100644
--- a/src/manager.rs
+++ b/src/manager.rs
@@ -443,11 +443,9 @@ impl VoiceGatewayManager for Songbird {
     }
 
     async fn state_update(&self, guild_id: SerenityGuild, voice_state: &VoiceState) {
-        if self
-            .client_data
-            .get()
-            .map_or(true, |data| voice_state.user_id.0 != data.user_id.0)
-        {
+        if self.client_data.get().map_or(true, |data| {
+            voice_state.user_id.get() != data.user_id.0.get()
+        }) {
             return;
         }