Page MenuHomePhorge
Files F85651025

No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index 6296e3c9a3..f9cc2e2fd0 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -37,9 +37,9 @@ const EmojiReactions = {
},
accountsForEmoji() {
return this.status.emoji_reactions.reduce((acc, reaction) => {
- acc[reaction.name] = reaction.accounts || []
+ acc.set(reaction.name, new Set(reaction.account_ids))
return acc
- }, {})
+ }, new Map())
},
loggedIn() {
return !!useUsersStore().currentUser
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index a8100c0d49..8f830e8aef 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -52,7 +52,7 @@
</FALayers>
</component>
<UserListPopover
- :users="accountsForEmoji[reaction.name]"
+ :user-ids="accountsForEmoji.get(reaction.name)"
class="emoji-reaction-popover"
:normal-button="true"
:trigger-attrs="counterTriggerAttrs(reaction)"
diff --git a/src/stores/statuses.js b/src/stores/statuses.js
index 80bd2e7d7c..375f498cb5 100644
--- a/src/stores/statuses.js
+++ b/src/stores/statuses.js
@@ -191,14 +191,22 @@ export const useStatusesStore = defineStore('statuses', {
id,
credentials: useOAuthStore().token,
}).then(({ data, timestamp }) => {
- data.forEach((reaction) => {
+ const reactions = data.map((reaction) => {
const users = useUsersStore().addNewUsers({
timestamp,
data: reaction.accounts,
})
- reaction.accounts = users
+
+ // Backend inconsistency - status data only has ids (account_ids)
+ // but reactions data has full info (accounts)
+ return {
+ ...reaction,
+ accounts: users,
+ account_ids: users.map(({ id }) => id),
+ }
})
- this.addEmojiReactionsBy(id, data)
+
+ this.addEmojiReactionsBy(id, reactions)
})
},
fetchFavs(id) {

File Metadata

Mime Type
text/x-diff
Expires
Sun, Aug 30, 10:17 AM (1 d, 17 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1737908
Default Alt Text
(2 KB)

Event Timeline