From 0bb2572deba2890560e179a3cf8898d20a8222f0 Mon Sep 17 00:00:00 2001
From: Kyle Simpson <kyleandrew.simpson@gmail.com>
Date: Sun, 11 Apr 2021 10:32:45 +0100
Subject: [PATCH] Chore: Adapt #60, #64 in line with other breaking changes.

This commit undoes #64 (and bumps the library MSRV accordingly), and modifies #60 to match the new `Call` connection handling.

This was tested using `cargo make ready`, and rustc v1.49.0 on `examples/serenity/voice`.
---
 Cargo.toml     |  7 -------
 README.md      |  6 +++---
 src/handler.rs | 10 +++++-----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 148cf0ed8..805f46bcd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,11 +85,6 @@ version = "0.1"
 optional = true
 version = "1"
 
-# TEMPORARY: remove on next breaking.
-[dependencies.spinning_top]
-optional = true
-version = "=0.2.2"
-
 [dependencies.streamcatcher]
 optional = true
 version = "0.1"
@@ -153,7 +148,6 @@ gateway-core = [
     "flume",
     "parking_lot",
     "pin-project",
-    "spinning_top",
 ]
 driver = [
     "async-tungstenite",
@@ -177,7 +171,6 @@ driver-core = [
     "rand",
     "serenity-voice-model",
     "spin_sleep",
-    "spinning_top",
     "streamcatcher",
     "typemap_rev",
     "url",
diff --git a/README.md b/README.md
index 62b82d43a..a5a61f93b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![docs-badge][]][docs] [![build badge]][build] [![guild-badge][]][guild] [![crates.io version]][crates.io link] [![rust 1.48.0+ badge]][rust 1.48.0+ link]
+[![docs-badge][]][docs] [![build badge]][build] [![guild-badge][]][guild] [![crates.io version]][crates.io link] [![rust 1.49.0+ badge]][rust 1.49.0+ link]
 
 # Songbird
 
@@ -69,5 +69,5 @@ Songbird's logo is based upon the copyright-free image ["Black-Capped Chickadee"
 [crates.io link]: https://crates.io/crates/songbird
 [crates.io version]: https://img.shields.io/crates/v/songbird.svg?style=flat-square
 
-[rust 1.48.0+ badge]: https://img.shields.io/badge/rust-1.48.0+-93450a.svg?style=flat-square
-[rust 1.48.0+ link]: https://blog.rust-lang.org/2020/11/19/Rust-1.48.html
+[rust 1.49.0+ badge]: https://img.shields.io/badge/rust-1.49.0+-93450a.svg?style=flat-square
+[rust 1.49.0+ link]: https://blog.rust-lang.org/2020/12/31/Rust-1.49.0.html
diff --git a/src/handler.rs b/src/handler.rs
index a4af63440..e3929fa52 100644
--- a/src/handler.rs
+++ b/src/handler.rs
@@ -279,15 +279,15 @@ impl Call {
         }
     }
 
-    /// Returns `id` of the channel, if connected to any.
+    /// Returns `id` of the channel, if connected or connecting to any.
     ///
-    /// **Note:**: Returned `id` is of the channel, to which bot performed connection.
-    /// It is possible that it is different from actual channel due to ability of server's admin to
-    /// move bot from channel to channel. This is to be fixed with next breaking change release.
+    /// This remains set after a connection failure, to allow for reconnection
+    /// as needed. This will change if moved into another voice channel by an
+    /// admin, and will be unset if kicked from a voice channel.
     #[instrument(skip(self))]
     pub fn current_channel(&self) -> Option<ChannelId> {
         match &self.connection {
-            Some((id, _, _)) => Some(*id),
+            Some((progress, _)) => Some(progress.channel_id()),
             _ => None,
         }
     }