gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix reaction_deck api structure

Browse source
This commit is contained in:
KMY 2023-05-26 17:26:50 +09:00
parent 3f9a75c72f
commit f382b16fde
3 changed files with 55 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
View file

@ -45,7 +45,7 @@ const getFrequentlyUsedEmojis = createSelector([
const { emojiCounters, reactionDeck } = data;
let deckEmojis = reactionDeck
.toArray()
.map((e) => e.get('emoji'))
.map((e) => e.getIn(['emoji', 'shortcode']))
.filter((e) => e)
.map((e) => shortCodes[e] || e);
deckEmojis = [...new Set(deckEmojis)];
@ -70,6 +70,8 @@ const getFrequentlyUsedEmojis = createSelector([
emojis = deckEmojis.slice(0, DECK_SIZE).concat(emojis);
if (emojis.length <= 0) emojis = ['+1'];
return emojis;
});

2
app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
View file

@ -13,7 +13,7 @@ import emojify from 'mastodon/features/emoji/emoji';
import { autoPlayGif } from 'mastodon/initial_state';
const MapStateToProps = (state, { emojiId, emojiMap }) => ({
emoji: (state.get('reaction_deck', ImmutableList()).toArray().find(em => em.get('id') === emojiId) || ImmutableMap({ emoji: '' })).get('emoji'),
emoji: (state.get('reaction_deck', ImmutableList()).toArray().find(em => em.get('id') === emojiId) || ImmutableMap({ emoji: { shortcode: '' } })).getIn(['emoji', 'shortcode']),
emojiMap,
});