Updates! (Fixed the caches)

Author: RealTimeChris

Include/discordcoreapi/FoundationEntities.hpp

@@ -1745,7 +1745,7 @@ namespace DiscordCoreAPI {
 		String asset{};///< Asset value for the Sticker.
 		String name{};///< The Sticker's name.
 		String tags{};///< Tags for the Sticker to use.
-		
+
 		UserData user{};///< The User that uploaded the Guild Sticker.
 
 		StickerData() noexcept = default;
@@ -1924,7 +1924,7 @@ namespace DiscordCoreAPI {
 		GuildScheduledEventStatus status{};///< The status of the scheduled event.
 		String scheduledStartTime{};///< The time the scheduled event will start.
 		String scheduledEndTime{};///< The time the scheduled event will end, required if entity_type is External.
-		Uint32 userCount{ 0 };///< The number of users subscribed to the scheduled event.		
+		Uint32 userCount{ 0 };///< The number of users subscribed to the scheduled event.
 		Snowflake channelId{};///< The Channel id in which the scheduled event will be hosted, or null if scheduled entity type is External.
 		String description{};///< The description of the scheduled event(1 - 1000 characters.
 		Snowflake guildId{};///< The Guild id which the scheduled event belongs to.
@@ -2163,9 +2163,9 @@ namespace DiscordCoreAPI {
 	class DiscordCoreAPI_Dll ApplicationCommandOptionChoiceData {
 	  public:
 		UMap<String, String> nameLocalizations{};///< Dictionary with keys in available locales Localization dictionary for the name field.
+		JsonObject value{};
 		JsonType type{};///< The value of the option.
-		String value{};
-		String name{};///< The name of the current choice.		
+		String name{};///< The name of the current choice.
 
 		ApplicationCommandOptionChoiceData() noexcept = default;
 

Include/discordcoreapi/Utilities.hpp

@@ -163,7 +163,7 @@ namespace DiscordCoreAPI {
 	template<typename TheType>
 	concept IsString = std::same_as<TheType, String>;
 
-	struct EnumConverter {
+	struct DiscordCoreAPI_Dll EnumConverter {
 		template<IsEnum EnumType> EnumConverter& operator=(EnumType other) {
 			this->theUint = static_cast<Uint64>(other);
 			return *this;
@@ -190,12 +190,8 @@ namespace DiscordCoreAPI {
 
 		operator Vector<Uint64>() const noexcept;
 
-		operator Vector<Uint64>() noexcept;
-
 		explicit operator Uint64() const noexcept;
 
-		explicit operator Uint64() noexcept;
-
 		bool isItAVector() const noexcept;
 		bool isItAVector() noexcept;
 
@@ -205,7 +201,7 @@ namespace DiscordCoreAPI {
 		Uint64 theUint{};
 	};
 
-	class JsonObject {
+	class DiscordCoreAPI_Dll JsonObject {
 	  public:
 		using ObjectType = std::map<String, JsonObject, std::less<>, std::allocator<std::pair<const String, JsonObject>>>;
 		template<typename Type> using AllocatorType = std::allocator<Type>;
@@ -1052,8 +1048,8 @@ namespace DiscordCoreAPI {
 			Int32 secondsPerMonth{ secondsPerDay * daysPerMonth };
 			Int32 daysPerYear{ 365 };
 			Int32 secondsPerYear{ secondsPerDay * daysPerYear };
-			Int32 secondsToAdd =
-				(yearsToAdd * secondsPerYear) + (monthsToAdd * secondsPerMonth) + (daysToAdd * secondsPerDay) + (hoursToAdd * secondsPerHour) + (minutesToAdd * secondsPerMinute);
+			Int32 secondsToAdd = (yearsToAdd * secondsPerYear) + (monthsToAdd * secondsPerMonth) + (daysToAdd * secondsPerDay) + ((hoursToAdd + 8) * secondsPerHour) +
+				(minutesToAdd * secondsPerMinute);
 			result += secondsToAdd;
 			auto resultTwo = std::localtime(&result);
 			String theReturnString{};

Source/ChannelEntities.cpp

@@ -464,7 +464,11 @@ namespace DiscordCoreAPI {
 			return;
 		}
 		if (Channels::doWeCacheChannels) {
-			Channels::cache.emplace(std::move(channel));
+			if (!Channels::cache.contains(channel)) {
+				Channels::cache.emplace(std::move(channel));
+			} else {
+				Channels::cache[channel] = std::move(channel);
+			}
 			if (Channels::cache.size() % 1000 == 0) {
 				std::cout << "CHANNEL COUNT: " << Channels::cache.size() << std::endl;
 			}

Source/FoundationEntities.cpp

@@ -1260,6 +1260,9 @@ namespace DiscordCoreAPI {
 			voiceConnectInitData.selfMute = selfMute;
 			StopWatch theStopWatch{ 10000ms };
 			DiscordCoreClient::getVoiceConnection(this->id)->connect(voiceConnectInitData);
+			while (!DiscordCoreClient::getVoiceConnection(this->id)->areWeConnected()) {
+				std::this_thread::sleep_for(1ms);
+			}
 			this->voiceConnectionPtr = DiscordCoreClient::getVoiceConnection(this->id);
 			return this->voiceConnectionPtr;
 		} else {
@@ -3115,23 +3118,23 @@ namespace DiscordCoreAPI {
 		theData["name_localizations"] = this->nameLocalizations;
 		switch (this->type) {
 			case JsonType::Integer: {
-				theData["value"] = Uint64{ stoull(this->value) };
+				theData["value"] = Uint64{ this->value.theValue.numberUint };
 				break;
 			}
 			case JsonType::Float: {
-				theData["value"] = Double{ stod(this->value) };
+				theData["value"] = Double{ this->value.theValue.numberDouble };
 				break;
 			}
 			case JsonType::Boolean: {
-				if (this->value == "false") {
+				if (this->value.theValue.boolean == false) {
 					theData["value"] = Bool{ false };
 				} else {
 					theData["value"] = Bool{ true };
 				}
 				break;
 			}
 			case JsonType::String: {
-				theData["value"] = this->value;
+				theData["value"] = *this->value.theValue.string;
 				break;
 			}
 		}
@@ -3571,7 +3574,7 @@ namespace DiscordCoreAPI {
 		choiceData.name = theName;
 		StringView theString{};
 		if (theValue["value"].get(theString) == simdjson::error_code::SUCCESS) {
-			choiceData.value = theString;
+			choiceData.value.theValue = static_cast<String>(theString);
 			this->choices.emplace_back(choiceData);
 			return *this;
 		}

Source/GuildEntities.cpp

@@ -1065,7 +1065,11 @@ namespace DiscordCoreAPI {
 		}
 		if (Guilds::doWeCacheGuilds) {
 			guild.discordCoreClient = Guilds::discordCoreClient;
-			Guilds::cache.emplace(std::move(guild));
+			if (!Guilds::cache.contains(guild)) {
+				Guilds::cache.emplace(std::move(guild));
+			} else {
+				Guilds::cache[guild] = std::move(guild);
+			}
 			if (Guilds::cache.size() % 100 == 0) {
 				std::cout << "THE GUILD COUNT: " << Guilds::cache.size() << ", TOTAL TIME: " << theStopWatch.totalTimePassed() << std::endl;
 			}

Source/GuildMemberEntities.cpp

@@ -338,7 +338,11 @@ namespace DiscordCoreAPI {
 			return;
 		}
 		if (GuildMembers::doWeCacheGuildMembers) {
-			GuildMembers::cache.emplace(std::move(guildMember));
+			if (!GuildMembers::cache.contains(guildMember)) {
+				GuildMembers::cache.emplace(std::move(guildMember));
+			} else {
+				GuildMembers::cache[guildMember] = std::move(guildMember);
+			}
 			if (GuildMembers::cache.size() % 1000 == 0) {
 				std::cout << "THE GUILDMEMBER COUNT: " << GuildMembers::cache.size() << std::endl;
 			}

Source/RoleEntities.cpp

@@ -351,7 +351,11 @@ namespace DiscordCoreAPI {
 			return;
 		}
 		if (Roles::doWeCacheRoles) {
-			Roles::cache.emplace(std::move(role));
+			if (!Roles::cache.contains(role)) {
+				Roles::cache.emplace(std::move(role));
+			} else {
+				Roles::cache[role] = std::move(role);
+			}
 			if (Roles::cache.size() % 1000 == 0) {
 				std::cout << "ROLE COUNT: " << Roles::cache.size() << ", AFTER: " << theStopWatchNew.totalTimePassed() << "s" << std::endl;
 			}

Source/UserEntities.cpp

@@ -272,7 +272,11 @@ namespace DiscordCoreAPI {
 			return;
 		}
 		if (Users::doWeCacheUsers) {
-			Users::cache.emplace(std::move(user));
+			if (!Users::cache.contains(user)) {
+				Users::cache.emplace(std::move(user));
+			} else {
+				Users::cache[user] = std::move(user);
+			}
 			if (Users::cache.size() % 1000 == 0) {
 				std::cout << "USERS COUNT: " << Users::cache.size() << std::endl;
 			}

Source/Utilities.cpp

@@ -82,22 +82,10 @@ namespace DiscordCoreAPI {
 		return theObject;
 	}
 
-	EnumConverter::operator Vector<Uint64>() noexcept {
-		Vector<Uint64> theObject{};
-		for (auto& value: this->theVector) {
-			theObject.emplace_back(value);
-		}
-		return theObject;
-	}
-
 	EnumConverter::operator Uint64() const noexcept {
 		return this->theUint;
 	}
 
-	EnumConverter::operator Uint64() noexcept {
-		return this->theUint;
-	}
-
 	bool EnumConverter::isItAVector() const noexcept {
 		return this->vectorType;
 	}

Source/VoiceConnection.cpp

@@ -932,7 +932,7 @@ namespace DiscordCoreAPI {
 		if (this->taskThread01) {
 			this->taskThread01->request_stop();
 			if (this->taskThread01->joinable()) {
-				this->taskThread01->join();
+				this->taskThread01->detach();
 			}
 			this->taskThread01.reset(nullptr);
 		}
@@ -942,7 +942,7 @@ namespace DiscordCoreAPI {
 			}
 			this->taskThread02->request_stop();
 			if (this->taskThread02->joinable()) {
-				this->taskThread02->join();
+				this->taskThread02->detach();
 			}
 			this->taskThread02.reset(nullptr);
 		}