From 40027878b5ce701bd90da12ed57f451f9f9e734d Mon Sep 17 00:00:00 2001 From: Christopher F Date: Fri, 15 Jul 2016 16:09:58 -0400 Subject: [PATCH] Add Type property to Messages Complies with the new MessageType property on API v6 --- src/Discord.Net/API/Common/Message.cs | 2 ++ src/Discord.Net/Entities/Messages/IMessage.cs | 2 ++ src/Discord.Net/Entities/Messages/Message.cs | 1 + .../Entities/Messages/MessageType.cs | 17 +++++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 src/Discord.Net/Entities/Messages/MessageType.cs diff --git a/src/Discord.Net/API/Common/Message.cs b/src/Discord.Net/API/Common/Message.cs index be5305114..7deacf792 100644 --- a/src/Discord.Net/API/Common/Message.cs +++ b/src/Discord.Net/API/Common/Message.cs @@ -9,6 +9,8 @@ namespace Discord.API public ulong Id { get; set; } [JsonProperty("channel_id")] public ulong ChannelId { get; set; } + [JsonProperty("type")] + public MessageType Type { get; set; } [JsonProperty("author")] public Optional Author { get; set; } [JsonProperty("content")] diff --git a/src/Discord.Net/Entities/Messages/IMessage.cs b/src/Discord.Net/Entities/Messages/IMessage.cs index df620a516..8d34cddde 100644 --- a/src/Discord.Net/Entities/Messages/IMessage.cs +++ b/src/Discord.Net/Entities/Messages/IMessage.cs @@ -17,6 +17,8 @@ namespace Discord string Text { get; } /// Gets the time this message was sent. DateTimeOffset Timestamp { get; } + /// Gets the type of message this is. Value will always be default, unless the message was sent in a group. + MessageType Type { get; } /// Gets the channel this message was sent to. IMessageChannel Channel { get; } diff --git a/src/Discord.Net/Entities/Messages/Message.cs b/src/Discord.Net/Entities/Messages/Message.cs index db3929af3..ee261a16e 100644 --- a/src/Discord.Net/Entities/Messages/Message.cs +++ b/src/Discord.Net/Entities/Messages/Message.cs @@ -18,6 +18,7 @@ namespace Discord public bool IsTTS { get; private set; } public string Text { get; private set; } public bool IsPinned { get; private set; } + public MessageType Type { get; private set; } public IMessageChannel Channel { get; } public IUser Author { get; } diff --git a/src/Discord.Net/Entities/Messages/MessageType.cs b/src/Discord.Net/Entities/Messages/MessageType.cs new file mode 100644 index 000000000..8e62afe4f --- /dev/null +++ b/src/Discord.Net/Entities/Messages/MessageType.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Discord +{ + public enum MessageType + { + Default = 0, + RecipientAdd = 1, + RecipientRemove = 2, + Call = 3, + NameChange = 4, + IconChange = 5 + } +}