Cleanup

Author: sierpinskid

Assets/Plugins/StreamChat/Core/StatefulModels/IStreamPoll.cs

@@ -95,7 +95,7 @@ public interface IStreamPoll : IStreamStatefulModel
         /// <summary>
         /// Whether the poll is closed
         /// </summary>
-        bool? IsClosed { get; }
+        bool IsClosed { get; }
 
         /// <summary>
         /// Latest answers to the poll

Assets/Plugins/StreamChat/Core/StatefulModels/StreamPoll.cs

@@ -43,7 +43,7 @@ internal sealed class StreamPoll : StreamStatefulModelBase<StreamPoll>,
 
         public string Id { get; private set; }
 
-        public bool? IsClosed
+        public bool IsClosed
         {
             get => _isClosed;
             private set
@@ -117,8 +117,7 @@ public async Task UpdateAsync(StreamUpdatePollRequest updateRequest)
 
             var response = await LowLevelClient.InternalPollsApi.UpdatePollAsync(Id, requestDto);
 
-            // Update from response
-            this.TryUpdateFromDto<PollResponseDataInternalDTO, StreamPoll>(response.Poll, Cache);
+            this.TryUpdateFromDto(response.Poll, Cache);
         }
 
         public async Task CloseAsync()
@@ -133,8 +132,7 @@ public async Task CloseAsync()
 
             var response = await LowLevelClient.InternalPollsApi.UpdatePollPartialAsync(Id, request);
 
-            // Update from response
-            this.TryUpdateFromDto<PollResponseDataInternalDTO, StreamPoll>(response.Poll, Cache);
+            this.TryUpdateFromDto(response.Poll, Cache);
         }
 
         public async Task<StreamPollOption> AddOptionAsync(string text)
@@ -148,8 +146,6 @@ public async Task<StreamPollOption> AddOptionAsync(string text)
 
             var response = await LowLevelClient.InternalPollsApi.CreatePollOptionAsync(Id, request);
 
-            
-            // Return the option as public model
             return new StreamPollOption().TryLoadFromDto<PollOptionResponseDataInternalDTO, StreamPollOption>(response.PollOption, Cache);
         }
 
@@ -193,7 +189,11 @@ void IUpdateableFrom<PollResponseDataInternalDTO, StreamPoll>.UpdateFromDto(Poll
             Description = dto.Description;
             EnforceUniqueVote = dto.EnforceUniqueVote;
             Id = dto.Id;
-            IsClosed = dto.IsClosed;
+
+            if (dto.IsClosed.HasValue)
+            {
+                IsClosed = dto.IsClosed.Value;
+            }
 
             if (dto.LatestAnswers != null)
             {
@@ -239,25 +239,24 @@ void IUpdateableFrom<PollResponseDataInternalDTO, StreamPoll>.UpdateFromDto(Poll
 
             VotingVisibility = dto.VotingVisibility;
 
-            LoadAdditionalProperties(dto.AdditionalProperties);
+            LoadAdditionalProperties(dto.Custom);
 
-            // Notify subscribers that poll was updated
             Updated?.Invoke(this);
         }
 
         internal void HandlePollClosedEvent(PollClosedEventInternalDTO dto)
         {
-            this.TryUpdateFromDto<PollResponseDataInternalDTO, StreamPoll>(dto.Poll, Cache);
+            this.TryUpdateFromDto(dto.Poll, Cache);
         }
 
         internal void HandlePollUpdatedEvent(PollUpdatedEventInternalDTO dto)
         {
-            this.TryUpdateFromDto<PollResponseDataInternalDTO, StreamPoll>(dto.Poll, Cache);
+            this.TryUpdateFromDto(dto.Poll, Cache);
         }
 
         internal void HandlePollVoteCastedEvent(PollVoteCastedEventInternalDTO dto)
         {
-            this.TryUpdateFromDto<PollResponseDataInternalDTO, StreamPoll>(dto.Poll, Cache);
+            this.TryUpdateFromDto(dto.Poll, Cache);
 
             if (dto.PollVote != null)
             {
@@ -268,7 +267,7 @@ internal void HandlePollVoteCastedEvent(PollVoteCastedEventInternalDTO dto)
 
         internal void HandlePollVoteChangedEvent(PollVoteChangedEventInternalDTO dto)
         {
-            this.TryUpdateFromDto<PollResponseDataInternalDTO, StreamPoll>(dto.Poll, Cache);
+            this.TryUpdateFromDto(dto.Poll, Cache);
 
             if (dto.PollVote != null)
             {
@@ -279,7 +278,7 @@ internal void HandlePollVoteChangedEvent(PollVoteChangedEventInternalDTO dto)
 
         internal void HandlePollVoteRemovedEvent(PollVoteRemovedEventInternalDTO dto)
         {
-            this.TryUpdateFromDto<PollResponseDataInternalDTO, StreamPoll>(dto.Poll, Cache);
+            this.TryUpdateFromDto(dto.Poll, Cache);
 
             if (dto.PollVote != null)
             {
@@ -306,7 +305,7 @@ internal StreamPoll(string uniqueId, ICacheRepository<StreamPoll> repository,
         {
         }
 
-        private bool? _isClosed;
+        private bool _isClosed;
         private IStreamChannel _channel;
         private readonly List<StreamPollVote> _latestAnswers = new List<StreamPollVote>();
         private readonly Dictionary<string, IReadOnlyList<StreamPollVote>> _latestVotesByOption = new Dictionary<string, IReadOnlyList<StreamPollVote>>();