From b6007630713f39244a058d03300be24a6461b277 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 6 Oct 2016 05:43:01 -0300
Subject: [PATCH] Fixed null RestMessage.Author

---
 src/Discord.Net.Rest/Entities/Messages/RestMessage.cs       | 6 ++++--
 src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs | 6 +++---
 src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs   | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs
index 3ef933afb..3da05a05d 100644
--- a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs
@@ -11,7 +11,7 @@ namespace Discord.Rest
         private long _timestampTicks;
 
         public ulong ChannelId { get; }
-        public IUser Author { get; }
+        public RestUser Author { get; }
 
         public string Content { get; private set; }
 
@@ -28,10 +28,11 @@ namespace Discord.Rest
 
         public DateTimeOffset Timestamp => DateTimeUtils.FromTicks(_timestampTicks);
 
-        internal RestMessage(BaseDiscordClient discord, ulong id, ulong channelId)
+        internal RestMessage(BaseDiscordClient discord, ulong id, ulong channelId, RestUser author)
             : base(discord, id)
         {
             ChannelId = channelId;
+            Author = author;
         }
         internal static RestMessage Create(BaseDiscordClient discord, Model model)
         {
@@ -58,6 +59,7 @@ namespace Discord.Rest
         public override string ToString() => Content;
 
         MessageType IMessage.Type => MessageType.Default;
+        IUser IMessage.Author => Author;
         IReadOnlyCollection<IAttachment> IMessage.Attachments => Attachments;
         IReadOnlyCollection<IEmbed> IMessage.Embeds => Embeds;
         IReadOnlyCollection<IRole> IMessage.MentionedRoles => MentionedRoles;
diff --git a/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs
index 7c62b4217..0142aa314 100644
--- a/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/RestSystemMessage.cs
@@ -8,13 +8,13 @@ namespace Discord.Rest
     {
         public MessageType Type { get; private set; }
 
-        internal RestSystemMessage(BaseDiscordClient discord, ulong id, ulong channelId)
-            : base(discord, id, channelId)
+        internal RestSystemMessage(BaseDiscordClient discord, ulong id, ulong channelId, RestUser author)
+            : base(discord, id, channelId, author)
         {
         }
         internal new static RestSystemMessage Create(BaseDiscordClient discord, Model model)
         {
-            var entity = new RestSystemMessage(discord, model.Id, model.ChannelId);
+            var entity = new RestSystemMessage(discord, model.Id, model.ChannelId, RestUser.Create(discord, model.Author.Value));
             entity.Update(model);
             return entity;
         }
diff --git a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
index 88855f33c..e97db2a0e 100644
--- a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
@@ -33,13 +33,13 @@ namespace Discord.Rest
         public override IReadOnlyCollection<RestRole> MentionedRoles => _mentionedRoles;
         public override IReadOnlyCollection<RestUser> MentionedUsers => _mentionedUsers;
 
-        internal RestUserMessage(BaseDiscordClient discord, ulong id, ulong channelId)
-            : base(discord, id, channelId)
+        internal RestUserMessage(BaseDiscordClient discord, ulong id, ulong channelId, RestUser author)
+            : base(discord, id, channelId, author)
         {
         }
         internal new static RestUserMessage Create(BaseDiscordClient discord, Model model)
         {
-            var entity = new RestUserMessage(discord, model.Id, model.ChannelId);
+            var entity = new RestUserMessage(discord, model.Id, model.ChannelId, RestUser.Create(discord, model.Author.Value));
             entity.Update(model);
             return entity;
         }