stream-chat 9.53.0 → 9.54.0

package/dist/types/client.d.ts

@@ -1153,9 +1153,7 @@ export declare class StreamChat {
         created_at?: string;
         deleted_at?: string;
         deleted_reply_count?: number;
-        i18n?: import("./types").RequireAtLeastOne<Record<`${import("./types").TranslationLanguages}_text`, string>> & {
-            language: import("./types").TranslationLanguages;
-        };
+        i18n?: import("./types").TranslatedField;
         latest_reactions?: ReactionResponse[];
         member?: import("./types").ChannelMemberResponse;
         mentioned_users?: UserResponse[];
@@ -1891,9 +1889,7 @@ export declare class StreamChat {
         created_at?: string;
         deleted_at?: string;
         deleted_reply_count?: number;
-        i18n?: import("./types").RequireAtLeastOne<Record<`${import("./types").TranslationLanguages}_text`, string>> & {
-            language: import("./types").TranslationLanguages;
-        };
+        i18n?: import("./types").TranslatedField;
         latest_reactions?: ReactionResponse[];
         member?: import("./types").ChannelMemberResponse;
         mentioned_users?: UserResponse[];

package/dist/types/poll.d.ts

@@ -29,10 +29,13 @@ export declare class Poll {
     readonly state: StateStore<PollState>;
     id: string;
     private client;
+    private optimisticVotes;
+    private closeConfirmed;
     constructor({ client, poll }: PollInitOptions);
     private getInitialStateFromPollResponse;
     private upsertOfflineDb;
     reinitializeState: (poll: PollInitOptions["poll"]) => void;
+    private updateFromVoteEvent;
     get data(): PollState;
     handlePollUpdated: (event: Event) => void;
     handlePollClosed: (event: Event) => void;
@@ -42,15 +45,30 @@ export declare class Poll {
     query: (id: string) => Promise<PollResponse>;
     update: (data: Exclude<PollData, "id">) => Promise<import("./types").APIResponse & import("./types").UpdatePollAPIResponse>;
     partialUpdate: (partialPollObject: PartialPollUpdate) => Promise<import("./types").APIResponse & import("./types").UpdatePollAPIResponse>;
-    close: () => Promise<import("./types").APIResponse & import("./types").UpdatePollAPIResponse>;
+    /**
+     * Closes the poll. The poll is marked as closed optimistically and the change is
+     * reverted if the request fails, unless the server confirmed the close meanwhile.
+     * Does nothing if the poll is already closed.
+     */
+    close: () => Promise<(import("./types").APIResponse & import("./types").UpdatePollAPIResponse) | undefined>;
     delete: () => Promise<import("./types").APIResponse>;
     createOption: (option: PollOptionData) => Promise<import("./types").APIResponse & import("./types").CreatePollOptionAPIResponse>;
     updateOption: (option: PollOptionData) => Promise<import("./types").APIResponse & import("./types").CreatePollOptionAPIResponse>;
     deleteOption: (optionId: string) => Promise<import("./types").APIResponse>;
+    /**
+     * Casts a vote for an option. The vote is shown right away through a local placeholder vote,
+     * which the server's vote replaces once the WS events of all pending vote changes arrived.
+     * If the request fails, the change is reverted.
+     */
     castVote: (optionId: string, messageId: string) => Promise<(import("./types").APIResponse & import("./types").CastVoteAPIResponse) | undefined>;
-    removeVote: (voteId: string, messageId: string) => Promise<import("./types").APIResponse & {
+    /**
+     * Removes a vote. The vote is removed right away and restored if the request fails. Vote
+     * requests are sent in order, so removing a vote whose cast is not confirmed yet uses the vote
+     * id from the cast's response; if that cast failed, there is nothing to remove.
+     */
+    removeVote: (voteId: string, messageId: string) => Promise<(import("./types").APIResponse & {
         vote: PollVote;
-    }>;
+    }) | undefined>;
     addAnswer: (answerText: string, messageId: string) => Promise<import("./types").APIResponse & import("./types").CastVoteAPIResponse>;
     removeAnswer: (answerId: string, messageId: string) => Promise<import("./types").APIResponse & {
         vote: PollVote;
@@ -59,6 +77,6 @@ export declare class Poll {
     queryOptionVotes: (params: PollOptionVotesQueryParams) => Promise<import("./types").APIResponse & import("./types").PollVotesAPIResponse>;
 }
 export declare function extractPollData(pollResponse: PollResponse): PollData;
-export declare function mapPollStateToResponse(poll: Poll): PollResponse;
+export declare function mapPollStateToResponse(poll: Poll, state?: PollState): PollResponse;
 export declare function extractPollEnrichedData(pollResponse: PollResponse): Omit<PollEnrichData, 'own_votes' | 'latest_answers'>;
 export {};

package/dist/types/poll_optimistic_votes.d.ts

@@ -0,0 +1,63 @@
+import type { StreamChat } from './client';
+import type { Poll, PollState } from './poll';
+import type { PollResponse, PollVote } from './types';
+type OptionId = string;
+/**
+ * Optimistic updates for the current user's votes on a poll. Vote changes are shown right away.
+ * While any of them is not confirmed by its WS event, vote events are only stored, as the server
+ * state they carry does not contain the pending changes yet. Once all are confirmed (a failed
+ * request counts as confirmed), the server's vote state is shown, which also reverts failed changes.
+ * Vote requests are sent one after another, so the server applies them in the order they were made.
+ * A lost WS event is recovered from after CATCH_UP_TIMEOUT_MS (see applySucceededChanges).
+ */
+export declare class OptimisticPollVotes {
+    private serverVoteState;
+    private pendingCount;
+    private succeededChanges;
+    private readonly requestTag;
+    private catchUpTimeout?;
+    private readonly client;
+    private readonly poll;
+    constructor({ client, poll }: {
+        client: StreamChat;
+        poll: Poll;
+    });
+    get serverOwnVotes(): Record<string, PollVote>;
+    withServerVotes: (pollState: PollState) => PollState;
+    /**
+     * Casts a vote for an option, shown right away through a placeholder vote. In polls with unique
+     * votes, it replaces the existing own votes.
+     */
+    castVote: (optionId: OptionId, messageId: string) => Promise<(import("./types").APIResponse & import("./types").CastVoteAPIResponse) | undefined>;
+    removeVote: (voteId: string, messageId: string) => Promise<(import("./types").APIResponse & {
+        vote: PollVote;
+    }) | undefined>;
+    private send;
+    handleVoteEvent: (poll: PollResponse, { confirmsOwnVote, ownVotesByOptionId, }: {
+        confirmsOwnVote: boolean;
+        ownVotesByOptionId: Record<OptionId, PollVote>;
+    }) => Partial<PollState>;
+    reset: (pollState: PollState) => void;
+    private track;
+    private settleWithoutEvent;
+    private createPlaceholderVote;
+    /**
+     * The server id of a vote to remove, once everything sent before the removal has finished. Casts
+     * and removals of an option alternate, so the option's last succeeded change tells: a cast is the
+     * vote being removed (e.g. a placeholder), a removal means the cast in between failed. Without
+     * one, the server's own vote of the option is the vote being removed.
+     */
+    private getServerVoteId;
+    private takeServerVoteState;
+    private scheduleCatchUp;
+    /**
+     * A WS event of an own vote change got lost, so the server's own votes are stale. All requests
+     * have finished (the timeout starts once nothing is left to send and a new request cancels it),
+     * so applying the succeeded changes in order gives the server's own votes (changes whose events
+     * did arrive end up the same). They are shown with the vote counts of the last WS event, which
+     * contain the other users' votes too.
+     */
+    private applySucceededChanges;
+}
+export declare function getMaxVotedOptionIds(voteCountsByOption: PollResponse['vote_counts_by_option']): string[];
+export {};

package/dist/types/types.d.ts

@@ -92,6 +92,7 @@ export type AppSettingsAPIResponse = APIResponse & {
         auto_translation_enabled?: boolean;
         before_message_send_hook_url?: string;
         before_message_send_hook_attempt_timeout_ms?: number;
+        before_message_send_hook_system_messages?: boolean;
         campaign_enabled?: boolean;
         cdn_expiration_seconds?: number;
         chat_primary_use_case?: string;
@@ -667,9 +668,7 @@ export type MessageResponseBase = MessageBase & {
     created_at?: string;
     deleted_at?: string;
     deleted_reply_count?: number;
-    i18n?: RequireAtLeastOne<Record<`${TranslationLanguages}_text`, string>> & {
-        language: TranslationLanguages;
-    };
+    i18n?: TranslatedField;
     latest_reactions?: ReactionResponse[];
     member?: ChannelMemberResponse;
     mentioned_users?: UserResponse[];
@@ -2423,6 +2422,9 @@ export type TestSNSDataInput = {
 export type TokenOrProvider = null | string | TokenProvider | undefined;
 export type TokenProvider = () => Promise<string>;
 export type TranslationLanguages = 'af' | 'am' | 'ar' | 'az' | 'bg' | 'bn' | 'bs' | 'cs' | 'da' | 'de' | 'el' | 'en' | 'es' | 'es-MX' | 'et' | 'fa' | 'fa-AF' | 'fi' | 'fr' | 'fr-CA' | 'ha' | 'he' | 'hi' | 'hr' | 'hu' | 'id' | 'it' | 'ja' | 'ka' | 'ko' | 'lt' | 'lv' | 'ms' | 'nl' | 'no' | 'pl' | 'ps' | 'pt' | 'ro' | 'ru' | 'sk' | 'sl' | 'so' | 'sq' | 'sr' | 'sv' | 'sw' | 'ta' | 'th' | 'tl' | 'tr' | 'uk' | 'ur' | 'vi' | 'zh' | 'zh-TW' | (string & {});
+export type TranslatedField = RequireAtLeastOne<Record<`${TranslationLanguages}_text`, string>> & {
+    language: TranslationLanguages;
+};
 export type TypingStartEvent = Event;
 export type ReservedUpdatedMessageFields = keyof typeof RESERVED_UPDATED_MESSAGE_FIELDS;
 export type UpdatedMessage = Omit<MessageResponse, ReservedUpdatedMessageFields | 'mentioned_groups'> & {
@@ -2695,7 +2697,9 @@ export type PollResponse = CustomPollData & PollEnrichData & {
     allow_answers?: boolean;
     allow_user_suggested_options?: boolean;
     description?: string;
+    description_i18n?: TranslatedField;
     is_closed?: boolean;
+    name_i18n?: TranslatedField;
     voting_visibility?: VotingVisibility;
 };
 export type PollOption = {
@@ -2705,6 +2709,7 @@ export type PollOption = {
     text: string;
     updated_at: string;
     vote_count: number;
+    text_i18n?: TranslatedField;
     votes?: PollVote[];
 };
 export declare enum VotingVisibility {
@@ -2768,6 +2773,7 @@ export type PollOptionResponse = CustomPollData & {
     text: string;
     updated_at: string;
     vote_count: number;
+    text_i18n?: TranslatedField;
     votes?: PollVote[];
 };
 export type PollVote = {
@@ -2782,6 +2788,7 @@ export type PollVote = {
 export type PollAnswer = Exclude<PollVote, 'option_id'> & {
     answer_text: string;
     is_answer: boolean;
+    answer_text_i18n?: TranslatedField;
 };
 export type PollVotesAPIResponse = {
     votes: (PollVote | PollAnswer)[];

package/dist/types/utils.d.ts

@@ -134,9 +134,7 @@ export declare const toDeletedMessage: ({ message, deletedAt, hardDelete, }: {
         [key: string]: number;
     } | null | undefined;
     reply_count?: number | undefined;
-    i18n?: (import("./types").RequireAtLeastOne<Record<`${import("./types").TranslationLanguages}_text`, string>> & {
-        language: import("./types").TranslationLanguages;
-    }) | undefined;
+    i18n?: import("./types").TranslatedField | undefined;
     html?: string | undefined;
     user?: (UserResponse | null) | undefined;
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stream-chat",
-  "version": "9.53.0",
+  "version": "9.54.0",
   "description": "JS SDK for the Stream Chat API",
   "homepage": "https://getstream.io/chat/",
   "author": {

package/src/messageComposer/middleware/messageComposer/linkPreviews.ts

@@ -32,12 +32,15 @@ export const createLinkPreviewsCompositionMiddleware = (
               LinkPreviewsManager.getPreviewData(preview),
             );
 
-      const attachments: Attachment[] = (state.message.attachments ?? []).concat(
+      const messageAttachments: Attachment[] = (state.message.attachments ?? []).concat(
         linkPreviews,
       );
+      const localAttachments: Attachment[] = (
+        state.localMessage.attachments ?? []
+      ).concat(linkPreviews);
 
       // prevent introducing attachments array into the payload sent to the server
-      if (!attachments.length) return forward();
+      if (!messageAttachments.length && !localAttachments.length) return forward();
 
       const sendOptions = { ...state.sendOptions };
       const skip_enrich_url =
@@ -47,16 +50,23 @@ export const createLinkPreviewsCompositionMiddleware = (
         sendOptions.skip_enrich_url = true;
       }
 
+      // Each payload gets the `attachments` key only when there is something to put in it,
+      // matching the attachments middleware. An empty array is not "nothing to say": on an edit
+      // the API reads it as "remove every attachment".
       return next({
         ...state,
-        message: {
-          ...state.message,
-          attachments,
-        },
-        localMessage: {
-          ...state.localMessage,
-          attachments,
-        },
+        message: messageAttachments.length
+          ? {
+              ...state.message,
+              attachments: messageAttachments,
+            }
+          : state.message,
+        localMessage: localAttachments.length
+          ? {
+              ...state.localMessage,
+              attachments: localAttachments,
+            }
+          : state.localMessage,
         sendOptions,
       });
     },

package/src/poll.ts

@@ -1,5 +1,6 @@
 import { StateStore } from './store';
 import type { StreamChat } from './client';
+import { getMaxVotedOptionIds, OptimisticPollVotes } from './poll_optimistic_votes';
 import type {
   Event,
   PartialPollUpdate,
@@ -90,12 +91,17 @@ export class Poll {
   public readonly state: StateStore<PollState>;
   public id: string;
   private client: StreamChat;
+  private optimisticVotes: OptimisticPollVotes;
+  // Set whenever server data (WS event or rehydration) confirms that the poll is closed,
+  // so that a failed optimistic close does not reopen a poll that is actually closed.
+  private closeConfirmed = false;
 
   constructor({ client, poll }: PollInitOptions) {
     this.client = client;
     this.id = poll.id;
 
     this.state = new StateStore<PollState>(this.getInitialStateFromPollResponse(poll));
+    this.optimisticVotes = new OptimisticPollVotes({ client: this.client, poll: this });
   }
 
   private getInitialStateFromPollResponse = (poll: PollInitOptions['poll']) => {
@@ -127,15 +133,45 @@ export class Poll {
     };
   };
 
+  // persists only the server's votes, never the optimistic ones
   private upsertOfflineDb = () => {
+    const serverState = this.optimisticVotes.withServerVotes(this.data);
     this.client.offlineDb?.executeQuerySafely(
-      (db) => db.upsertPoll({ poll: mapPollStateToResponse(this) }),
+      (db) => db.upsertPoll({ poll: mapPollStateToResponse(this, serverState) }),
       { method: 'upsertPoll' },
     );
   };
 
   public reinitializeState = (poll: PollInitOptions['poll']) => {
-    this.state.partialNext(this.getInitialStateFromPollResponse(poll));
+    if (poll.is_closed) this.closeConfirmed = true;
+    const initialState = this.getInitialStateFromPollResponse(poll);
+    this.optimisticVotes.reset(initialState);
+    this.state.partialNext(initialState);
+  };
+
+  // Hands the vote state of a WS vote event to the optimistic votes, which decide whether to show it.
+  private updateFromVoteEvent = (
+    event: Event & {
+      created_at: string;
+      poll: PollResponse;
+      poll_vote: PollVote | PollAnswer;
+    },
+    ownVotesByOptionId: Record<OptionId, PollVote>,
+    answerState: Pick<PollState, 'latest_answers' | 'ownAnswer'>,
+  ) => {
+    const isOwnVote = event.poll_vote.user_id === this.client.userID;
+    const shownVoteState = this.optimisticVotes.handleVoteEvent(event.poll, {
+      confirmsOwnVote:
+        isOwnVote && !isVoteAnswer(event.poll_vote) && !!event.poll_vote.option_id,
+      ownVotesByOptionId,
+    });
+    this.state.partialNext({
+      ...answerState,
+      answers_count: event.poll.answers_count,
+      lastActivityAt: new Date(event.created_at),
+      ...shownVoteState,
+    });
+    this.upsertOfflineDb();
   };
 
   get data(): PollState {
@@ -147,6 +183,7 @@ export class Poll {
     if (!isPollUpdatedEvent(event)) return;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { id, ...pollData } = extractPollData(event.poll);
+    if (pollData.is_closed) this.closeConfirmed = true;
     // @ts-expect-error type mismatch
     this.state.partialNext({ ...pollData, lastActivityAt: new Date(event.created_at) });
     this.upsertOfflineDb();
@@ -155,6 +192,7 @@ export class Poll {
   public handlePollClosed = (event: Event) => {
     if (event.poll?.id && event.poll.id !== this.id) return;
     if (!isPollClosedEventEvent(event)) return;
+    this.closeConfirmed = true;
     this.state.partialNext({
       is_closed: true,
       lastActivityAt: new Date(event.created_at),
@@ -169,8 +207,7 @@ export class Poll {
     const isOwnVote = event.poll_vote.user_id === this.client.userID;
     let latestAnswers = [...(currentState.latest_answers as PollAnswer[])];
     let ownAnswer = currentState.ownAnswer;
-    const ownVotesByOptionId = currentState.ownVotesByOptionId;
-    let maxVotedOptionIds = currentState.maxVotedOptionIds;
+    const ownVotesByOptionId = { ...this.optimisticVotes.serverOwnVotes };
 
     if (isOwnVote) {
       if (isVoteAnswer(event.poll_vote)) {
@@ -182,20 +219,12 @@ export class Poll {
 
     if (isVoteAnswer(event.poll_vote)) {
       latestAnswers = [event.poll_vote, ...latestAnswers];
-    } else {
-      maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
     }
 
-    const pollEnrichData = extractPollEnrichedData(event.poll);
-    this.state.partialNext({
-      ...pollEnrichData,
+    this.updateFromVoteEvent(event, ownVotesByOptionId, {
       latest_answers: latestAnswers,
-      lastActivityAt: new Date(event.created_at),
       ownAnswer,
-      ownVotesByOptionId,
-      maxVotedOptionIds,
     });
-    this.upsertOfflineDb();
   };
 
   public handleVoteChanged = (event: Event) => {
@@ -206,8 +235,7 @@ export class Poll {
     const isOwnVote = event.poll_vote.user_id === this.client.userID;
     let latestAnswers = [...(currentState.latest_answers as PollAnswer[])];
     let ownAnswer = currentState.ownAnswer;
-    let ownVotesByOptionId = currentState.ownVotesByOptionId;
-    let maxVotedOptionIds = currentState.maxVotedOptionIds;
+    let ownVotesByOptionId = this.optimisticVotes.serverOwnVotes;
 
     if (isOwnVote) {
       if (isVoteAnswer(event.poll_vote)) {
@@ -238,24 +266,15 @@ export class Poll {
         if (ownAnswer?.id === event.poll_vote.id) {
           ownAnswer = undefined;
         }
-        maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
       }
     } else if (isVoteAnswer(event.poll_vote)) {
       latestAnswers = [event.poll_vote, ...latestAnswers];
-    } else {
-      maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
     }
 
-    const pollEnrichData = extractPollEnrichedData(event.poll);
-    this.state.partialNext({
-      ...pollEnrichData,
+    this.updateFromVoteEvent(event, ownVotesByOptionId, {
       latest_answers: latestAnswers,
-      lastActivityAt: new Date(event.created_at),
       ownAnswer,
-      ownVotesByOptionId,
-      maxVotedOptionIds,
     });
-    this.upsertOfflineDb();
   };
 
   public handleVoteRemoved = (event: Event) => {
@@ -265,31 +284,21 @@ export class Poll {
     const isOwnVote = event.poll_vote.user_id === this.client.userID;
     let latestAnswers = [...(currentState.latest_answers as PollAnswer[])];
     let ownAnswer = currentState.ownAnswer;
-    const ownVotesByOptionId = { ...currentState.ownVotesByOptionId };
-    let maxVotedOptionIds = currentState.maxVotedOptionIds;
+    const ownVotesByOptionId = { ...this.optimisticVotes.serverOwnVotes };
 
     if (isVoteAnswer(event.poll_vote)) {
       latestAnswers = latestAnswers.filter((answer) => answer.id !== event.poll_vote.id);
       if (isOwnVote) {
         ownAnswer = undefined;
       }
-    } else {
-      maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
-      if (isOwnVote && event.poll_vote.option_id) {
-        delete ownVotesByOptionId[event.poll_vote.option_id];
-      }
+    } else if (isOwnVote && event.poll_vote.option_id) {
+      delete ownVotesByOptionId[event.poll_vote.option_id];
     }
 
-    const pollEnrichData = extractPollEnrichedData(event.poll);
-    this.state.partialNext({
-      ...pollEnrichData,
+    this.updateFromVoteEvent(event, ownVotesByOptionId, {
       latest_answers: latestAnswers,
-      lastActivityAt: new Date(event.created_at),
       ownAnswer,
-      ownVotesByOptionId,
-      maxVotedOptionIds,
     });
-    this.upsertOfflineDb();
   };
 
   query = async (id: string) => {
@@ -304,7 +313,26 @@ export class Poll {
   partialUpdate = async (partialPollObject: PartialPollUpdate) =>
     await this.client.partialUpdatePoll(this.id as string, partialPollObject);
 
-  close = async () => await this.client.closePoll(this.id as string);
+  /**
+   * Closes the poll. The poll is marked as closed optimistically and the change is
+   * reverted if the request fails, unless the server confirmed the close meanwhile.
+   * Does nothing if the poll is already closed.
+   */
+  close = async () => {
+    if (this.data.is_closed) return;
+
+    this.closeConfirmed = false;
+    this.state.partialNext({ is_closed: true });
+
+    try {
+      return await this.client.closePoll(this.id as string);
+    } catch (error) {
+      if (!this.closeConfirmed) {
+        this.state.partialNext({ is_closed: false });
+      }
+      throw error;
+    }
+  };
 
   delete = async () => await this.client.deletePoll(this.id as string);
 
@@ -317,6 +345,11 @@ export class Poll {
   deleteOption = async (optionId: string) =>
     await this.client.deletePollOption(this.id as string, optionId);
 
+  /**
+   * Casts a vote for an option. The vote is shown right away through a local placeholder vote,
+   * which the server's vote replaces once the WS events of all pending vote changes arrived.
+   * If the request fails, the change is reverted.
+   */
   castVote = async (optionId: string, messageId: string) => {
     const { max_votes_allowed, ownVotesByOptionId } = this.data;
 
@@ -336,13 +369,17 @@ export class Poll {
       });
       return;
     }
-    return await this.client.castPollVote(messageId, this.id as string, {
-      option_id: optionId,
-    });
+
+    return await this.optimisticVotes.castVote(optionId, messageId);
   };
 
+  /**
+   * Removes a vote. The vote is removed right away and restored if the request fails. Vote
+   * requests are sent in order, so removing a vote whose cast is not confirmed yet uses the vote
+   * id from the cast's response; if that cast failed, there is nothing to remove.
+   */
   removeVote = async (voteId: string, messageId: string) =>
-    await this.client.removePollVote(messageId, this.id as string, voteId);
+    await this.optimisticVotes.removeVote(voteId, messageId);
 
   addAnswer = async (answerText: string, messageId: string) =>
     await this.client.addPollAnswer(messageId, this.id as string, answerText);
@@ -367,20 +404,6 @@ export class Poll {
     );
 }
 
-function getMaxVotedOptionIds(voteCountsByOption: PollResponse['vote_counts_by_option']) {
-  let maxVotes = 0;
-  let winningOptions: string[] = [];
-  for (const [id, count] of Object.entries(voteCountsByOption ?? {})) {
-    if (count > maxVotes) {
-      winningOptions = [id];
-      maxVotes = count;
-    } else if (count === maxVotes) {
-      winningOptions.push(id);
-    }
-  }
-  return winningOptions;
-}
-
 function getOwnVotesByOptionId(ownVotes: PollVote[]) {
   return !ownVotes
     ? ({} as Record<OptionId, PollVote>)
@@ -406,7 +429,10 @@ export function extractPollData(pollResponse: PollResponse): PollData {
   };
 }
 
-export function mapPollStateToResponse(poll: Poll): PollResponse {
+export function mapPollStateToResponse(
+  poll: Poll,
+  state: PollState = poll.data,
+): PollResponse {
   const {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     lastActivityAt,
@@ -415,7 +441,7 @@ export function mapPollStateToResponse(poll: Poll): PollResponse {
     ownVotesByOptionId,
     ownAnswer,
     ...restState
-  } = poll.data;
+  } = state;
   const ownVotes = [
     ...Object.values(ownVotesByOptionId),
     ...(ownAnswer ? [ownAnswer] : []),