Persist and move the voice connections on shard reconnection. (#1449)

Author: kar8uncle

include/dpp/discordclient.h

@@ -232,6 +232,11 @@ class DPP_EXPORT voiceconn {
 	 * @return reference to self
 	 */
 	voiceconn& disconnect();
+
+	/**
+	 * @brief Reassigns the owner to the given discord_client.
+	 */
+	void reassign_owner(class discord_client* o);
 };
 
 /** @brief Implements a discord client. Each discord_client connects to one shard and derives from a websocket client. */

src/dpp/discordclient.cpp

@@ -28,6 +28,7 @@
 #include <thread>
 #include <dpp/json.h>
 #include <dpp/etf.h>
+#include <utility>
 
 #define PATH_UNCOMPRESSED_JSON "/?v=" DISCORD_API_VERSION "&encoding=json"
 #define PATH_COMPRESSED_JSON "/?v=" DISCORD_API_VERSION "&encoding=json&compress=zlib-stream"
@@ -72,8 +73,12 @@ discord_client::discord_client(discord_client &old, uint64_t sequence, const std
 	  ready(false),
 	  last_heartbeat_ack(time(nullptr)),
 	  protocol(old.protocol),
+	  connecting_voice_channels(std::move(old.connecting_voice_channels)),
 	  resume_gateway_url(old.resume_gateway_url)
 {
+	for (auto& [shard_id, vconn] : connecting_voice_channels) {
+		vconn->reassign_owner(this);
+	}
 	start_connecting();
 }
 
@@ -615,5 +620,8 @@ voiceconn& voiceconn::connect(snowflake guild_id) {
 	return *this;
 }
 
+void voiceconn::reassign_owner(discord_client* o) {
+	creator = o;
+}
 
 }