From 147031d575fbd0f65f2c187f8d77ecbf9294357f Mon Sep 17 00:00:00 2001
From: Exanlv <exan@landviz.nl>
Date: Fri, 18 Jul 2025 20:28:43 +0200
Subject: [PATCH 1/2] Update message object

---
 src/Enums/PollLayoutType.php  | 13 ++++++++++
 src/Parts/Message.php         |  6 ++++-
 src/Parts/MessageCall.php     | 19 ++++++++++++++
 src/Parts/MessageResolved.php | 49 +++++++++++++++++++++++++++++++++++
 src/Parts/Poll.php            | 26 +++++++++++++++++++
 src/Parts/PollAnswer.php      | 14 ++++++++++
 src/Parts/PollMediaObject.php | 14 ++++++++++
 7 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 src/Enums/PollLayoutType.php
 create mode 100644 src/Parts/MessageCall.php
 create mode 100644 src/Parts/MessageResolved.php
 create mode 100644 src/Parts/Poll.php
 create mode 100644 src/Parts/PollAnswer.php
 create mode 100644 src/Parts/PollMediaObject.php

diff --git a/src/Enums/PollLayoutType.php b/src/Enums/PollLayoutType.php
new file mode 100644
index 0000000..5dcc813
--- /dev/null
+++ b/src/Enums/PollLayoutType.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ragnarok\Fenrir\Enums;
+
+/**
+ * @see https://discord.com/developers/docs/resources/poll#layout-type
+ */
+enum PollLayoutType: int
+{
+    case DEFAULT = 1;
+}
diff --git a/src/Parts/Message.php b/src/Parts/Message.php
index 68fa82f..22a6928 100644
--- a/src/Parts/Message.php
+++ b/src/Parts/Message.php
@@ -22,6 +22,7 @@ class Message
     /**
      * @var User[]
      */
+    #[ArrayMapping(User::class)]
     public array $mentions;
     /**
      * @var string[]
@@ -54,8 +55,8 @@ class Message
     public ?MessageActivity $activity;
     public ?Application $application;
     public ?string $application_id;
-    public ?MessageReference $message_reference;
     public ?Bitwise $flags;
+    public ?MessageReference $message_reference;
     public ?Message $referenced_message;
     public ?MessageInteractionMetadata $interaction_metadata;
     /**
@@ -80,4 +81,7 @@ class Message
     public ?array $stickers;
     public ?int $position;
     public ?RoleSubscriptionData $role_subscription_data;
+    public ?MessageResolved $resolved;
+    public ?Poll $poll;
+    public MessageCall $call;
 }
diff --git a/src/Parts/MessageCall.php b/src/Parts/MessageCall.php
new file mode 100644
index 0000000..6d095e5
--- /dev/null
+++ b/src/Parts/MessageCall.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ragnarok\Fenrir\Parts;
+
+use Carbon\Carbon;
+
+/**
+ * @see https://discord.com/developers/docs/resources/message#message-call-object
+ */
+class MessageCall
+{
+    /**
+     * @var string[]
+     */
+    public array $participants;
+    public Carbon $ended_timestamp;
+}
diff --git a/src/Parts/MessageResolved.php b/src/Parts/MessageResolved.php
new file mode 100644
index 0000000..ac189c1
--- /dev/null
+++ b/src/Parts/MessageResolved.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ragnarok\Fenrir\Parts;
+
+use Ragnarok\Fenrir\Mapping\ArrayMapping;
+
+/**
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-resolved-data-structure
+ */
+class MessageResolved
+{
+    /**
+     * @var User[]
+     */
+    #[ArrayMapping(User::class)]
+    public array $users;
+
+    /**
+     * @var GuildMember[]
+     */
+    #[ArrayMapping(GuildMember::class)]
+    public array $members;
+
+    /**
+     * @var Role[]
+     */
+    #[ArrayMapping(Role::class)]
+    public array $roles;
+
+    /**
+     * @var Channel[]
+     */
+    #[ArrayMapping(Channel::class)]
+    public array $channels;
+
+    /**
+     * @var Message[]
+     */
+    #[ArrayMapping(Message::class)]
+    public array $messages;
+
+    /**
+     * @var Attachment[]
+     */
+    #[ArrayMapping(Attachment::class)]
+    public array $attachments;
+}
diff --git a/src/Parts/Poll.php b/src/Parts/Poll.php
new file mode 100644
index 0000000..055f003
--- /dev/null
+++ b/src/Parts/Poll.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ragnarok\Fenrir\Parts;
+
+use Carbon\Carbon;
+use Ragnarok\Fenrir\Enums\PollLayoutType;
+use Ragnarok\Fenrir\Mapping\ArrayMapping;
+
+/**
+ * @see https://discord.com/developers/docs/resources/poll#poll-object
+ */
+class Poll
+{
+    public PollMediaObject $question;
+
+    /**
+     * @var PollAnswer[]
+     */
+    #[ArrayMapping(PollAnswer::class)]
+    public array $answers;
+    public Carbon $expiry;
+    public bool $allow_multiselect;
+    public PollLayoutType $layout_type;
+}
diff --git a/src/Parts/PollAnswer.php b/src/Parts/PollAnswer.php
new file mode 100644
index 0000000..aaa1529
--- /dev/null
+++ b/src/Parts/PollAnswer.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ragnarok\Fenrir\Parts;
+
+/**
+ * @see https://discord.com/developers/docs/resources/poll#poll-answer-object-poll-answer-object-structure
+ */
+class PollAnswer
+{
+    public int $answer_id;
+    public PollMediaObject $poll_media;
+}
diff --git a/src/Parts/PollMediaObject.php b/src/Parts/PollMediaObject.php
new file mode 100644
index 0000000..481e6de
--- /dev/null
+++ b/src/Parts/PollMediaObject.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ragnarok\Fenrir\Parts;
+
+/**
+ * @see https://discord.com/developers/docs/resources/poll#poll-media-object-poll-media-object-structure
+ */
+class PollMediaObject
+{
+    public ?string $text;
+    public ?Emoji $emoji;
+}

From 3a8354cee64014425ac9a571e338fb5418b92587 Mon Sep 17 00:00:00 2001
From: Exanlv <exan@landviz.nl>
Date: Fri, 18 Jul 2025 20:51:03 +0200
Subject: [PATCH 2/2] Add MessageSnapshots

---
 src/Parts/Message.php         |  5 +++++
 src/Parts/MessageSnapshot.php | 15 +++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 src/Parts/MessageSnapshot.php

diff --git a/src/Parts/Message.php b/src/Parts/Message.php
index 22a6928..eb5f3dd 100644
--- a/src/Parts/Message.php
+++ b/src/Parts/Message.php
@@ -57,6 +57,11 @@ class Message
     public ?string $application_id;
     public ?Bitwise $flags;
     public ?MessageReference $message_reference;
+    /**
+     * @var MessageSnapshot[]
+     */
+    #[ArrayMapping(MessageSnapshot::class)]
+    public array $message_snapshots;
     public ?Message $referenced_message;
     public ?MessageInteractionMetadata $interaction_metadata;
     /**
diff --git a/src/Parts/MessageSnapshot.php b/src/Parts/MessageSnapshot.php
new file mode 100644
index 0000000..82f0a7f
--- /dev/null
+++ b/src/Parts/MessageSnapshot.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ragnarok\Fenrir\Parts;
+
+use Ragnarok\Fenrir\Mapping\ArrayMapping;
+
+/**
+ * @see https://discord.com/developers/docs/resources/message#message-snapshot-object
+ */
+class MessageSnapshot
+{
+    public Message $message;
+}