Merge branch 'dev' into dev

include/dpp/discordclient.h

@@ -504,6 +504,20 @@ class DPP_EXPORT discord_client : public websocket_client
 	 */
 	discord_client& connect_voice(snowflake guild_id, snowflake channel_id, bool self_mute = false, bool self_deaf = false);
 
+	/**
+	 * @brief Change voice channel
+	 * 
+	 * @param guild_id Guild where the voice channel is
+	 * @param channel_id Channel ID of the voice channel
+	 * @param self_mute True if the bot should mute itself
+	 * @param self_deaf True if the bot should deafen itself
+	 * @return reference to self
+	 * @note This is NOT a synchronous blocking call! The bot isn't instantly ready to send or listen for audio,
+	 * as we have to wait for the connection to the voice server to be established!
+	 * e.g. wait for dpp::cluster::on_voice_ready event, and then send the audio within that event.
+	 */
+	discord_client& change_voice_channel(snowflake guild_id, snowflake channel_id, bool self_mute = false, bool self_deaf = false);
+
 	/**
 	 * @brief Disconnect from the connected voice channel on a guild
 	 * 

src/dpp/discordclient.cpp

@@ -636,6 +636,36 @@ discord_client& discord_client::connect_voice(snowflake guild_id, snowflake chan
 	return *this;
 }
 
+discord_client& discord_client::change_voice_channel(snowflake guild_id, snowflake channel_id, bool self_mute, bool self_deaf) {
+#ifdef HAVE_VOICE
+	std::unique_lock lock(voice_mutex);
+	if (connecting_voice_channels.find(guild_id) != connecting_voice_channels.end()) {
+		if (connecting_voice_channels[guild_id]->channel_id != channel_id) {
+			connecting_voice_channels[guild_id] = std::make_unique<voiceconn>(this, channel_id);
+			/* Once sent, this expects two events (in any order) on the websocket:
+			* VOICE_SERVER_UPDATE and VOICE_STATUS_UPDATE
+			*/
+			log(ll_debug, "Sending op 4 to change VC channel, guild " + std::to_string(guild_id) + " channel  " + std::to_string(channel_id));
+			queue_message(jsonobj_to_string(json({
+				{ "op", 4 },
+				{ "d", {
+						{ "guild_id", std::to_string(guild_id) },
+						{ "channel_id", std::to_string(channel_id) },
+						{ "self_mute", self_mute },
+						{ "self_deaf", self_deaf },
+					}
+				}
+			})), false);
+		} else {
+			log(ll_debug, "Requested the bot switch to voice channel " + std::to_string(channel_id) + " on guild " + std::to_string(guild_id) + ", but it seems we are already in this VC");
+		}
+	} else {
+		log(ll_debug, "Requested the bot switch to voice channel " + std::to_string(channel_id) + " on guild " + std::to_string(guild_id) + ", but we aren't connected to a VC");
+	}
+#endif
+	return *this;
+}
+
 std::string discord_client::jsonobj_to_string(const nlohmann::json& json) {
 	if (protocol == ws_json) {
 		return json.dump();