Skip to content

Commit 79da1e7

Browse files
committed
Remove MessageId - it's not in the spec
1 parent f827c11 commit 79da1e7

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,22 +152,19 @@ public interface IStreamPoll : IStreamStatefulModel
152152
/// </summary>
153153
IStreamChannel Channel { get; }
154154

155-
/// <summary>
156-
/// ID of the message containing this poll
157-
/// </summary>
158-
string MessageId { get; }
159-
160155
/// <summary>
161156
/// Cast a vote on this poll
162157
/// </summary>
158+
/// <param name="messageId">The ID of the message containing this poll</param>
163159
/// <param name="optionId">The ID of the option to vote for</param>
164-
Task<StreamPollVote> CastVoteAsync(string optionId);
160+
Task<StreamPollVote> CastVoteAsync(string messageId, string optionId);
165161

166162
/// <summary>
167163
/// Remove a vote from this poll
168164
/// </summary>
165+
/// <param name="messageId">The ID of the message containing this poll</param>
169166
/// <param name="voteId">The ID of the vote to remove</param>
170-
Task RemoveVoteAsync(string voteId);
167+
Task RemoveVoteAsync(string messageId, string voteId);
171168

172169
/// <summary>
173170
/// Update this poll

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@ private set
8484

8585
public IStreamChannel Channel => _channel;
8686

87-
public string MessageId { get; private set; }
88-
89-
public async Task<StreamPollVote> CastVoteAsync(string optionId)
87+
public async Task<StreamPollVote> CastVoteAsync(string messageId, string optionId)
9088
{
89+
StreamAsserts.AssertNotNullOrEmpty(messageId, nameof(messageId));
9190
StreamAsserts.AssertNotNullOrEmpty(optionId, nameof(optionId));
9291

9392
var request = new CastPollVoteRequestInternalDTO
@@ -98,15 +97,16 @@ public async Task<StreamPollVote> CastVoteAsync(string optionId)
9897
}
9998
};
10099

101-
var response = await LowLevelClient.InternalPollsApi.CastVoteAsync(MessageId, Id, request);
100+
var response = await LowLevelClient.InternalPollsApi.CastVoteAsync(messageId, Id, request);
102101
return new StreamPollVote().TryLoadFromDto<PollVoteResponseDataInternalDTO, StreamPollVote>(response.Vote, Cache);
103102
}
104103

105-
public async Task RemoveVoteAsync(string voteId)
104+
public async Task RemoveVoteAsync(string messageId, string voteId)
106105
{
106+
StreamAsserts.AssertNotNullOrEmpty(messageId, nameof(messageId));
107107
StreamAsserts.AssertNotNullOrEmpty(voteId, nameof(voteId));
108108

109-
await LowLevelClient.InternalPollsApi.RemoveVoteAsync(MessageId, Id, voteId);
109+
await LowLevelClient.InternalPollsApi.RemoveVoteAsync(messageId, Id, voteId);
110110
}
111111

112112
public async Task UpdateAsync(StreamUpdatePollRequest updateRequest)
@@ -296,8 +296,6 @@ internal void HandlePollVoteRemovedEvent(PollVoteRemovedEventInternalDTO dto)
296296

297297
internal void InternalSetChannel(IStreamChannel channel) => _channel = channel;
298298

299-
internal void InternalSetMessageId(string messageId) => MessageId = messageId;
300-
301299
protected override string InternalUniqueId
302300
{
303301
get => Id;

Assets/Plugins/StreamChat/Core/StreamChatClient.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,6 @@ private void OnPollClosed(PollClosedEventInternalDTO eventDto)
13951395
{
13961396
streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
13971397
streamPoll.InternalSetChannel(streamChannel);
1398-
streamPoll.InternalSetMessageId(eventDto.MessageId);
13991398
}
14001399

14011400
streamPoll.HandlePollClosedEvent(eventDto);
@@ -1426,7 +1425,6 @@ private void OnPollUpdated(PollUpdatedEventInternalDTO eventDto)
14261425
{
14271426
streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
14281427
streamPoll.InternalSetChannel(streamChannel);
1429-
streamPoll.InternalSetMessageId(eventDto.MessageId);
14301428
}
14311429

14321430
streamPoll.HandlePollUpdatedEvent(eventDto);
@@ -1443,7 +1441,6 @@ private void OnPollVoteCasted(PollVoteCastedEventInternalDTO eventDto)
14431441
{
14441442
streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
14451443
streamPoll.InternalSetChannel(streamChannel);
1446-
streamPoll.InternalSetMessageId(eventDto.MessageId);
14471444
}
14481445

14491446
streamPoll.HandlePollVoteCastedEvent(eventDto);
@@ -1460,7 +1457,6 @@ private void OnPollVoteChanged(PollVoteChangedEventInternalDTO eventDto)
14601457
{
14611458
streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
14621459
streamPoll.InternalSetChannel(streamChannel);
1463-
streamPoll.InternalSetMessageId(eventDto.MessageId);
14641460
}
14651461

14661462
streamPoll.HandlePollVoteChangedEvent(eventDto);
@@ -1477,7 +1473,6 @@ private void OnPollVoteRemoved(PollVoteRemovedEventInternalDTO eventDto)
14771473
{
14781474
streamPoll = _cache.TryCreateOrUpdate(eventDto.Poll);
14791475
streamPoll.InternalSetChannel(streamChannel);
1480-
streamPoll.InternalSetMessageId(eventDto.MessageId);
14811476
}
14821477

14831478
streamPoll.HandlePollVoteRemovedEvent(eventDto);

0 commit comments

Comments
 (0)