Skip to content

Commit d26dd34

Browse files
committed
feat: Dave is now default enabled.
1 parent 7ca7a0e commit d26dd34

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

include/dpp/discordclient.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ class DPP_EXPORT voiceconn : public std::enable_shared_from_this<voiceconn> {
205205
* @param guild_id Guild to connect to the voice channel on
206206
* @param channel_id voice channel id
207207
* @param enable_dave True to enable DAVE E2EE
208-
* @warn DAVE is an EXPERIMENTAL feature!
209208
*/
210209
voiceconn(class discord_client* o, voice_connection_gateway_request_callback_t request_callback, snowflake guild_id, snowflake channel_id, bool enable_dave);
211210

@@ -608,13 +607,13 @@ class DPP_EXPORT discord_client : public websocket_client
608607
* @param channel_id Channel ID of the voice channel
609608
* @param self_mute True if the bot should mute itself
610609
* @param self_deaf True if the bot should deafen itself
611-
* @param enable_dave True to enable DAVE E2EE - EXPERIMENTAL
610+
* @param enable_dave True to enable DAVE E2EE
612611
* @return reference to self
613612
* @note This is NOT a synchronous blocking call! The bot isn't instantly ready to send or listen for audio,
614613
* as we have to wait for the connection to the voice server to be established!
615614
* e.g. wait for dpp::cluster::on_voice_ready event, and then send the audio within that event.
616615
*/
617-
discord_client& connect_voice(snowflake guild_id, snowflake channel_id, bool self_mute = false, bool self_deaf = false, bool enable_dave = false);
616+
discord_client& connect_voice(snowflake guild_id, snowflake channel_id, bool self_mute = false, bool self_deaf = false, bool enable_dave = true);
618617

619618
/**
620619
* @brief Disconnect from the connected voice channel on a guild

include/dpp/discordvoiceclient.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,6 @@ class DPP_EXPORT discord_voice_client : public websocket_client
597597
* @brief DAVE - Discord Audio Visual Encryption
598598
* Used for E2EE encryption. dave_protocol_none is
599599
* the default right now.
600-
* @warning DAVE E2EE is an EXPERIMENTAL feature!
601600
*/
602601
dave_version_t dave_version;
603602

@@ -887,9 +886,8 @@ class DPP_EXPORT discord_voice_client : public websocket_client
887886
* @param _host The voice server hostname to connect to (hostname:port format)
888887
* @param enable_dave Enable DAVE E2EE
889888
* @throw dpp::voice_exception Opus failed to initialise, or D++ is not compiled with voice support
890-
* @warning DAVE E2EE is an EXPERIMENTAL feature!
891889
*/
892-
discord_voice_client(dpp::cluster* _cluster, full_reconnection_callback_t _reconnection_callback, snowflake _channel_id, snowflake _server_id, const std::string &_token, const std::string &_session_id, const std::string &_host, bool enable_dave = false);
890+
discord_voice_client(dpp::cluster* _cluster, full_reconnection_callback_t _reconnection_callback, snowflake _channel_id, snowflake _server_id, const std::string &_token, const std::string &_session_id, const std::string &_host, bool enable_dave = true);
893891

894892
/**
895893
* @brief Destroy the discord voice client object

include/dpp/guild.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,13 +1291,12 @@ class DPP_EXPORT guild : public managed, public json_interface<guild> {
12911291
* @param self_mute True if the bot should mute itself
12921292
* @param self_deaf True if the bot should deafen itself
12931293
* @param dave True to enable DAVE E2EE
1294-
* @warning DAVE is EXPERIMENTAL and subject to change.
12951294
* @return True if the user specified is in a vc, false if they aren't
12961295
* @note This is NOT a synchronous blocking call! The bot isn't instantly ready to send or listen for audio,
12971296
* as we have to wait for the connection to the voice server to be established!
12981297
* e.g. wait for dpp::cluster::on_voice_ready event, and then send the audio within that event.
12991298
*/
1300-
bool connect_member_voice(const cluster& owner, snowflake user_id, bool self_mute = false, bool self_deaf = false, bool dave = false);
1299+
bool connect_member_voice(const cluster& owner, snowflake user_id, bool self_mute = false, bool self_deaf = false, bool dave = true);
13011300

13021301
/**
13031302
* @brief Get the banner url of the guild if it have one, otherwise returns an empty string

src/davetest/dave.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ int main() {
8080
dave_test.on_guild_create([&](const dpp::guild_create_t & event) {
8181
if (event.created.id == TEST_GUILD_ID) {
8282
dpp::discord_client* s = event.from();
83-
bool muted = false, deaf = false, enable_dave = true;
84-
s->connect_voice(TEST_GUILD_ID, TEST_VC_ID, muted, deaf, enable_dave);
83+
bool muted = false, deaf = false;
84+
s->connect_voice(TEST_GUILD_ID, TEST_VC_ID, muted, deaf);
8585
}
8686
});
8787
dave_test.start(dpp::st_wait);

0 commit comments

Comments
 (0)