DiscordCoreAPI v1.40

-Removing superfluous functions from the OggDemuxer class and updating.
-Modifying the MatroskaDemuxer class to better handle end-of-string demuxing.
-Removing FFMPEG as a dependency as a result of having written our own audio Demuxers. For the Matroska and Ogg containers. Significant reduction to build time as well as memory usage while streaming audio.
-Switching from std::copy to std::memcpy.
-Modified it so that the library can now be built statically.

Author: RealTimeChris

BuildTools/Classes/Packager/Vcpkg.php

@@ -164,7 +164,8 @@ function constructPortAndVersionFile(string $sha512 = "0"): string
 	INSTALL "${SOURCE_PATH}/License.md"
 	DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 	RENAME copyright
-)';
+)
+';
         // ./Vcpkg/ports/discordcoreapi/vcpkg.json
         $versionFileContent = '{
   "name": "discordcoreapi",

Include/discordcoreapi/DiscordCoreClient.hpp

@@ -31,7 +31,7 @@
 #include <discordcoreapi/ChannelEntities.hpp>
 #include <discordcoreapi/CoRoutine.hpp>
 #include <discordcoreapi/CommandController.hpp>
-#include <discordcoreapi/EventEntities.hpp>
+#include <discordcoreapi/Utilities/EventEntities.hpp>
 #include <discordcoreapi/EventManager.hpp>
 #include <discordcoreapi/GuildEntities.hpp>
 #include <discordcoreapi/GuildMemberEntities.hpp>

Include/discordcoreapi/EventManager.hpp

@@ -29,7 +29,7 @@
 #include <discordcoreapi/ApplicationCommandEntities.hpp>
 #include <discordcoreapi/AutoModerationEntities.hpp>
 #include <discordcoreapi/ChannelEntities.hpp>
-#include <discordcoreapi/EventEntities.hpp>
+#include <discordcoreapi/Utilities/EventEntities.hpp>
 #include <discordcoreapi/GuildEntities.hpp>
 #include <discordcoreapi/GuildMemberEntities.hpp>
 #include <discordcoreapi/MessageEntities.hpp>

Include/discordcoreapi/FoundationEntities.hpp

@@ -800,13 +800,13 @@ namespace DiscordCoreAPI {
 	  public:
 		friend class GuildData;
 
-		String unicodeEmoji{};///< Emoji representing the Role.
 		Permissions permissions{};///< The Role's base Guild Permissions.
-		String name{};///< The Role's name.
+		String unicodeEmoji{};///< Emoji representing the Role.
 		Snowflake guildId{};///< The id of the Guild that this Role is from.
 		int16_t position{};///< Its position amongst the rest of the Guild's roles.
 		RoleFlags flags{};///< Role flags.
 		int32_t color{};///< The Role's color.
+		String name{};///< The Role's name.
 
 		RoleData() noexcept = default;
 
@@ -917,9 +917,9 @@ namespace DiscordCoreAPI {
 		Permissions permissions{};///< Their base-level Permissions in the Guild.
 		GuildMemberFlags flags{};///< GuildMember flags.
 		TimeStamp joinedAt{};///< When they joined the Guild.
-		String nick{};///< Their nick/display name.
 		Snowflake guildId{};///< The current Guild's id.
 		UserIdBase user{};
+		String nick{};///< Their nick/display name.
 
 		GuildMemberData() noexcept = default;
 
@@ -974,10 +974,10 @@ namespace DiscordCoreAPI {
 		Permissions permissions{};///< Their base-level Permissions in the Guild.
 		GuildMemberFlags flags{};///< GuildMember flags.
 		TimeStamp joinedAt{};///< When they joined the Guild.
-		String nick{};///< Their nick/display name.
 		Snowflake guildId{};///< The current Guild's id.
 		IconHash avatar{};///< This GuildMember's Guild Avatar.
 		UserData user{};
+		String nick{};///< Their nick/display name.
 
 		GuildMemberCacheData() noexcept = default;
 
@@ -1052,13 +1052,13 @@ namespace DiscordCoreAPI {
 		ChannelType type{ ChannelType::DM };///< The type of the Channel.
 		SortOrderTypes defaultSortOrder{};///< Default sorting order for a forum thread.
 		uint32_t memberCount{};///< Count of members active in the Channel.
-		String topic{};///< Channel topic.
 		Snowflake parentId{};///< Snowflake of the Channel's parent Channel/category.
-		String name{};///< Name of the Channel.
 		ChannelFlags flags{};///< Flags combined as a bitmask.
 		uint16_t position{};///< The position of the Channel, in the Guild's Channel list.
 		Snowflake ownerId{};///< Snowflake of the Channel's owner.
 		Snowflake guildId{};///< Snowflake of the Channel's Guild, if applicable.
+		String topic{};///< Channel topic.
+		String name{};///< Name of the Channel.
 
 		ChannelData() noexcept = default;
 
@@ -1769,24 +1769,24 @@ namespace DiscordCoreAPI {
 	/// \brief Data structure representing a single Guild.
 	class DiscordCoreAPI_Dll GuildData : public DiscordEntity {
 	  public:
-		DiscordCoreClient* discordCoreClient{};///< A pointer to the DiscordCoreClient.
-		VoiceConnection* voiceConnection{};///< A pointer to the VoiceConnection, if present.
-		std::vector<PresenceUpdateData> presences{};///< Presence states for each of the GuildMembers.
 		std::vector<Snowflake> guildScheduledEvents{};///< Array of Guild channels.
-		std::vector<Snowflake> voiceStates{};///< Voice states for each of the guild members.
-		std::vector<Snowflake> members{};///< Array of GuildMembers.
+		std::vector<PresenceUpdateData> presences{};///< Presence states for each of the GuildMembers.
 		std::vector<Snowflake> stageInstances{};///< Array of Guild channels.
+		DiscordCoreClient* discordCoreClient{};///< A pointer to the DiscordCoreClient.
+		std::vector<Snowflake> voiceStates{};///< Voice states for each of the guild members.
+		VoiceConnection* voiceConnection{};///< A pointer to the VoiceConnection, if present.
 		std::vector<Snowflake> stickers{};///< Array of Guild channels.
 		std::vector<Snowflake> channels{};///< Array of Guild channels.
+		std::vector<Snowflake> members{};///< Array of GuildMembers.
 		std::vector<Snowflake> threads{};///< Array of Guild channels.
 		std::vector<Snowflake> roles{};///< Array of Guild roles.
 		std::vector<Snowflake> emoji{};///< Array of Guild channels.
 		uint32_t memberCount{};///< Member count.
 		TimeStamp joinedAt{};///< When the bot joined this Guild.
-		String name{};///< The Guild's name.
 		Snowflake ownerId{};///< User id of the Guild's owner.
 		GuildFlags flags{};///< Guild flags.
 		IconHash icon{};///< Url to the Guild's icon.
+		String name{};///< The Guild's name.
 
 		GuildData() noexcept = default;
 

Include/discordcoreapi/SongAPI.hpp

@@ -26,7 +26,7 @@
 #pragma once
 
 #include <discordcoreapi/FoundationEntities.hpp>
-#include <discordcoreapi/EventEntities.hpp>
+#include <discordcoreapi/Utilities/EventEntities.hpp>
 #include <discordcoreapi/GuildMemberEntities.hpp>
 #include <discordcoreapi/VoiceConnection.hpp>
 

Include/discordcoreapi/TCPConnection.hpp

@@ -27,7 +27,7 @@
 
 #include <discordcoreapi/Utilities/RingBuffer.hpp>
 #include <discordcoreapi/FoundationEntities.hpp>
-#include <discordcoreapi/EventEntities.hpp>
+#include <discordcoreapi/Utilities/EventEntities.hpp>
 
 #ifndef OPENSSL_NO_DEPRECATED
 	#define OPENSSL_NO_DEPRECATED

Include/discordcoreapi/Utilities/AudioEncoder.hpp

@@ -30,13 +30,13 @@
 
 namespace DiscordCoreInternal {
 
-	struct DiscordCoreAPI_Dll EncoderReturnData {
+	struct EncoderReturnData {
 		std::basic_string_view<uint8_t> data{};
 		uint64_t sampleCount{};
 	};
 
-	struct DiscordCoreAPI_Dll OpusEncoderWrapper {
-		struct DiscordCoreAPI_Dll OpusEncoderDeleter {
+	struct OpusEncoderWrapper {
+		struct OpusEncoderDeleter {
 			inline void operator()(OpusEncoder* other) noexcept {
 				if (other) {
 					opus_encoder_destroy(other);

Include/discordcoreapi/Utilities/Demuxers.hpp

@@ -44,7 +44,7 @@ namespace DiscordCoreInternal {
 		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
 
-	class DiscordCoreAPI_Dll MatroskaDemuxer {
+	class MatroskaDemuxer {
 	  public:
 		inline MatroskaDemuxer(bool doWePrintErrorsNew) noexcept {
 			doWePrintErrors = doWePrintErrorsNew;
@@ -193,7 +193,7 @@ namespace DiscordCoreInternal {
 		}
 	};
 
-	class DiscordCoreAPI_Dll OpusPacket {
+	class OpusPacket {
 	  public:
 		inline OpusPacket() noexcept = default;
 
@@ -204,7 +204,7 @@ namespace DiscordCoreInternal {
 		std::basic_string_view<uint8_t> data{};
 	};
 
-	class DiscordCoreAPI_Dll OggPage {
+	class OggPage {
 	  public:
 
 		inline OggPage(std::basic_string_view<uint8_t>& newData) noexcept {
@@ -263,7 +263,7 @@ namespace DiscordCoreInternal {
 		}
 	};
 
-	class DiscordCoreAPI_Dll OggDemuxer {
+	class OggDemuxer {
 	  public:
 
 		inline OggDemuxer(bool doWePrintErrorsNew) noexcept {

Include/discordcoreapi/Utilities/Etf.hpp

@@ -29,7 +29,7 @@
 
 namespace DiscordCoreAPI {
 
-	struct DiscordCoreAPI_Dll DCAException : public std::runtime_error {
+	struct DCAException : public std::runtime_error {
 		DCAException(const std::string& error, std::source_location location = std::source_location::current()) noexcept;
 	};
 
@@ -70,7 +70,7 @@ namespace DiscordCoreInternal {
 		}
 	}
 
-	struct DiscordCoreAPI_Dll EtfParseError : public DiscordCoreAPI::DCAException {
+	struct EtfParseError : public DiscordCoreAPI::DCAException {
 	  public:
 		inline explicit EtfParseError(const std::string& message) : DCAException(message){};
 	};
@@ -91,7 +91,7 @@ namespace DiscordCoreInternal {
 
 	constexpr uint8_t formatVersion{ 131 };
 
-	class DiscordCoreAPI_Dll EtfParser {
+	class EtfParser {
 	  public:
 		friend class WebSocketClient;
 
@@ -447,7 +447,7 @@ namespace DiscordCoreInternal {
 		}
 	};
 
-	struct DiscordCoreAPI_Dll EtfSerializeError : public DiscordCoreAPI::DCAException {
+	struct EtfSerializeError : public DiscordCoreAPI::DCAException {
 	  public:
 		inline EtfSerializeError(const std::string& message, std::source_location location = std::source_location::current())
 			: DCAException(message, location){};
@@ -514,7 +514,7 @@ namespace DiscordCoreInternal {
 		typename ValueType::key_type;
 	} && HasRange<ValueType> && !EtfSerializerT<ValueType>;
 
-	class DiscordCoreAPI_Dll EtfSerializer {
+	class EtfSerializer {
 	  public:
 		using MapAllocatorType = std::allocator<std::pair<const std::string, EtfSerializer>>;
 		template<typename ValueType> using allocator = std::allocator<std::decay_t<ValueType>>;