Merge branch 'v5.1' into custom-emoji-message-entity

Author: WalentinG

src/Api/Type/Message/MessageEntityType.php

@@ -45,8 +45,15 @@ final class MessageEntityType implements Enum
 
     private const MENTION = 'mention';
 
+
     private const CUSTOM_EMOJI = 'custom_emoji';
 
+    private const UNDERLINE = 'underline';
+
+    private const SPOILER = 'spoiler';
+
+    private const STRIKETHROUGH = 'strikethrough';
+
     private const LIST         = [
         self::HASH_TAG,
         self::CASH_TAG,
@@ -62,6 +69,9 @@ final class MessageEntityType implements Enum
         self::TEXT_MENTION,
         self::MENTION,
         self::CUSTOM_EMOJI,
+        self::UNDERLINE,
+        self::SPOILER,
+        self::STRIKETHROUGH
     ];
 
     /**
@@ -149,6 +159,21 @@ public static function customEmoji(): self
         return new self(self::CUSTOM_EMOJI);
     }
 
+    public static function underline(): self
+    {
+        return new self(self::UNDERLINE);
+    }
+
+    public static function spoiler(): self
+    {
+        return new self(self::SPOILER);
+    }
+
+    public static function strikethrough(): self
+    {
+        return new self(self::STRIKETHROUGH);
+    }
+
     public function equals(MessageEntityType $type): bool
     {
         return $this->value === $type->value;

src/Interaction/InteractionsProvider.php

@@ -119,11 +119,10 @@ function () use ($method, $credentials): \Generator
                 {
                     /** @var \GuzzleHttp\Psr7\Response $response */
                     $response = yield $this->httpClient->execute($httpRequest);
+                    $responseBody = (string) $response->getBody();
 
                     if ($response->getStatusCode() === 200)
                     {
-                        $responseBody = (string) $response->getBody();
-
                         if ($responseBody === '')
                         {
                             throw new \RuntimeException(
@@ -139,6 +138,17 @@ function () use ($method, $credentials): \Generator
                         );
                     }
 
+                    if ($response->getStatusCode() === 400)
+                    {
+                        /** @psalm-var non-empty-string $responseBody */
+                        $responseDetails = jsonDecode($responseBody);
+
+                        throw new \RuntimeException(
+                            $responseDetails['description']
+                            ?? \sprintf('Method %s has invalid parameters', $method->methodName())
+                        );
+                    }
+
                     if ($response->getStatusCode() === 404)
                     {
                         throw new \RuntimeException(\sprintf('Method %s not exists', $method->methodName()));