From 694abcb489cda8d4955ff77aa1e4925269c045cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Wed, 28 Aug 2024 11:22:59 +0200 Subject: [PATCH] Fix emoji reactions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- src/reducers/statuses.ts | 4 ++-- src/utils/emoji-reacts.ts | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/reducers/statuses.ts b/src/reducers/statuses.ts index b10e02d0c..9daf21c80 100644 --- a/src/reducers/statuses.ts +++ b/src/reducers/statuses.ts @@ -202,13 +202,13 @@ const statuses = (state = initialState, action: AnyAction): State => { case EMOJI_REACT_REQUEST: return state .updateIn( - [action.statusId, 'reactions'], + [action.statusId, 'emoji_reactions'], emojiReacts => simulateEmojiReact(emojiReacts as any, action.emoji, action.custom), ); case UNEMOJI_REACT_REQUEST: return state .updateIn( - [action.statusId, 'reactions'], + [action.statusId, 'emoji_reactions'], emojiReacts => simulateUnEmojiReact(emojiReacts as any, action.emoji), ); case FAVOURITE_FAIL: diff --git a/src/utils/emoji-reacts.ts b/src/utils/emoji-reacts.ts index d2b671771..740b2f1f6 100644 --- a/src/utils/emoji-reacts.ts +++ b/src/utils/emoji-reacts.ts @@ -41,7 +41,8 @@ const reduceEmoji = (emojiReacts: Array | null, favouritesCount: sortEmoji( mergeEmojiFavourites(emojiReacts, favouritesCount, favourited), allowedEmoji, - )); + ) +); const getReactForStatus = ( status: Pick, @@ -71,12 +72,12 @@ const simulateEmojiReact = (emojiReacts: Array, emoji: string, ur url, }) : reaction); } else { - return emojiReacts.push(emojiReactionSchema.parse({ + return [...emojiReacts, emojiReactionSchema.parse({ count: 1, me: true, name: emoji, url, - })); + })]; } };