Added DataAttachment & LinkedMessage & Markups

Author: BushlanovDev

src/Enums/AttachmentType.php

@@ -16,4 +16,5 @@ enum  AttachmentType: string
     case ReplyKeyboard = 'reply_keyboard';
     case Location = 'location';
     case Share = 'share';
+    case Data = 'data';
 }

src/Enums/MarkupType.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Enums;
+
+enum MarkupType: string
+{
+    case Strong = 'strong';
+    case Emphasized = 'emphasized';
+    case Monospaced = 'monospaced';
+    case Link = 'link';
+    case Strikethrough = 'strikethrough';
+    case Underline = 'underline';
+    case UserMention = 'user_mention';
+    case Heading = 'heading';
+    case Highlighted = 'highlighted';
+}

src/ModelFactory.php

@@ -4,12 +4,27 @@
 
 namespace BushlanovDev\MaxMessengerBot;
 
+use BushlanovDev\MaxMessengerBot\Enums\AttachmentType;
+use BushlanovDev\MaxMessengerBot\Enums\MarkupType;
 use BushlanovDev\MaxMessengerBot\Enums\UpdateType;
+use BushlanovDev\MaxMessengerBot\Models\Attachments\AbstractAttachment;
+use BushlanovDev\MaxMessengerBot\Models\Attachments\DataAttachment;
+use BushlanovDev\MaxMessengerBot\Models\Attachments\ShareAttachment;
 use BushlanovDev\MaxMessengerBot\Models\BotInfo;
 use BushlanovDev\MaxMessengerBot\Models\Chat;
 use BushlanovDev\MaxMessengerBot\Models\ChatList;
 use BushlanovDev\MaxMessengerBot\Models\ChatMember;
 use BushlanovDev\MaxMessengerBot\Models\ChatMembersList;
+use BushlanovDev\MaxMessengerBot\Models\Markup\AbstractMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\EmphasizedMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\HeadingMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\HighlightedMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\LinkMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\MonospacedMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\StrikethroughMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\StrongMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\UnderlineMarkup;
+use BushlanovDev\MaxMessengerBot\Models\Markup\UserMentionMarkup;
 use BushlanovDev\MaxMessengerBot\Models\Message;
 use BushlanovDev\MaxMessengerBot\Models\Result;
 use BushlanovDev\MaxMessengerBot\Models\Subscription;
@@ -100,9 +115,42 @@ public function createSubscriptions(array $data): array
      */
     public function createMessage(array $data): Message
     {
+        if (isset($data['body']['attachments']) && is_array($data['body']['attachments'])) {
+            $data['body']['attachments'] = array_map(
+                [$this, 'createAttachment'],
+                $data['body']['attachments'],
+            );
+        }
+
+        if (isset($data['body']['markup']) && is_array($data['body']['markup'])) {
+            $data['body']['markup'] = array_map(
+                [$this, 'createMarkupElement'],
+                $data['body']['markup'],
+            );
+        }
+
         return Message::fromArray($data);
     }
 
+    /**
+     * Creates a specific Attachment model based on the 'type' field.
+     *
+     * @param array<string, mixed> $data
+     *
+     * @return AbstractAttachment
+     * @throws ReflectionException
+     */
+    public function createAttachment(array $data): AbstractAttachment
+    {
+        return match (AttachmentType::tryFrom($data['type'] ?? '')) {
+            AttachmentType::Data => DataAttachment::fromArray($data),
+            AttachmentType::Share => ShareAttachment::fromArray($data),
+            default => throw new LogicException(
+                'Unknown or unsupported Attachment type: ' . ($data['type'] ?? 'none')
+            ),
+        };
+    }
+
     /**
      * List of messages.
      *
@@ -248,4 +296,30 @@ public function createVideoAttachmentDetails(array $data): VideoAttachmentDetail
     {
         return VideoAttachmentDetails::fromArray($data);
     }
+
+    /**
+     * Creates a specific Markup model based on the 'type' field.
+     *
+     * @param array<string, mixed> $data
+     *
+     * @return AbstractMarkup
+     * @throws ReflectionException
+     */
+    public function createMarkupElement(array $data): AbstractMarkup
+    {
+        return match (MarkupType::tryFrom($data['type'] ?? '')) {
+            MarkupType::Strong => StrongMarkup::fromArray($data),
+            MarkupType::Emphasized => EmphasizedMarkup::fromArray($data),
+            MarkupType::Monospaced => MonospacedMarkup::fromArray($data),
+            MarkupType::Strikethrough => StrikethroughMarkup::fromArray($data),
+            MarkupType::Underline => UnderlineMarkup::fromArray($data),
+            MarkupType::Heading => HeadingMarkup::fromArray($data),
+            MarkupType::Highlighted => HighlightedMarkup::fromArray($data),
+            MarkupType::Link => LinkMarkup::fromArray($data),
+            MarkupType::UserMention => UserMentionMarkup::fromArray($data),
+            default => throw new LogicException(
+                'Unknown or unsupported markup type: ' . ($data['type'] ?? 'none')
+            ),
+        };
+    }
 }

src/Models/AbstractModel.php

@@ -118,6 +118,10 @@ private static function castValue(mixed $value, ReflectionProperty $property): m
 
         $typeName = $type->getName();
 
+        if (is_object($value) && is_a($value, $typeName)) {
+            return $value;
+        }
+
         if ($type->isBuiltin()) {
             return match ($typeName) {
                 'int' => (int)$value,
@@ -168,7 +172,10 @@ private static function castArray(mixed $value, ReflectionProperty $property): a
         }
 
         if (is_subclass_of($itemClassName, self::class)) {
-            return array_map(fn($item) => $itemClassName::fromArray($item), $value);
+            return array_map(
+                fn($item) => is_a($item, $itemClassName) ? $item : $itemClassName::fromArray($item),
+                $value,
+            );
         }
 
         return $value;

src/Models/Attachments/AbstractAttachment.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Attachments;
+
+use BushlanovDev\MaxMessengerBot\Enums\AttachmentType;
+use BushlanovDev\MaxMessengerBot\Models\AbstractModel;
+
+/**
+ * Represents a generic attachment received from the API.
+ */
+abstract readonly class AbstractAttachment extends AbstractModel
+{
+    public function __construct(public AttachmentType $type)
+    {
+    }
+}

src/Models/Attachments/DataAttachment.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Attachments;
+
+use BushlanovDev\MaxMessengerBot\Enums\AttachmentType;
+
+/**
+ * Represents an attachment containing a payload from a SendMessageButton.
+ */
+final readonly class DataAttachment extends AbstractAttachment
+{
+    /**
+     * @param string $data The payload from the button.
+     */
+    public function __construct(public string $data)
+    {
+        parent::__construct(AttachmentType::Data);
+    }
+}

src/Models/Attachments/ShareAttachment.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Attachments;
+
+use BushlanovDev\MaxMessengerBot\Enums\AttachmentType;
+use BushlanovDev\MaxMessengerBot\Models\Attachments\Payloads\ShareAttachmentRequestPayload;
+
+/**
+ * Represents a share (URL preview) attachment.
+ */
+final readonly class ShareAttachment extends AbstractAttachment
+{
+    public function __construct(
+        public ShareAttachmentRequestPayload $payload,
+        public ?string $title,
+        public ?string $description,
+        public ?string $imageUrl,
+    ) {
+        parent::__construct(AttachmentType::Share);
+    }
+}

src/Models/Chat.php

@@ -24,7 +24,7 @@
      * @param int|null $ownerId Identifier of chat owner. Visible only for chat admins
      * @param string|null $link Link on chat.
      * @param string|null $description Chat description.
-     * @param User|null $dialogWithUser Another user in conversation. For `dialog` type chats only.
+     * @param UserWithPhoto|null $dialogWithUser Another user in conversation. For `dialog` type chats only.
      * @param int|null $messagesCount Messages count in chat. Only for group chats and channels. Not available for dialogs.
      * @param string|null $chatMessageId Identifier of message that contains `chat` button initialized chat.
      * @param Message|null $pinnedMessage Pinned message in chat or channel. Returned only when single chat is requested.
@@ -41,7 +41,7 @@ public function __construct(
         public ?int $ownerId,
         public ?string $link,
         public ?string $description,
-        public ?User $dialogWithUser,
+        public ?UserWithPhoto $dialogWithUser,
         public ?int $messagesCount,
         public ?string $chatMessageId,
         public ?Message $pinnedMessage,

src/Models/LinkedMessage.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models;
+
+use BushlanovDev\MaxMessengerBot\Enums\MessageLinkType;
+
+/**
+ * Represents a forwarded or replied message linked to the main message.
+ */
+final readonly class LinkedMessage extends AbstractModel
+{
+    /**
+     * @param MessageLinkType $type Type of linked message (forward or reply).
+     * @param MessageBody $message The body of the original message.
+     * @param User|null $sender The sender of the original message. Can be null if posted on behalf of a channel.
+     * @param int|null $chatId The chat where the message was originally posted (for forwarded messages).
+     */
+    public function __construct(
+        public MessageLinkType $type,
+        public MessageBody $message,
+        public ?User $sender,
+        public ?int $chatId,
+    ) {
+    }
+}

src/Models/Markup/AbstractMarkup.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BushlanovDev\MaxMessengerBot\Models\Markup;
+
+use BushlanovDev\MaxMessengerBot\Enums\MarkupType;
+use BushlanovDev\MaxMessengerBot\Models\AbstractModel;
+
+/**
+ * Base class for a text markup element.
+ */
+abstract readonly class AbstractMarkup extends AbstractModel
+{
+    /**
+     * @param MarkupType $type The type of the markup element.
+     * @param int $from Element start index (zero-based) in text.
+     * @param int $length Length of the markup element.
+     */
+    public function __construct(
+        public MarkupType $type,
+        public int $from,
+        public int $length,
+    ) {
+    }
+}