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

Merge commit 'dee69e4f83' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-27 12:51:27 +09:00
commit f010acbde2
18 changed files with 286 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import { hideRecentEmojis } from 'mastodon/initial_state';
import { useEmoji } from '../../../actions/emojis';
import { changeSetting } from '../../../actions/settings';
import { shortCodes } from '../../emoji/emoji_mart_data_light';
import unicodeMapping from '../../emoji/emoji_unicode_mapping_light';
import EmojiPickerDropdown from '../components/emoji_picker_dropdown';
@ -34,7 +34,6 @@ const DEFAULTS = [
];
const RECENT_SIZE = DEFAULTS.length;
const DECK_SIZE = 16;
const getFrequentlyUsedEmojis = createSelector([
state => { return {
@ -43,11 +42,12 @@ const getFrequentlyUsedEmojis = createSelector([
}; },
], data => {
const { emojiCounters, reactionDeck } = data;
let deckEmojis = reactionDeck
.toArray()
.map((e) => e.get('emoji'))
.map((e) => e.get('name'))
.filter((e) => e)
.map((e) => shortCodes[e] || e);
.map((e) => unicodeMapping[e] ? unicodeMapping[e].shortCode : e);
deckEmojis = [...new Set(deckEmojis)];
let emojis;
@ -68,7 +68,9 @@ const getFrequentlyUsedEmojis = createSelector([
emojis = [];
}
emojis = deckEmojis.slice(0, DECK_SIZE).concat(emojis);
emojis = deckEmojis.concat(emojis);
if (emojis.length <= 0) emojis = ['+1'];
return emojis;
});