Merge branch 'master' into valzargaming-polls

discord-php · Sep 27, 2024 · f438935 · f438935
2 parents 37c479b + af54bcf
commit f438935
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 DiscordPHP
 ====
-[![Latest Stable Version](https://poser.pugx.org/team-reflex/discord-php/v)](https://packagist.org/packages/team-reflex/discord-php) [![Latest Unstable Version](http://poser.pugx.org/team-reflex/discord-php/v/unstable)](https://packagist.org/packages/team-reflex/discord-php) [![Total Downloads](https://poser.pugx.org/team-reflex/discord-php/downloads)](https://packagist.org/packages/team-reflex/discord-php) [![PHP Version Require](https://poser.pugx.org/team-reflex/discord-php/require/php)](https://packagist.org/packages/team-reflex/discord-php)
+[![Latest Stable Version](https://poser.pugx.org/team-reflex/discord-php/v)](https://packagist.org/packages/team-reflex/discord-php) [![Latest Unstable Version](https://poser.pugx.org/team-reflex/discord-php/v/unstable)](https://packagist.org/packages/team-reflex/discord-php) [![Total Downloads](https://poser.pugx.org/team-reflex/discord-php/downloads)](https://packagist.org/packages/team-reflex/discord-php) [![PHP Version Require](https://poser.pugx.org/team-reflex/discord-php/require/php)](https://packagist.org/packages/team-reflex/discord-php)
 
 [![PHP Discorders](https://discord.com/api/guilds/115233111977099271/widget.png?style=banner1)](https://discord.gg/dphp)
 

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     },
     "require": {
         "php": "^8.0",
-        "nesbot/carbon": "^2.38",
+        "nesbot/carbon": "^2.38 || ^3.0",
         "ratchet/pawl": "^0.4.1",
         "react/datagram": "^1.8",
         "symfony/options-resolver": "^5.1.11 || ^6.0 || ^7.0",

diff --git a/src/Discord/Builders/MessageBuilder.php b/src/Discord/Builders/MessageBuilder.php
@@ -750,6 +750,14 @@ public function jsonSerialize(): ?array
             $body['poll'] = $this->poll;
         }
 
+        if (isset($this->enforce_nonce)) {
+            $body['enforce_nonce'] = $this->enforce_nonce;
+        }
+
+        if (isset($this->poll)) {
+            $body['poll'] = $this->poll;
+        }
+
         return $body;
     }
 }