move data model resolution after entity update for restmessagecomponent and restmodal

Author: Cenngo

src/Discord.Net.Rest/Entities/Interactions/MessageComponents/RestMessageComponent.cs

@@ -19,7 +19,7 @@ public class RestMessageComponent : RestInteraction, IComponentInteraction, IDis
         /// <summary>
         ///     Gets the data received with this interaction, contains the button that was clicked.
         /// </summary>
-        public new RestMessageComponentData Data { get; }
+        public new RestMessageComponentData Data { get; private set; }
 
         /// <inheritdoc cref="IComponentInteraction.Message"/>
         public RestUserMessage Message { get; private set; }
@@ -29,17 +29,18 @@ public class RestMessageComponent : RestInteraction, IComponentInteraction, IDis
         internal RestMessageComponent(BaseDiscordClient client, Model model)
             : base(client, model.Id)
         {
-            var dataModel = model.Data.IsSpecified
-                ? (DataModel)model.Data.Value
-                : null;
-
-            Data = new RestMessageComponentData(dataModel, client, Guild);
         }
 
         internal new static async Task<RestMessageComponent> CreateAsync(DiscordRestClient client, Model model, bool doApiCall)
         {
             var entity = new RestMessageComponent(client, model);
             await entity.UpdateAsync(client, model, doApiCall).ConfigureAwait(false);
+
+            var dataModel = model.Data.IsSpecified
+                ? (DataModel)model.Data.Value
+                : null;
+
+            entity.Data = new RestMessageComponentData(dataModel, client, entity.Guild);
             return entity;
         }
         internal override async Task UpdateAsync(DiscordRestClient discord, Model model, bool doApiCall)

src/Discord.Net.Rest/Entities/Interactions/Modals/RestModal.cs

@@ -22,22 +22,22 @@ public class RestModal : RestInteraction, IDiscordInteraction, IModalInteraction
         internal RestModal(DiscordRestClient client, ModelBase model)
              : base(client, model.Id)
         {
-            var dataModel = model.Data.IsSpecified
-                ? (DataModel)model.Data.Value
-                : null;
-
             if (model.Message.IsSpecified && model.ChannelId.IsSpecified)
             {
                 Message = RestUserMessage.Create(Discord, Channel, User, model.Message.Value);
             }
-
-            Data = new RestModalData(dataModel, client, Guild);
         }
 
         internal new static async Task<RestModal> CreateAsync(DiscordRestClient client, ModelBase model, bool doApiCall)
         {
             var entity = new RestModal(client, model);
             await entity.UpdateAsync(client, model, doApiCall);
+
+            var dataModel = model.Data.IsSpecified
+                ? (DataModel)model.Data.Value
+                : null;
+
+            entity.Data = new RestModalData(dataModel, client, entity.Guild);
             return entity;
         }