Remove MessageId - it's not in the spec

Author: sierpinskid

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

@@ -152,22 +152,19 @@ public interface IStreamPoll : IStreamStatefulModel
         /// </summary>
         IStreamChannel Channel { get; }
 
-        /// <summary>
-        /// ID of the message containing this poll
-        /// </summary>
-        string MessageId { get; }
-
         /// <summary>
         /// Cast a vote on this poll
         /// </summary>
+        /// <param name="messageId">The ID of the message containing this poll</param>
         /// <param name="optionId">The ID of the option to vote for</param>
-        Task<StreamPollVote> CastVoteAsync(string optionId);
+        Task<StreamPollVote> CastVoteAsync(string messageId, string optionId);
 
         /// <summary>
         /// Remove a vote from this poll
         /// </summary>
+        /// <param name="messageId">The ID of the message containing this poll</param>
         /// <param name="voteId">The ID of the vote to remove</param>
-        Task RemoveVoteAsync(string voteId);
+        Task RemoveVoteAsync(string messageId, string voteId);
 
         /// <summary>
         /// Update this poll

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

@@ -84,10 +84,9 @@ private set
 
         public IStreamChannel Channel => _channel;
 
-        public string MessageId { get; private set; }
-
-        public async Task<StreamPollVote> CastVoteAsync(string optionId)
+        public async Task<StreamPollVote> CastVoteAsync(string messageId, string optionId)
         {
+            StreamAsserts.AssertNotNullOrEmpty(messageId, nameof(messageId));
             StreamAsserts.AssertNotNullOrEmpty(optionId, nameof(optionId));
 
             var request = new CastPollVoteRequestInternalDTO
@@ -98,15 +97,16 @@ public async Task<StreamPollVote> CastVoteAsync(string optionId)
                 }
             };
 
-            var response = await LowLevelClient.InternalPollsApi.CastVoteAsync(MessageId, Id, request);
+            var response = await LowLevelClient.InternalPollsApi.CastVoteAsync(messageId, Id, request);
             return new StreamPollVote().TryLoadFromDto<PollVoteResponseDataInternalDTO, StreamPollVote>(response.Vote, Cache);
         }
 
-        public async Task RemoveVoteAsync(string voteId)
+        public async Task RemoveVoteAsync(string messageId, string voteId)
         {
+            StreamAsserts.AssertNotNullOrEmpty(messageId, nameof(messageId));
             StreamAsserts.AssertNotNullOrEmpty(voteId, nameof(voteId));
 
-            await LowLevelClient.InternalPollsApi.RemoveVoteAsync(MessageId, Id, voteId);
+            await LowLevelClient.InternalPollsApi.RemoveVoteAsync(messageId, Id, voteId);
         }
 
         public async Task UpdateAsync(StreamUpdatePollRequest updateRequest)
@@ -296,8 +296,6 @@ internal void HandlePollVoteRemovedEvent(PollVoteRemovedEventInternalDTO dto)
 
         internal void InternalSetChannel(IStreamChannel channel) => _channel = channel;
 
-        internal void InternalSetMessageId(string messageId) => MessageId = messageId;
-
         protected override string InternalUniqueId
         {
             get => Id;

Assets/Plugins/StreamChat/Core/StreamChatClient.cs

@@ -1395,7 +1395,6 @@ private void OnPollClosed(PollClosedEventInternalDTO eventDto)
             {
                 streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
                 streamPoll.InternalSetChannel(streamChannel);
-                streamPoll.InternalSetMessageId(eventDto.MessageId);
             }
 
             streamPoll.HandlePollClosedEvent(eventDto);
@@ -1426,7 +1425,6 @@ private void OnPollUpdated(PollUpdatedEventInternalDTO eventDto)
             {
                 streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
                 streamPoll.InternalSetChannel(streamChannel);
-                streamPoll.InternalSetMessageId(eventDto.MessageId);
             }
 
             streamPoll.HandlePollUpdatedEvent(eventDto);
@@ -1443,7 +1441,6 @@ private void OnPollVoteCasted(PollVoteCastedEventInternalDTO eventDto)
             {
                 streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
                 streamPoll.InternalSetChannel(streamChannel);
-                streamPoll.InternalSetMessageId(eventDto.MessageId);
             }
 
             streamPoll.HandlePollVoteCastedEvent(eventDto);
@@ -1460,7 +1457,6 @@ private void OnPollVoteChanged(PollVoteChangedEventInternalDTO eventDto)
             {
                 streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
                 streamPoll.InternalSetChannel(streamChannel);
-                streamPoll.InternalSetMessageId(eventDto.MessageId);
             }
 
             streamPoll.HandlePollVoteChangedEvent(eventDto);
@@ -1477,7 +1473,6 @@ private void OnPollVoteRemoved(PollVoteRemovedEventInternalDTO eventDto)
             {
                 streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
                 streamPoll.InternalSetChannel(streamChannel);
-                streamPoll.InternalSetMessageId(eventDto.MessageId);
             }
 
             streamPoll.HandlePollVoteRemovedEvent(eventDto);