Merge branch 'dev' of github.com:brainboxdotcc/DPP

.clang-format

@@ -0,0 +1,66 @@
+# Generated from CLion C/C++ Code Style settings
+BasedOnStyle: LLVM
+AccessModifierOffset: -8
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: None
+AlignOperands: Align
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: No
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+ColumnLimit: 0
+CompactNamespaces: false
+ContinuationIndentWidth: 8
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+IndentWidth: 8
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PointerAlignment: Right
+ReflowComments: false
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 0
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 8
+UseTab: ForContinuationAndIndentation

CMakeLists.txt

@@ -29,10 +29,14 @@ option(DPP_FORMATTERS "Support for C++20 formatters" OFF)
 option(DPP_USE_EXTERNAL_JSON "Use an external installation of nlohmann::json" OFF)
 option(DPP_USE_PCH "Use precompiled headers to speed up compilation" OFF)
 option(AVX_TYPE "Force AVX type for speeding up audio mixing" OFF)
+option(DPP_TEST_VCPKG "Force VCPKG build without VCPKG installed (for development use only!)" OFF)
 
 include(CheckCXXSymbolExists)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 add_compile_definitions(DPP_BUILD)
+add_compile_definitions(NOMINMAX)
+
+include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/colour.cmake")
 
 set(DPP_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -50,25 +54,29 @@ string(CONCAT DPP_VERSION "${DPP_VERSION_MAJOR}.${DPP_VERSION_MINOR}.${DPP_VERSI
 
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${DPP_ROOT_PATH}/cmake/")
 
-if (DPP_NO_VCPKG)
-	message("-- INFO: Explicitly disabling VCPKG as running inside the CI action.")
+if (DPP_TEST_VCPKG)
+	message("-- ${Red}DEVELOPER WARNING${ColourReset}: Running in ${Red}VCPKG test mode${ColourReset}: EMULATING A VCPKG BUILD WITHOUT VCPKG")
 else()
-	message("-- INFO: Using VCPKG if detected")
+	if (DPP_NO_VCPKG)
+		message("-- INFO: Explicitly disabling VCPKG as running inside the CI action.")
+	else()
+		message("-- INFO: Using VCPKG if detected")
+	endif()
 endif()
 
 if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS)
 	message("-- INFO: Configuring .rc resource script")
 	configure_file("${DPP_ROOT_PATH}/src/dpp/dpp.rc.in" "${DPP_ROOT_PATH}/src/dpp/dpp.rc" NEWLINE_STYLE WIN32)
 endif()
 
-if (NOT DPP_NO_VCPKG AND EXISTS "${_VCPKG_ROOT_DIR}")
+if (DPP_TEST_VCPKG)
 	set(PROJECT_NAME "dpp")
 	project(
-		"${PROJECT_NAME}"
-		VERSION "${DPP_VERSION}"
-		LANGUAGES CXX
-		HOMEPAGE_URL "https://dpp.dev/"
-		DESCRIPTION "An incredibly lightweight C++ Discord library."
+			"${PROJECT_NAME}"
+			VERSION "${DPP_VERSION}"
+			LANGUAGES CXX
+			HOMEPAGE_URL "https://dpp.dev/"
+			DESCRIPTION "An incredibly lightweight C++ Discord library."
 	)
 
 	if (MSVC AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -82,25 +90,47 @@ if (NOT DPP_NO_VCPKG AND EXISTS "${_VCPKG_ROOT_DIR}")
 
 	add_subdirectory(library-vcpkg)
 else()
-	set(PROJECT_NAME "libdpp")
-	project(
-		"${PROJECT_NAME}"
-		VERSION "${DPP_VERSION}"
-		LANGUAGES CXX
-		HOMEPAGE_URL "https://dpp.dev/"
-		DESCRIPTION "An incredibly lightweight C++ Discord library."
-	)
-
-	if (MSVC AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		set(DPP_CLANG_CL true)
+	if (NOT DPP_NO_VCPKG AND EXISTS "${_VCPKG_ROOT_DIR}")
+		set(PROJECT_NAME "dpp")
+		project(
+			"${PROJECT_NAME}"
+			VERSION "${DPP_VERSION}"
+			LANGUAGES CXX
+			HOMEPAGE_URL "https://dpp.dev/"
+			DESCRIPTION "An incredibly lightweight C++ Discord library."
+		)
+
+		if (MSVC AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			set(DPP_CLANG_CL true)
+		endif()
+
+		# Required before we add any subdirectories.
+		if (DPP_BUILD_TEST)
+			enable_testing(${CMAKE_CURRENT_SOURCE_DIR})
+		endif()
+
+		add_subdirectory(library-vcpkg)
+	else()
+		set(PROJECT_NAME "libdpp")
+		project(
+			"${PROJECT_NAME}"
+			VERSION "${DPP_VERSION}"
+			LANGUAGES CXX
+			HOMEPAGE_URL "https://dpp.dev/"
+			DESCRIPTION "An incredibly lightweight C++ Discord library."
+		)
+
+		if (MSVC AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			set(DPP_CLANG_CL true)
+		endif()
+
+		# Required before we add any subdirectories.
+		if (DPP_BUILD_TEST)
+			enable_testing(${CMAKE_CURRENT_SOURCE_DIR})
+		endif()
+
+		add_subdirectory(library)
 	endif()
-
-	# Required before we add any subdirectories.
-	if (DPP_BUILD_TEST)
-		enable_testing(${CMAKE_CURRENT_SOURCE_DIR})
-	endif()
-
-	add_subdirectory(library)
 endif()
 
 find_package(Filesystem)
@@ -121,4 +151,4 @@ endif()
 
 if (NOT WIN32)
 	target_link_libraries(dpp PRIVATE std::filesystem)
-endif()
+endif()

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:ab64a8382e935382638764d8719362bb50ee418d944c1f3d26e0c99fae49a345
+FROM ubuntu:noble@sha256:d4f6f70979d0758d7a6f81e34a61195677f4f4fa576eaf808b79f17499fd93d1
 
 RUN apt-get update && apt-get install --no-install-recommends -y libssl-dev zlib1g-dev libopus-dev cmake pkg-config g++ gcc git make && apt-get clean && rm -rf /var/lib/apt/lists/*
 

cmake/FindOpus.cmake

@@ -18,7 +18,8 @@ endif()
 
 if(OPUS_LIBRARIES)
 	if(OPUS_USE_STATIC_LIBS)
-		find_library(LIBM NAMES "libm.a" "libm.tbd")
+		# on linux with glibc you CANT statically link libm without statically linking all of glibc. DONT DO IT.
+		#find_library(LIBM NAMES "libm.a" "libm.tbd")
 	else()
 		find_library(LIBM NAMES m)
 	endif()

docpages/example_programs/using_coroutines/coro_introduction.md

@@ -18,3 +18,5 @@ When using a `co_*` function such as `co_message_create`, the request is sent im
 You may hear that coroutines are "writing async code as if it was sync", while this is sort of correct, it may limit your understanding and especially the dangers of coroutines. I find **they are best thought of as a shortcut for a state machine**, if you've ever written one, you know what this means. Think of the lambda as *its constructor*, in which captures are variable parameters. Think of the parameters passed to your lambda as data members in your state machine. When you `co_await` something, the state machine's function exits, the program goes back to the caller, at this point the calling function may return. References are kept as references in the state machine, which means by the time the state machine is resumed, the reference may be dangling: \ref lambdas-and-locals "this is not good"!
 
 Another way to think of them is just like callbacks but keeping the current scope intact. In fact this is exactly what it is, the co_* functions call the normal API calls, with a callback that resumes the coroutine, *in the callback thread*. This means you cannot rely on thread_local variables and need to keep in mind concurrency issues with global states, as your coroutine will be resumed in another thread than the one it started on.
+
+It is also worth noting that coroutines can lead to cases where errors may fall through and remain uncaptured, requiring the user to manually handle the error. These exceptions occur because callbacks cannot be used in their typical manner, which can be observed [in the following issue](https://github.com/brainboxdotcc/DPP/issues/1222) and the \ref coro-simple-commands "sample coroutine code".

include/dpp/isa/fallback.h

@@ -20,6 +20,7 @@
  ************************************************************************************/
 #pragma once
 
+#include <dpp/export.h>
 #include <numeric>
 #include <cstdint>
 #include <limits>

library-vcpkg/CMakeLists.txt

@@ -18,14 +18,12 @@
 
 add_compile_definitions(HAVE_VOICE)
 
-file(GLOB THE_SOURCES "${DPP_ROOT_PATH}/src/dpp/events/*.cpp" "${modules_dir}/dpp/voice/enabled/*.cpp" "${DPP_ROOT_PATH}/dpp/dave/*.cpp" "${DPP_ROOT_PATH}/src/dpp/cluster/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.rc")
+file(GLOB THE_SOURCES "${DPP_ROOT_PATH}/src/dpp/events/*.cpp" "${DPP_ROOT_PATH}/src/dpp/voice/enabled/*.cpp" "${DPP_ROOT_PATH}/src/dpp/dave/*.cpp" "${DPP_ROOT_PATH}/src/dpp/cluster/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.cpp" "${DPP_ROOT_PATH}/src/dpp/*.rc")
 
 set(LIB_NAME "${PROJECT_NAME}")
 
-if(WIN32)
-	add_library("${LIB_NAME}" SHARED "${THE_SOURCES}")
-else()
-	add_library("${LIB_NAME}" STATIC "${THE_SOURCES}")
+add_library("${LIB_NAME}" SHARED "${THE_SOURCES}")
+if(NOT WIN32)
 	find_package(Threads REQUIRED)
 endif()
 
@@ -55,15 +53,17 @@ if(WIN32)
 	set(OPENSSL_VERSION "1.1.1f")
 endif()
 
+
+
 target_compile_options(
 	"${LIB_NAME}"
 	PUBLIC
 		"$<$<PLATFORM_ID:Windows>:/bigobj;/Zc:preprocessor>"
 	PRIVATE
 		"$<$<PLATFORM_ID:Windows>:$<$<CONFIG:Debug>:/sdl;/Od;/DEBUG;/MP;/DFD_SETSIZE=1024>>"
 		"$<$<PLATFORM_ID:Windows>:$<$<CONFIG:Release>:/O2;/Oi;/Oy;/GL;/Gy;/sdl;/MP;/DFD_SETSIZE=1024>>"
-		"$<$<PLATFORM_ID:Linux>:$<$<CONFIG:Debug>:-fPIC;-Wall;-Wempty-body;-Wno-psabi;-Wunknown-pragmas;-Wignored-qualifiers;-Wimplicit-fallthrough;-Wmissing-field-initializers;-Wsign-compare;-Wtype-limits;-Wuninitialized;-Wshift-negative-value;-pthread;-g;-Og;-fPIC>>"
-		"$<$<PLATFORM_ID:Linux>:$<$<CONFIG:Release>:-fPIC;-Wall;-Wempty-body;-Wno-psabi;-Wunknown-pragmas;-Wignored-qualifiers;-Wimplicit-fallthrough;-Wmissing-field-initializers;-Wsign-compare;-Wtype-limits;-Wuninitialized;-Wshift-negative-value;-pthread;-O3;-fPIC>>"
+		"$<$<PLATFORM_ID:Linux>:$<$<CONFIG:Debug>:-fPIC;-Wall;-Wempty-body;-Wno-deprecated-declarations;-Wno-psabi;-Wunknown-pragmas;-Wignored-qualifiers;-Wimplicit-fallthrough;-Wmissing-field-initializers;-Wsign-compare;-Wtype-limits;-Wuninitialized;-Wshift-negative-value;-pthread;-g;-Og;-fPIC>>"
+		"$<$<PLATFORM_ID:Linux>:$<$<CONFIG:Release>:-fPIC;-Wall;-Wempty-body;-Wno-deprecated-declarations;-Wno-psabi;-Wunknown-pragmas;-Wignored-qualifiers;-Wimplicit-fallthrough;-Wmissing-field-initializers;-Wsign-compare;-Wtype-limits;-Wuninitialized;-Wshift-negative-value;-pthread;-O3;-fPIC>>"
 		"${AVX_FLAG}"
 )
 
@@ -82,6 +82,7 @@ target_include_directories(
 	"$<INSTALL_INTERFACE:include>"
 )
 
+find_package(OpenSSL REQUIRED)
 add_subdirectory("${DPP_ROOT_PATH}/mlspp" "mlspp")
 include_directories("${DPP_ROOT_PATH}/mlspp/include")
 include_directories("${DPP_ROOT_PATH}/mlspp/lib/bytes/include")
@@ -99,8 +100,12 @@ target_link_options(
 )
 
 find_package(nlohmann_json CONFIG REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_package(Opus CONFIG REQUIRED)
+if (DPP_TEST_VCPKG)
+	include("${CMAKE_CURRENT_SOURCE_DIR}/../cmake/FindOpus.cmake")
+	find_package(Opus REQUIRED)
+else()
+	find_package(Opus CONFIG REQUIRED)
+endif()
 find_package(ZLIB REQUIRED)
 
 target_link_libraries(