Feat: Adding poll support

NetCord/JsonModels/JsonMessage.cs

@@ -100,4 +100,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,25 @@
+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("allow_multiselect")]
+    public bool AllowMultiselect { get; set; }
+
+    [JsonPropertyName("layout_type")]
+    public MessagePollLayoutType LayoutType { get; set; }
+
+    // Non-expiring posts are possible in the future, see: https://github.com/discord/discord-api-docs/blob/e4bdf50f11f9ca61ace2636285e029a2b3dfd0ec/docs/resources/Poll.md#poll-object
+    [JsonPropertyName("expiry")]
+    public DateTimeOffset? ExpireAt { 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 : JsonEntity
+{
+    [JsonPropertyName("answer_id")]
+    public ulong AnswerId { get; set; }
+
+    [JsonPropertyName("poll_media")]
+    public JsonMessagePollMedia PollMedia { get; set; }
+}

NetCord/JsonModels/JsonMessagePollAnswerCount.cs

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

NetCord/JsonModels/JsonMessagePollMedia.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord.JsonModels;
+
+public class JsonMessagePollMedia : JsonEntity
+{
+    // Despite this being nullable, it should never be null. Discord is weird...
+    [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,18 @@
+using System.Collections.Immutable;
+
+using NetCord.JsonModels;
+using NetCord.Rest;
+
+namespace NetCord;
+
+public class MessagePoll(JsonMessagePoll jsonModel, ulong guildId, RestClient client) : IJsonModel<JsonMessagePoll>
+{
+    JsonMessagePoll IJsonModel<JsonMessagePoll>.JsonModel => jsonModel;
+    public MessagePollMedia Question = new(jsonModel.Question, guildId, client);
+    public IReadOnlyList<MessagePollAnswer> Answers = jsonModel.Answers.Select(x => new MessagePollAnswer(x, guildId, client)).ToArray();
+    public bool AllowMultiselect => jsonModel.AllowMultiselect;
+    public MessagePollLayoutType LayoutType => jsonModel.LayoutType;
+    // Non-expiring posts are possible in the future, see: https://github.com/discord/discord-api-docs/blob/e4bdf50f11f9ca61ace2636285e029a2b3dfd0ec/docs/resources/Poll.md#poll-object
+    public DateTimeOffset? ExpireAt => jsonModel.ExpireAt;
+    public MessagePollResults Results = new(jsonModel.Results);
+}

NetCord/MessagePollAnswer.cs

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

NetCord/MessagePollAnswerCount.cs

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

NetCord/MessagePollAnswerProperties.cs

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

NetCord/MessagePollLayoutType.cs

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

NetCord/MessagePollMedia.cs

@@ -0,0 +1,18 @@
+using NetCord.JsonModels;
+using NetCord.Rest;
+
+namespace NetCord;
+
+public class MessagePollMedia(JsonMessagePollMedia jsonModel) : IJsonModel<JsonMessagePollMedia>
+{
+    JsonMessagePollMedia IJsonModel<JsonMessagePollMedia>.JsonModel => jsonModel;
+    public string? Text => jsonModel.Text;
+    public Emoji? Emoji { get; }
+
+    public MessagePollMedia(JsonMessagePollMedia jsonModel, ulong guildId, RestClient client) : this(jsonModel)
+    {
+        var emoji = jsonModel.Emoji;
+        if (emoji != null)
+            Emoji = Emoji.CreateFromJson(emoji, guildId, client);
+    }
+}

NetCord/MessagePollMediaProperties.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord;
+
+public partial class MessagePollMediaProperties
+{
+    // Despite this being nullable, it should never be null. Discord is weird...
+    [JsonPropertyName("text")]
+    public string? Text { get; set; }
+
+    [JsonPropertyName("emoji")]
+    public EmojiProperties? Emoji { get; set; }
+}

NetCord/MessagePollProperties.cs

@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace NetCord;
+
+public partial class MessagePollProperties(MessagePollMediaProperties question, IEnumerable<MessagePollAnswerProperties> answers)
+{
+    [JsonPropertyName("question")]
+    public MessagePollMediaProperties Question { get; set; } = question;
+
+    [JsonPropertyName("answers")]
+    public IEnumerable<MessagePollAnswerProperties> Answers { get; set; } = answers;
+
+    [JsonPropertyName("allow_multiselect")]
+    public bool AllowMultiselect { get; set; }
+
+    [JsonPropertyName("layout_type")]
+    public MessagePollLayoutType LayoutType { get; set; }
+
+    [JsonPropertyName("duration")]
+    public int DurationInHours { 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 = jsonModel.Answers?.Select(x => new MessagePollAnswerCount(x)).ToArray();
+    public bool ContainsAnswers => Answers != null;
+}

NetCord/Rest/MessageProperties.cs

@@ -44,6 +44,10 @@ public partial class MessageProperties : IHttpSerializable
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
     [JsonPropertyName("flags")]
     public MessageFlags? Flags { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+    [JsonPropertyName("poll")]
+    public MessagePollProperties? Poll { get; set; }
 
     public HttpContent Serialize()
     {

NetCord/Rest/RestClient.Undocumented.cs

@@ -40,4 +40,13 @@ public IAsyncEnumerable<GuildUserInfo> SearchGuildUsersAsync(ulong guildId, Guil
             new(guildId),
             properties);
     }
+
+    [GenerateAlias(typeof(RestMessage), nameof(RestMessage.Id))]
+    [GenerateAlias(typeof(TextChannel), nameof(TextChannel.Id))]
+    public async Task<RestMessage> ExpirePollAsync(ulong messageId, ulong channelId, RestRequestProperties? properties = null)
+    {
+        var stream = await SendRequestAsync(HttpMethod.Post, $"/channels/{channelId}/polls/{messageId}/expire").ConfigureAwait(false);
+
+        return new(await stream.ToObjectAsync(Serialization.Default.JsonMessage).ConfigureAwait(false), this);
+    }
 }

NetCord/Rest/RestMessage.cs

@@ -67,6 +67,10 @@ public RestMessage(NetCord.JsonModels.JsonMessage jsonModel, RestClient client)
         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, jsonModel.GuildId.GetValueOrDefault(), client);
     }
 
     public override ulong Id => _jsonModel.Id;
@@ -100,6 +104,7 @@ public RestMessage(NetCord.JsonModels.JsonMessage jsonModel, RestClient client)
     public int? Position => _jsonModel.Position;
     public RoleSubscriptionData? RoleSubscriptionData { get; }
     public InteractionResolvedData? ResolvedData { get; }
+    public MessagePoll? Poll { get; }
 
     public Task<RestMessage> ReplyAsync(ReplyMessageProperties replyMessage, RestRequestProperties? properties = null)
         => SendAsync(replyMessage.ToMessageProperties(Id), properties);