Feat: Adding poll support

NetCord/Components/Button.cs

@@ -8,7 +8,7 @@ public class Button : IButton, IJsonModel<JsonModels.JsonComponent>
     public string CustomId => _jsonModel.CustomId!;
     public ButtonStyle Style => _jsonModel.Style.GetValueOrDefault();
     public string? Label => _jsonModel.Label;
-    public ComponentEmoji? Emoji { get; }
+    public EmojiReference? Emoji { get; }
     public bool Disabled => _jsonModel.Disabled.GetValueOrDefault();
 
     public Button(JsonModels.JsonComponent jsonModel)

NetCord/Components/IButton.cs

@@ -3,7 +3,7 @@
 public interface IButton
 {
     public string? Label { get; }
-    public ComponentEmoji? Emoji { get; }
+    public EmojiReference? Emoji { get; }
     public bool Disabled { get; }
 
     public static IButton CreateFromJson(JsonModels.JsonComponent jsonModel)

NetCord/Components/LinkButton.cs

@@ -9,7 +9,7 @@ public class LinkButton : IButton, IJsonModel<JsonComponent>
 
     public string Url => _jsonModel.Url!;
     public string? Label => _jsonModel.Label;
-    public ComponentEmoji? Emoji { get; }
+    public EmojiReference? Emoji { get; }
     public bool Disabled => _jsonModel.Disabled.GetValueOrDefault();
 
     public LinkButton(JsonComponent jsonModel)

NetCord/Components/StringMenuSelectOption.cs

@@ -8,7 +8,7 @@ public class StringMenuSelectOption : IJsonModel<JsonModels.JsonMenuSelectOption
     public string Label => _jsonModel.Label;
     public string Value => _jsonModel.Value;
     public string? Description => _jsonModel.Description;
-    public ComponentEmoji? Emoji { get; }
+    public EmojiReference? Emoji { get; }
     public bool Default => _jsonModel.Default;
 
     public StringMenuSelectOption(JsonModels.JsonMenuSelectOption jsonModel)

NetCord/Components/ComponentEmoji.cs → NetCord/EmojiReference.cs

@@ -1,6 +1,6 @@
 namespace NetCord;
 
-public class ComponentEmoji(JsonModels.JsonEmoji jsonModel) : IJsonModel<JsonModels.JsonEmoji>
+public class EmojiReference(JsonModels.JsonEmoji jsonModel) : IJsonModel<JsonModels.JsonEmoji>
 {
     JsonModels.JsonEmoji IJsonModel<JsonModels.JsonEmoji>.JsonModel => jsonModel;
 

NetCord/Gateway/EventArgs/MessagePollVoteEventArgs.cs

@@ -0,0 +1,16 @@
+namespace NetCord.Gateway;
+
+public class MessagePollVoteEventArgs(JsonModels.EventArgs.JsonMessagePollVoteEventArgs jsonModel) : IJsonModel<JsonModels.EventArgs.JsonMessagePollVoteEventArgs>
+{
+    JsonModels.EventArgs.JsonMessagePollVoteEventArgs IJsonModel<JsonModels.EventArgs.JsonMessagePollVoteEventArgs>.JsonModel => jsonModel;
+
+    public ulong UserId => jsonModel.UserId;
+
+    public ulong ChannelId => jsonModel.ChannelId;
+
+    public ulong MessageId => jsonModel.MessageId;
+
+    public ulong? GuildId => jsonModel.GuildId;
+
+    public int AnswerId => jsonModel.AnswerId;
+}

NetCord/Gateway/GatewayClient.cs

@@ -591,6 +591,10 @@ public partial class GatewayClient : WebSocketClient, IEntity
     /// </summary>
     public event Func<WebhooksUpdateEventArgs, ValueTask>? WebhooksUpdate;
 
+    public event Func<MessagePollVoteEventArgs, ValueTask>? MessagePollVoteAdd;
+
+    public event Func<MessagePollVoteEventArgs, ValueTask>? MessagePollVoteRemove;
+
     /// <summary>
     /// Sent when a user uses an interaction.
     /// Inner payload is an <see cref="Interaction"/>.<br/>
@@ -1261,6 +1265,16 @@ await InvokeEventAsync(
                     await InvokeEventAsync(WebhooksUpdate, () => new(data.ToObject(Serialization.Default.JsonWebhooksUpdateEventArgs))).ConfigureAwait(false);
                 }
                 break;
+            case "MESSAGE_POLL_VOTE_ADD":
+                {
+                    await InvokeEventAsync(MessagePollVoteAdd, () => new(data.ToObject(Serialization.Default.JsonMessagePollVoteEventArgs))).ConfigureAwait(false);
+                }
+                break;
+            case "MESSAGE_POLL_VOTE_REMOVE":
+                {
+                    await InvokeEventAsync(MessagePollVoteRemove, () => new(data.ToObject(Serialization.Default.JsonMessagePollVoteEventArgs))).ConfigureAwait(false);
+                }
+                break;
             case "ENTITLEMENT_CREATE":
                 {
                     await InvokeEventAsync(EntitlementCreate, () => new(data.ToObject(Serialization.Default.JsonEntitlement))).ConfigureAwait(false);

NetCord/Gateway/GatewayIntents.cs

@@ -151,6 +151,10 @@ public enum GatewayIntents : uint
     /// </summary>
     AutoModerationExecution = 1 << 21,
 
+    GuildMessagePolls = 1 << 24,
+
+    DirectMessagePolls = 1 << 25,
+
     /// <summary>
     /// Implies all available intents, excluding privileged intents.
     /// </summary>
@@ -169,7 +173,9 @@ public enum GatewayIntents : uint
         | DirectMessageTyping
         | GuildScheduledEvents
         | AutoModerationConfiguration
-        | AutoModerationExecution,
+        | AutoModerationExecution
+        | GuildMessagePolls
+        | DirectMessagePolls,
 
     /// <summary>
     /// Implies all available intents, including privileged intents.

NetCord/Gateway/IPartialMessage.cs

@@ -112,6 +112,8 @@ internal static (Guild?, TextChannel?) GetCacheData(JsonMessage jsonModel, IGate
 
     public InteractionResolvedData? ResolvedData { get; }
 
+    public MessagePoll? Poll { get; }
+
     public Task<RestMessage> ReplyAsync(ReplyMessageProperties replyMessage, RestRequestProperties? properties = null);
 }
 
@@ -213,6 +215,10 @@ public PartialMessage(JsonMessage jsonModel, Guild? guild, TextChannel? channel,
         var resolvedData = jsonModel.ResolvedData;
         if (resolvedData is not null)
             ResolvedData = new(resolvedData, jsonModel.GuildId, client);
+
+        var poll = jsonModel.Poll;
+        if (poll is not null)
+            Poll = new(poll);
     }
 
     public override ulong Id => _jsonModel.Id;
@@ -283,6 +289,8 @@ public PartialMessage(JsonMessage jsonModel, Guild? guild, TextChannel? channel,
 
     public InteractionResolvedData? ResolvedData { get; }
 
+    public MessagePoll? Poll { get; }
+
     public Task<RestMessage> ReplyAsync(ReplyMessageProperties replyMessage, RestRequestProperties? properties = null)
         => SendAsync(replyMessage.ToMessageProperties(Id), properties);
 }

NetCord/Gateway/JsonModels/EventArgs/JsonMessagePollVoteEventArgs.cs

@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord.Gateway.JsonModels.EventArgs;
+
+public class JsonMessagePollVoteEventArgs
+{
+    [JsonPropertyName("user_id")]
+    public ulong UserId { get; set; }
+
+    [JsonPropertyName("channel_id")]
+    public ulong ChannelId { get; set; }
+
+    [JsonPropertyName("message_id")]
+    public ulong MessageId { get; set; }
+
+    [JsonPropertyName("guild_id")]
+    public ulong? GuildId { get; set; }
+
+    [JsonPropertyName("answer_id")]
+    public int AnswerId { get; set; }
+}

NetCord/JsonModels/JsonMessage.cs

@@ -104,4 +104,7 @@ public class JsonMessage : JsonEntity
 
     [JsonPropertyName("resolved")]
     public JsonInteractionResolvedData? ResolvedData { get; set; }
+
+    [JsonPropertyName("poll")]
+    public JsonMessagePoll? Poll { get; set; }
 }

NetCord/JsonModels/JsonMessagePoll.cs

@@ -0,0 +1,24 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord.JsonModels;
+
+public class JsonMessagePoll : JsonEntity
+{
+    [JsonPropertyName("question")]
+    public JsonMessagePollMedia Question { get; set; }
+
+    [JsonPropertyName("answers")]
+    public JsonMessagePollAnswer[] Answers { get; set; }
+
+    [JsonPropertyName("expiry")]
+    public DateTimeOffset? ExpiresAt { get; set; }
+
+    [JsonPropertyName("allow_multiselect")]
+    public bool AllowMultiselect { get; set; }
+
+    [JsonPropertyName("layout_type")]
+    public MessagePollLayoutType LayoutType { get; set; }
+
+    [JsonPropertyName("results")]
+    public JsonMessagePollResults? Results { get; set; }
+}

NetCord/JsonModels/JsonMessagePollAnswer.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord.JsonModels;
+
+public class JsonMessagePollAnswer
+{
+    [JsonPropertyName("answer_id")]
+    public int AnswerId { get; set; }
+
+    [JsonPropertyName("poll_media")]
+    public JsonMessagePollMedia PollMedia { get; set; }
+}

NetCord/JsonModels/JsonMessagePollAnswerCount.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord.JsonModels;
+
+public class JsonMessagePollAnswerCount
+{
+    [JsonPropertyName("id")]
+    public int AnswerId { get; set; }
+
+    [JsonPropertyName("count")]
+    public int Count { get; set; }
+
+    [JsonPropertyName("me_voted")]
+    public bool MeVoted { get; set; }
+}

NetCord/JsonModels/JsonMessagePollMedia.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord.JsonModels;
+
+public class JsonMessagePollMedia : JsonEntity
+{
+    [JsonPropertyName("text")]
+    public string? Text { get; set; }
+
+    [JsonPropertyName("emoji")]
+    public JsonEmoji? Emoji { get; set; }
+}

NetCord/JsonModels/JsonMessagePollResults.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord.JsonModels;
+
+public class JsonMessagePollResults : JsonEntity
+{
+    [JsonPropertyName("is_finalized")]
+    public bool IsFinalized { get; set; }
+
+    [JsonPropertyName("answer_counts")]
+    public JsonMessagePollAnswerCount[] Answers { get; set; }
+}

NetCord/MessagePoll.cs

@@ -0,0 +1,28 @@
+using NetCord.JsonModels;
+
+namespace NetCord;
+
+public class MessagePoll : IJsonModel<JsonMessagePoll>
+{
+    JsonMessagePoll IJsonModel<JsonMessagePoll>.JsonModel => _jsonModel;
+    private readonly JsonMessagePoll _jsonModel;
+
+    public MessagePoll(JsonMessagePoll jsonModel)
+    {
+        _jsonModel = jsonModel;
+
+        Question = new(jsonModel.Question);
+        Answers = jsonModel.Answers.Select(a => new MessagePollAnswer(a)).ToArray();
+
+        var results = jsonModel.Results;
+        if (results is not null)
+            Results = new(results);
+    }
+
+    public MessagePollMedia Question { get; }
+    public IReadOnlyList<MessagePollAnswer> Answers { get; }
+    public DateTimeOffset? ExpiresAt => _jsonModel.ExpiresAt;
+    public bool AllowMultiselect => _jsonModel.AllowMultiselect;
+    public MessagePollLayoutType LayoutType => _jsonModel.LayoutType;
+    public MessagePollResults? Results { get; }
+}

NetCord/MessagePollAnswer.cs

@@ -0,0 +1,11 @@
+using NetCord.JsonModels;
+
+namespace NetCord;
+
+public class MessagePollAnswer(JsonMessagePollAnswer jsonModel) : IJsonModel<JsonMessagePollAnswer>
+{
+    JsonMessagePollAnswer IJsonModel<JsonMessagePollAnswer>.JsonModel => jsonModel;
+
+    public int AnswerId => jsonModel.AnswerId;
+    public MessagePollMedia PollMedia { get; } = new(jsonModel.PollMedia);
+}

NetCord/MessagePollAnswerCount.cs

@@ -0,0 +1,12 @@
+using NetCord.JsonModels;
+
+namespace NetCord;
+
+public class MessagePollAnswerCount(JsonMessagePollAnswerCount jsonModel) : IJsonModel<JsonMessagePollAnswerCount>
+{
+    JsonMessagePollAnswerCount IJsonModel<JsonMessagePollAnswerCount>.JsonModel => jsonModel;
+
+    public int AnswerId => jsonModel.AnswerId;
+    public int Count => jsonModel.Count;
+    public bool MeVoted => jsonModel.MeVoted;
+}

NetCord/MessagePollAnswerProperties.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord;
+
+public partial class MessagePollAnswerProperties(MessagePollMediaProperties pollMedia)
+{
+    [JsonPropertyName("poll_media")]
+    public MessagePollMediaProperties PollMedia { get; set; } = pollMedia;
+}

NetCord/MessagePollLayoutType.cs

@@ -0,0 +1,6 @@
+namespace NetCord;
+
+public enum MessagePollLayoutType : byte
+{
+    Default = 1,
+}

NetCord/MessagePollMedia.cs

@@ -0,0 +1,21 @@
+using NetCord.JsonModels;
+
+namespace NetCord;
+
+public class MessagePollMedia : IJsonModel<JsonMessagePollMedia>
+{
+    JsonMessagePollMedia IJsonModel<JsonMessagePollMedia>.JsonModel => _jsonModel;
+    private readonly JsonMessagePollMedia _jsonModel;
+
+    public string? Text => _jsonModel.Text;
+    public EmojiReference? Emoji { get; }
+
+    public MessagePollMedia(JsonMessagePollMedia jsonModel)
+    {
+        _jsonModel = jsonModel;
+
+        var emoji = jsonModel.Emoji;
+        if (emoji is not null)
+            Emoji = new(emoji);
+    }
+}

NetCord/MessagePollMediaProperties.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord;
+
+public partial class MessagePollMediaProperties
+{
+    [JsonPropertyName("text")]
+    public string? Text { get; set; }
+
+    [JsonPropertyName("emoji")]
+    public EmojiProperties? Emoji { get; set; }
+}

NetCord/MessagePollProperties.cs

@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord;
+
+public partial class MessagePollProperties(MessagePollMediaProperties question, IEnumerable<MessagePollAnswerProperties> answers, int durationInHours)
+{
+    [JsonPropertyName("question")]
+    public MessagePollMediaProperties Question { get; set; } = question;
+
+    [JsonPropertyName("answers")]
+    public IEnumerable<MessagePollAnswerProperties> Answers { get; set; } = answers;
+
+    [JsonPropertyName("duration")]
+    public int DurationInHours { get; set; } = durationInHours;
+
+    [JsonPropertyName("allow_multiselect")]
+    public bool AllowMultiselect { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("layout_type")]
+    public MessagePollLayoutType? LayoutType { get; set; }
+}

NetCord/MessagePollResults.cs

@@ -0,0 +1,11 @@
+using NetCord.JsonModels;
+
+namespace NetCord;
+
+public class MessagePollResults(JsonMessagePollResults jsonModel) : IJsonModel<JsonMessagePollResults>
+{
+    JsonMessagePollResults IJsonModel<JsonMessagePollResults>.JsonModel => jsonModel;
+
+    public bool IsFinalized => jsonModel.IsFinalized;
+    public IReadOnlyList<MessagePollAnswerCount> Answers { get; } = jsonModel.Answers.Select(x => new MessagePollAnswerCount(x)).ToArray();
+}