Merge branch 'brainboxdotcc:master' into master

mikomikotaishi · web-flow · commit 22afd2181134 · 2026-02-12T13:27:34.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
           - { arch: 'arm64', concurrency: 4, os: [self-hosted, linux, ARM64], package: g++-12, cpp: g++, version: 12, cmake-flags: '', cpack: 'yes', ctest: 'no', mold: 'yes' }
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
@@ -134,7 +134,7 @@ jobs:
           - { arch: 'arm64', concurrency: 3, os: macos-latest, cpp: clang++, version: 16, cmake-flags: '', xcode-version: '16.4' }
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
@@ -179,7 +179,7 @@ jobs:
     runs-on: ${{matrix.cfg.os}}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
@@ -242,7 +242,7 @@ jobs:
     runs-on: ${{matrix.cfg.os}}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/construct-vcpkg-info.yml b/.github/workflows/construct-vcpkg-info.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
          - name: Harden Runner
-           uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+           uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
            with:
              egress-policy: audit
 
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -22,25 +22,25 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
       -
         name: Login to DockerHub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
diff --git a/.github/workflows/documentation-check.yml b/.github/workflows/documentation-check.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/gitguardian.yml b/.github/workflows/gitguardian.yml
@@ -14,7 +14,7 @@ jobs:
       cancel-in-progress: true	
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 0 # fetch all history so multiple commits can be scanned
       - name: GitGuardian scan
-        uses: GitGuardian/ggshield-action@0935c02957f6fd78bc52166570e4e345c539120f # master
+        uses: GitGuardian/ggshield-action@8b29edc57b582045b12d45c8cc8f8040e121693b # master
         env:
           GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
           GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+      uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
       with:
         egress-policy: audit
 
diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/sitemap.yml b/.github/workflows/sitemap.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/target-master.yml b/.github/workflows/target-master.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/test-docs-examples.yml b/.github/workflows/test-docs-examples.yml
@@ -25,7 +25,7 @@ jobs:
   
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252
+FROM ubuntu:noble@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54
 
 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/*
 
diff --git a/doxygen-awesome-css b/doxygen-awesome-css
@@ -1 +1 @@
-Subproject commit 9760c30014131f4eacb8e96f15f3869c7bc5dd8c
+Subproject commit 1f3620084ff75734ed192101acf40e9dff01d848
diff --git a/include/dpp/bignum.h b/include/dpp/bignum.h
@@ -48,7 +48,7 @@ class DPP_EXPORT bignumber {
 	 * @brief Forward declaration of structure which implements proper destructor for unique_ptr<openssl_bignum> as type is incomplete in header
 	 * custom deleter defined where openssl_bignum is complete
 	 */
-	struct bn_deleter {
+	struct DPP_EXPORT bn_deleter {
 
 		/**
 		 * @brief Deletes an `openssl_bignum` instance.
diff --git a/include/dpp/intents.h b/include/dpp/intents.h
@@ -126,6 +126,16 @@ enum intents {
 	 */
 	i_auto_moderation_execution	= (1 << 21),
 
+	/**
+	 * @brief Intent for receipt of guild message poll votes.
+	 */
+	i_guild_message_polls		= (1 << 24),
+
+	/**
+	 * @brief Intent for receipt of direct message poll votes.
+	 */
+	i_direct_message_polls		= (1 << 25),
+
 	/**
 	 * @brief Default D++ intents (all non-privileged intents).
 	 */
@@ -134,7 +144,7 @@ enum intents {
 					dpp::i_guild_messages | dpp::i_guild_message_reactions | dpp::i_guild_message_typing |
 					dpp::i_direct_messages | dpp::i_direct_message_typing | dpp::i_direct_message_reactions |
 					dpp::i_guild_scheduled_events | dpp::i_auto_moderation_configuration |
-					dpp::i_auto_moderation_execution,
+					dpp::i_auto_moderation_execution | dpp::i_guild_message_polls | dpp::i_direct_message_polls,
 
 	/**
 	 * @brief Privileged intents requiring ID.
diff --git a/include/dpp/queues.h b/include/dpp/queues.h
@@ -30,6 +30,7 @@
 #include <vector>
 #include <functional>
 #include <atomic>
+#include <condition_variable>		
 #include <dpp/httpsclient.h>
 
 namespace dpp {
@@ -240,6 +241,22 @@ class DPP_EXPORT http_request {
 	 */
 	std::unique_ptr<https_client> cli;
 
+	/**
+	 * @brief Mutex for this_captured_signal and this_captured
+	 */
+	std::mutex this_captured_mutex;
+
+	/**
+	 * @brief Condition variable to signal this is no longer captured by an ongoing lambda
+	 */
+	std::condition_variable this_captured_signal;
+
+
+	/**
+	 * @brief True if this is currently captured in a lambda and cannot be deleted
+	 */
+	bool this_captured{false};
+
 public:
 	/**
 	 * @brief Endpoint name
diff --git a/src/dpp/events/message_poll_vote_add.cpp b/src/dpp/events/message_poll_vote_add.cpp
@@ -39,13 +39,13 @@ namespace dpp::events {
 void message_poll_vote_add::handle(discord_client* client, json &j, const std::string &raw) {
 
 	if (!client->creator->on_message_poll_vote_add.empty()) {
-		json d = j["d"];
+		json& d = j["d"];
 		dpp::message_poll_vote_add_t vote(client->owner, client->shard_id, raw);
-		vote.user_id = snowflake_not_null(&j, "user_id");
-		vote.message_id = snowflake_not_null(&j, "message_id");
-		vote.channel_id = snowflake_not_null(&j, "channel_id");
-		vote.guild_id = snowflake_not_null(&j, "guild_id");
-		vote.answer_id = int32_not_null(&j, "answer_id");
+		vote.user_id = snowflake_not_null(&d, "user_id");
+		vote.message_id = snowflake_not_null(&d, "message_id");
+		vote.channel_id = snowflake_not_null(&d, "channel_id");
+		vote.guild_id = snowflake_not_null(&d, "guild_id");
+		vote.answer_id = int32_not_null(&d, "answer_id");
 		client->creator->queue_work(1, [c = client->creator, vote]() {
 			c->on_message_poll_vote_add.call(vote);
 		});
diff --git a/src/dpp/events/message_poll_vote_remove.cpp b/src/dpp/events/message_poll_vote_remove.cpp
@@ -38,14 +38,14 @@ namespace dpp::events {
  */
 void message_poll_vote_remove::handle(discord_client* client, json &j, const std::string &raw) {
 
-	if (!client->creator->on_message_poll_vote_add.empty()) {
-		json d = j["d"];
+	if (!client->creator->on_message_poll_vote_remove.empty()) {
+		json& d = j["d"];
 		dpp::message_poll_vote_remove_t vote(client->owner, client->shard_id, raw);
-		vote.user_id = snowflake_not_null(&j, "user_id");
-		vote.message_id = snowflake_not_null(&j, "message_id");
-		vote.channel_id = snowflake_not_null(&j, "channel_id");
-		vote.guild_id = snowflake_not_null(&j, "guild_id");
-		vote.answer_id = int32_not_null(&j, "answer_id");
+		vote.user_id = snowflake_not_null(&d, "user_id");
+		vote.message_id = snowflake_not_null(&d, "message_id");
+		vote.channel_id = snowflake_not_null(&d, "channel_id");
+		vote.guild_id = snowflake_not_null(&d, "guild_id");
+		vote.answer_id = int32_not_null(&d, "answer_id");
 		client->creator->queue_work(1, [c = client->creator, vote]() {
 			c->on_message_poll_vote_remove.call(vote);
 		});
diff --git a/src/dpp/queues.cpp b/src/dpp/queues.cpp
@@ -107,7 +107,10 @@ http_request::http_request(const std::string &_url, http_completion_event comple
 {
 }
 
-http_request::~http_request()  = default;
+http_request::~http_request() {
+	std::unique_lock<std::mutex> lock(this_captured_mutex);
+	this_captured_signal.wait(lock, [this] { return !this_captured; });
+}
 
 void http_request::complete(const http_request_completion_t &c) {
 	if (complete_handler) {
@@ -260,6 +263,10 @@ http_request_completion_t http_request::run(request_concurrency_queue* processor
 				processor->buckets[this->endpoint] = newbucket;
 
 				/* Transfer it to completed requests */
+				{
+					std::lock_guard<std::mutex> lock(this_captured_mutex);
+					this_captured = true;
+				}
 				owner->queue_work(0, [owner, this, result, hci, _url]() {
 					try {
 						complete(result);
@@ -271,6 +278,11 @@ http_request_completion_t http_request::run(request_concurrency_queue* processor
 						owner->log(ll_error, "Uncaught exception thrown in HTTPS callback for " + std::string(request_verb[method]) + " "  + hci.hostname + ":" + std::to_string(hci.port) + _url + ": <non exception value>");
 					}
 					completed = true;
+					{
+						std::lock_guard<std::mutex> lock(this_captured_mutex);
+						this_captured = false;
+					}
+					this_captured_signal.notify_all();
 				});
 			}
 		);
diff --git a/src/dpp/utility.cpp b/src/dpp/utility.cpp
@@ -465,7 +465,7 @@ void exec(const std::string& cmd, std::vector<std::string> parameters, cmd_resul
 			}
 			/* Capture stderr */
 			cmd_and_parameters << " 2>&1";
-			std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd_and_parameters.str().c_str(), "r"), pclose);
+			std::unique_ptr<FILE, int(*)(FILE*)> pipe(popen(cmd_and_parameters.str().c_str(), "r"), pclose);
 			if (!pipe) {
 				return;
 			}
