diff --git a/examples/serenity/voice/src/main.rs b/examples/serenity/voice/src/main.rs index e6f0ba780..e4c69971c 100644 --- a/examples/serenity/voice/src/main.rs +++ b/examples/serenity/voice/src/main.rs @@ -74,7 +74,7 @@ async fn main() { #[command] #[only_in(guilds)] async fn deafen(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -107,7 +107,7 @@ async fn deafen(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn join(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let channel_id = guild @@ -134,7 +134,7 @@ async fn join(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn leave(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -157,7 +157,7 @@ async fn leave(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn mute(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -212,7 +212,7 @@ async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { return Ok(()); } - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -245,7 +245,7 @@ async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { #[command] #[only_in(guilds)] async fn undeafen(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -268,7 +268,7 @@ async fn undeafen(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn unmute(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await diff --git a/examples/serenity/voice_events_queue/src/main.rs b/examples/serenity/voice_events_queue/src/main.rs index 28cc771b2..c9845b201 100644 --- a/examples/serenity/voice_events_queue/src/main.rs +++ b/examples/serenity/voice_events_queue/src/main.rs @@ -87,7 +87,7 @@ async fn main() { #[command] async fn deafen(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -126,7 +126,7 @@ async fn deafen(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn join(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let channel_id = guild @@ -241,7 +241,7 @@ impl VoiceEventHandler for ChannelDurationNotifier { #[command] #[only_in(guilds)] async fn leave(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -270,7 +270,7 @@ async fn leave(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn mute(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -339,7 +339,7 @@ async fn play_fade(ctx: &Context, msg: &Message, mut args: Args) -> CommandResul return Ok(()); } - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -470,7 +470,7 @@ async fn queue(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { return Ok(()); } - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -518,7 +518,7 @@ async fn queue(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { #[command] #[only_in(guilds)] async fn skip(ctx: &Context, msg: &Message, _args: Args) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -553,7 +553,7 @@ async fn skip(ctx: &Context, msg: &Message, _args: Args) -> CommandResult { #[command] #[only_in(guilds)] async fn stop(ctx: &Context, msg: &Message, _args: Args) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -581,7 +581,7 @@ async fn stop(ctx: &Context, msg: &Message, _args: Args) -> CommandResult { #[command] #[only_in(guilds)] async fn undeafen(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) @@ -614,7 +614,7 @@ async fn undeafen(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn unmute(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx) .await diff --git a/examples/serenity/voice_receive/src/main.rs b/examples/serenity/voice_receive/src/main.rs index 82cf170e0..d6e19777a 100644 --- a/examples/serenity/voice_receive/src/main.rs +++ b/examples/serenity/voice_receive/src/main.rs @@ -192,7 +192,7 @@ async fn join(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { }, }; - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -245,7 +245,7 @@ async fn join(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { #[command] #[only_in(guilds)] async fn leave(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await diff --git a/examples/serenity/voice_storage/src/main.rs b/examples/serenity/voice_storage/src/main.rs index cbebb4929..8c56ea067 100644 --- a/examples/serenity/voice_storage/src/main.rs +++ b/examples/serenity/voice_storage/src/main.rs @@ -151,7 +151,7 @@ async fn main() { #[command] #[only_in(guilds)] async fn deafen(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -184,7 +184,7 @@ async fn deafen(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn join(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let channel_id = guild @@ -262,7 +262,7 @@ impl VoiceEventHandler for LoopPlaySound { #[command] #[only_in(guilds)] async fn leave(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -285,7 +285,7 @@ async fn leave(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn mute(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -318,7 +318,7 @@ async fn mute(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn ting(ctx: &Context, msg: &Message, _args: Args) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -344,7 +344,7 @@ async fn ting(ctx: &Context, msg: &Message, _args: Args) -> CommandResult { #[command] #[only_in(guilds)] async fn undeafen(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await @@ -368,7 +368,7 @@ async fn undeafen(ctx: &Context, msg: &Message) -> CommandResult { #[command] #[only_in(guilds)] async fn unmute(ctx: &Context, msg: &Message) -> CommandResult { - let guild = msg.guild(&ctx.cache).await.unwrap(); + let guild = msg.guild(&ctx.cache).unwrap(); let guild_id = guild.id; let manager = songbird::get(ctx).await .expect("Songbird Voice client placed in at initialisation.").clone();