Dev

.cspell.json

@@ -75,7 +75,10 @@
 		"clion",
 		"followup",
 		"gifv",
-		"ctls"
+		"ctls",
+		"ctest",
+		"automod",
+		"amod"
 	],
 	"flagWords": [
 		"hte"

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
         run: cd build && ninja 
 
       - name: Run unit tests
-        run: cd build && ./test
+        run: cd build && ctest -VV
         env:
           DPP_UNIT_TEST_TOKEN: ${{secrets.DPP_UNIT_TEST_TOKEN}}
           TEST_GUILD_ID: ${{secrets.TEST_GUILD_ID}}
@@ -82,6 +82,8 @@ jobs:
       fail-fast: false # Don't fail everything if one fails. We want to test each OS/Compiler individually
       matrix:
         cfg:
+          - { arch: 'amd64', os: ubuntu-latest, cpp-version: g++-11 }
+          - { arch: 'amd64', os: ubuntu-latest, cpp-version: g++-10 }
           - { arch: 'amd64', os: ubuntu-20.04, cpp-version: g++-9 }
 
     steps:

.github/workflows/gitguardian.yml

@@ -0,0 +1,21 @@
+name: GitGuardian scan
+
+on: [push]
+
+jobs:
+  scanning:
+    name: GitGuardian scan
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # fetch all history so multiple commits can be scanned
+      - name: GitGuardian scan
+        uses: GitGuardian/ggshield-action@master
+        env:
+          GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
+          GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
+          GITHUB_PULL_BASE_SHA:  ${{ github.event.pull_request.base.sha }}
+          GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+          GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

.gitignore

@@ -10,3 +10,6 @@ src/build
 *.autosave
 .misspell-fixer.ignore
 core
+compile_commands.json
+tags
+.cache

.vscode/settings.json

@@ -72,6 +72,7 @@
 		"random": "cpp",
 		"variant": "cpp",
 		"unordered_set": "cpp",
-		"codecvt": "cpp"
+		"codecvt": "cpp",
+		"future": "cpp"
 	}
 }

CMakeLists.txt

@@ -48,6 +48,8 @@ project(libdpp VERSION ${DPP_VERSION} LANGUAGES CXX)
 check_cxx_symbol_exists(prctl "sys/prctl.h" HAVE_PRCTL)
 check_cxx_symbol_exists(pthread_setname_np "pthread.h" HAVE_PTHREAD_SETNAME_NP)
 
+add_compile_definitions(DPP_OS=${CMAKE_SYSTEM_NAME})
+
 if(WIN32 AND NOT MINGW)
 	if (NOT WINDOWS_32_BIT)
 		message("-- Building for windows with precompiled packaged dependencies")
@@ -286,9 +288,16 @@ target_compile_features(dpp PRIVATE cxx_variadic_templates)
 target_compile_features(dpp PRIVATE cxx_attribute_deprecated)
 
 if (DPP_BUILD_TEST)
-	add_executable(test ${coresrc})
-	target_compile_features(test PRIVATE cxx_std_17)
-	target_link_libraries(test PUBLIC ${modname})
+	enable_testing(${PROJECT_SOURCE_DIR})
+	add_executable(unittest ${coresrc})
+	target_compile_features(unittest PRIVATE cxx_std_17)
+	target_link_libraries(unittest PUBLIC ${modname})
+	add_test(
+		NAME unittests
+		COMMAND unittest
+		WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+	)
+
 endif()
 
 if(HAVE_PRCTL)

Doxyfile

@@ -47,7 +47,7 @@ PROJECT_NUMBER	 =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF	  = "A Lightweight C++ library for Discord"
+PROJECT_BRIEF	  = "C++ Discord API Bot Library"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
@@ -751,7 +751,7 @@ WARN_LOGFILE	   =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT		  = docpages src include
+INPUT		  = docpages include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -805,18 +805,8 @@ EXCLUDE_SYMLINKS       = YES
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */json_fwd.hpp \
-			*/json.hpp \
-			*/format.cpp \
-			*/format.h \
-			*/printf.h \
-			*/os.h \
-			*/os.cpp \
-			*/color.h \
-			*/compile.h \
-			*/ostream.h \
-			*/ranges.h \
-			*/format-inl.h
+EXCLUDE_PATTERNS       = */dpp/nlohmann/* \
+			*/dpp/fmt/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

README.md

@@ -5,6 +5,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/39b054c38bba411d9b25b39524016c9e)](https://www.codacy.com/gh/brainboxdotcc/DPP/dashboard?utm_source=github.com&utm_medium=referral&utm_content=brainboxdotcc/DPP&utm_campaign=Badge_Grade) 
 ![Lines of code](https://img.shields.io/tokei/lines/github/brainboxdotcc/DPP) 
 [![D++ CI](https://github.com/brainboxdotcc/DPP/actions/workflows/ci.yml/badge.svg)](https://github.com/brainboxdotcc/DPP/actions/workflows/ci.yml)
+[![AUR version](https://img.shields.io/aur/version/dpp)](https://aur.archlinux.org/packages/dpp)
 
 D++ is a lightweight and efficient library for Discord written in modern C++. It is designed to cover as much of the API specification as possible and to have a incredibly small memory footprint, even when caching large amounts of data.
 

buildtools/changelog.php

@@ -4,119 +4,118 @@
 
 // Pattern list
 $categories = [
-	'break'			=>	'💣 Breaking Changes',
-	'breaking'		=>	'💣 Breaking Changes',
-	'feat'			=>	'✨ New Features',
-	'feature'		=>	'✨ New Features',
-	'add'			=>	'✨ New Features',
-	'added'			=>	'✨ New Features',
-	'fix'			=> 	'🐞 Bug Fixes',
-	'bug'			=> 	'🐞 Bug Fixes',
-	'bugfix'		=> 	'🐞 Bug Fixes',
-	'fixed'			=> 	'🐞 Bug Fixes',
-	'fixes'                 =>      '🐞 Bug Fixes',
-	'perf'			=>	'🚀 Performance Improvements',
-	'performance'	=>	'🚀 Performance Improvements',
-	'impro'			=> 	'♻️ Refactoring',
-	'improved'		=> 	'♻️ Refactoring',
-	'improvement'	=> 	'♻️ Refactoring',
-	'refactor'		=> 	'♻️ Refactoring',
-	'refactored'	=> 	'♻️ Refactoring',
-	'deprecated'    =>      '♻️ Refactoring',
-	'deprecate'    =>      '♻️ Refactoring',
-	'remove'		=> 	'♻️ Refactoring',
-	'change'		=> 	'♻️ Refactoring',
-	'changed'		=> 	'♻️ Refactoring',
-	'test'			=>	'🚨 Testing',
-	'testing'		=>	'🚨 Testing',
-	'ci' 			=>	'👷 Build/CI',
-	'build' 		=>	'👷 Build/CI',
-	'docs'			=> 	'📚 Documentation',
-	'documentation'	=> 	'📚 Documentation',
-	'style'			=> 	'💎 Style Changes',
-	'chore' 		=>	'🔧 Chore',
-	'misc' 		=>	'📜 Miscellaneous Changes',
-	'update'          =>      '📜 Miscellaneous Changes',
-	'updated'          =>      '📜 Miscellaneous Changes',
+    'break' => '💣 Breaking Changes',
+    'breaking' => '💣 Breaking Changes',
+    'feat' => '✨ New Features',
+    'feature' => '✨ New Features',
+    'add' => '✨ New Features',
+    'added' => '✨ New Features',
+    'fix' => '🐞 Bug Fixes',
+    'bug' => '🐞 Bug Fixes',
+    'bugfix' => '🐞 Bug Fixes',
+    'fixed' => '🐞 Bug Fixes',
+    'fixes' => '🐞 Bug Fixes',
+    'perf' => '🚀 Performance Improvements',
+    'performance' => '🚀 Performance Improvements',
+    'impro' => '♻️ Refactoring',
+    'improved' => '♻️ Refactoring',
+    'improvement' => '♻️ Refactoring',
+    'refactor' => '♻️ Refactoring',
+    'refactored' => '♻️ Refactoring',
+    'deprecated' => '♻️ Refactoring',
+    'deprecate' => '♻️ Refactoring',
+    'remove' => '♻️ Refactoring',
+    'change' => '♻️ Refactoring',
+    'changed' => '♻️ Refactoring',
+    'test' => '🚨 Testing',
+    'testing' => '🚨 Testing',
+    'ci' => '👷 Build/CI',
+    'build' => '👷 Build/CI',
+    'docs' => '📚 Documentation',
+    'documentation' => '📚 Documentation',
+    'style' => '💎 Style Changes',
+    'chore' => '🔧 Chore',
+    'misc' => '📜 Miscellaneous Changes',
+    'update' => '📜 Miscellaneous Changes',
+    'updated' => '📜 Miscellaneous Changes',
 ];
 
 $catgroup = [];
 $changelog = [];
 $githubstyle = true;
 if (count($argv) > 2 && $argv[1] == '--discord') {
-	$githubstyle = false;
+    $githubstyle = false;
 }
 
 // Magic sauce
 exec("git log --format=\"%s\" $(git log --no-walk --tags | head -n1 | cut -d ' ' -f 2)..HEAD | grep -v '^Merge '", $changelog);
 
 // Leadin
 if ($githubstyle) {
-	echo "The changelog is listed below:\n\nRelease Changelog\n===========\n";
+    echo "The changelog is listed below:\n\nRelease Changelog\n===========\n";
 } else {
-	echo "The changelog is listed below:\n\n__**Release Changelog**__\n";
+    echo "The changelog is listed below:\n\n__**Release Changelog**__\n";
 }
 
 // Case insensitive removal of duplicates
 $changelog = array_intersect_key($changelog, array_unique(array_map("strtolower", $changelog)));
 
 foreach ($changelog as $change) {
-	
-	// Wrap anything that looks like a symbol name in backticks
-	$change = preg_replace('/([\w_\/]+\.\w+|\S+\(\)|\w+::\w+|dpp::\w+|utility::\w+|(\w+_\w+)+)/', '`$1`', $change);
-	$change = preg_replace("/vs(\d+)/", "Visual Studio $1", $change);
-	$change = preg_replace("/\bfaq\b/", "FAQ", $change);
-	$change = preg_replace("/\bdiscord\b/", "Discord", $change);
-	$change = preg_replace("/\bmicrosoft\b/", "Microsoft", $change);
-	$change = preg_replace("/\bwindows\b/", "Windows", $change);
-	$change = preg_replace("/\blinux\b/", "Linux", $change);
-	$change = preg_replace("/\sarm(\d+)\s/i", ' ARM$1 ', $change);
-	$change = preg_replace("/\b(was|is|wo)nt\b/i", '$1n\'t', $change);
-	$change = preg_replace("/\bfreebsd\b/", 'FreeBSD', $change);
-	
-	// Match keywords against categories
-	$matched = false;
-	foreach ($categories as $cat => $header) {
-		// Purposefully ignored
-		if (preg_match("/^Merge (branch|pull request|remote-tracking branch) /", $change) or preg_match("/version bump/i", $change)) {
-			$matched = true;
-			continue;
-		}
-		// Groupings
-		if ((preg_match("/^" . $cat . ":/i", $change)) or (preg_match("/^\[" . $cat . "\//i", $change)) or (preg_match("/^\[" . $cat . "\]/i", $change))or (preg_match("/^\[" . $cat . ":/i", $change)) or (preg_match("/^" . $cat . "\//i", $change)) or (preg_match("/^" . $cat . ":/i", $change))) {
-			if (!isset($catgroup[$header])) {
-				$catgroup[$header] = [];
-			}
-			$matched = true;
-			$catgroup[$header][] = preg_replace("/^\S+\s+/", "", $change);
-			break;
-		} else if (preg_match("/^" . $cat . " /i", $change)) {
-			if (!isset($catgroup[$header])) {
-				$catgroup[$header] = [];
-			}
-			$matched = true;
-			$catgroup[$header][] = $change;
-			break;
-		}
-	}
+
+    // Wrap anything that looks like a symbol name in backticks
+    $change = preg_replace('/([\w_\/]+\.\w+|\S+\(\)|\w+::\w+|dpp::\w+|utility::\w+|(\w+_\w+)+)/', '`$1`', $change);
+    $change = preg_replace("/vs(\d+)/", "Visual Studio $1", $change);
+    $change = preg_replace("/\bfaq\b/", "FAQ", $change);
+    $change = preg_replace("/\bdiscord\b/", "Discord", $change);
+    $change = preg_replace("/\bmicrosoft\b/", "Microsoft", $change);
+    $change = preg_replace("/\bwindows\b/", "Windows", $change);
+    $change = preg_replace("/\blinux\b/", "Linux", $change);
+    $change = preg_replace("/\sarm(\d+)\s/i", ' ARM$1 ', $change);
+    $change = preg_replace("/\b(was|is|wo)nt\b/i", '$1n\'t', $change);
+    $change = preg_replace("/\bfreebsd\b/", 'FreeBSD', $change);
+
+    // Match keywords against categories
+    $matched = false;
+    foreach ($categories as $cat => $header) {
+        // Purposefully ignored
+        if (preg_match("/^Merge (branch|pull request|remote-tracking branch) /", $change) or preg_match("/version bump/i", $change)) {
+            $matched = true;
+            continue;
+        }
+        // Groupings
+        if ((preg_match("/^" . $cat . ":/i", $change)) or (preg_match("/^\[" . $cat . "\//i", $change)) or (preg_match("/^\[" . $cat . "\]/i", $change)) or (preg_match("/^\[" . $cat . ":/i", $change)) or (preg_match("/^" . $cat . "\//i", $change)) or (preg_match("/^" . $cat . ":/i", $change))) {
+            if (!isset($catgroup[$header])) {
+                $catgroup[$header] = [];
+            }
+            $matched = true;
+            $catgroup[$header][] = preg_replace("/^\S+\s+/", "", $change);
+            break;
+        } else if (preg_match("/^" . $cat . " /i", $change)) {
+            if (!isset($catgroup[$header])) {
+                $catgroup[$header] = [];
+            }
+            $matched = true;
+            $catgroup[$header][] = $change;
+            break;
+        }
+    }
 }
 
 // Output tidy formatting
 foreach ($catgroup as $cat => $list) {
-	echo "\n" . ($githubstyle ? '## ' : '__**') . $cat . ($githubstyle ? '' : '**__') . "\n";
-	foreach ($list as $item) {
-		// Exclude bad commit messages like 'typo fix', 'test push' etc by pattern
-		if (!preg_match("/^(typo|test|fix)\s\w+$/", $item)) {
-			echo ($githubstyle ? '-' : '•') . ' ' . ucfirst(str_replace('@','', $item)) . "\n";
-		}
-	}
+    echo "\n" . ($githubstyle ? '## ' : '__**') . $cat . ($githubstyle ? '' : '**__') . "\n";
+    foreach ($list as $item) {
+        // Exclude bad commit messages like 'typo fix', 'test push' etc by pattern
+        if (!preg_match("/^(typo|test|fix)\s\w+$/", $item)) {
+            echo ($githubstyle ? '-' : '•') . ' ' . ucfirst(str_replace('@', '', $item)) . "\n";
+        }
+    }
 }
 
 // Leadout
 echo "\n\n**Thank you for using D++!**\n\n";
 if (!$githubstyle) {
-	$version = $argv[2];
-	echo 'The ' . $version . ' download can be found here: <https://dl.dpp.dev/' . $version . '>';
-	echo "\n";
+    $version = $argv[2];
+    echo 'The ' . $version . ' download can be found here: <https://dl.dpp.dev/' . $version . '>';
+    echo "\n";
 }
-

buildtools/close-master-pr.php

@@ -6,27 +6,26 @@
 exec("gh pr list --base master | sed 's/\|/ /' |awk '{print $1}'", $master_prs);
 
 foreach ($master_prs as $pr) {
-
-	$pr = (int)$pr;
-	if ($pr > 0) {
-		system("gh pr comment $pr -b \"You have opened a PR against the master branch. PRs must target the \`dev\` branch, as such this PR has been automatically closed. Please re-target your PR against the dev branch if you reopen it. Thank you for your contribution.\"");
-		system("gh pr close $pr");
-	}
+    $pr = (int)$pr;
+    if ($pr > 0) {
+        system("gh pr comment $pr -b \"You have opened a PR against the master branch. PRs must target the \`dev\` branch, as such this PR has been automatically closed. Please re-target your PR against the dev branch if you reopen it. Thank you for your contribution.\"");
+        system("gh pr close $pr");
+    }
 }
 
 // Tidy up the workflow run list so it isn't littered with these
 exec("gh run list -w \"Close master-targeted PRs\"", $runs);
 $runindex = 0;
 foreach ($runs as $run) {
-	$run = preg_replace('/  /', ' ', $run);
-	$data = preg_split('/\s+/', $run);
-	$id = $data[sizeof($data) - 3];
-	$id = (int)$id;
-	if ($id > 0 && $runindex > 0) {
-		// Delete all but the first completed workflow run and this one
-		// (the first is the currently executing one!)
-		exec("gh api repos/brainboxdotcc/DPP/actions/runs/$id -X DELETE");
-		sleep(1);
-	}
-	$runindex++;
+    $run = preg_replace('/  /', ' ', $run);
+    $data = preg_split('/\s+/', $run);
+    $id = $data[sizeof($data) - 3];
+    $id = (int)$id;
+    if ($id > 0 && $runindex > 0) {
+        // Delete all but the first completed workflow run and this one
+        // (the first is the currently executing one!)
+        exec("gh api repos/brainboxdotcc/DPP/actions/runs/$id -X DELETE");
+        sleep(1);
+    }
+    $runindex++;
 }