diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-29 15:04:49 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2019-09-02 10:57:44 +0200 |
commit | 3c70fb91463ead824b80e94489688e125544c412 (patch) | |
tree | 7d3716b8cb88e73ca7c4ca1cad84de786c820b48 /app/javascript/flavours/glitch/reducers | |
parent | be8b0e8d069d222df100dce050d52067a6fec1ce (diff) |
[Glitch] Fix emoji autosuggestions
Port 784c88e16d8e0f75c0d27e34f926569607e02044 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Diffstat (limited to 'app/javascript/flavours/glitch/reducers')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/compose.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js index 3c769abe3..ee2905c9b 100644 --- a/app/javascript/flavours/glitch/reducers/compose.js +++ b/app/javascript/flavours/glitch/reducers/compose.js @@ -288,11 +288,11 @@ const expiresInFromExpiresAt = expires_at => { const normalizeSuggestions = (state, { accounts, emojis, tags }) => { if (accounts) { - return accounts.map(item => item.id); + return accounts.map(item => ({ id: item.id, type: 'account' })); } else if (emojis) { - return emojis; + return emojis.map(item => ({ ...item, type: 'emoji' })); } else { - return sortHashtagsByUse(state, tags); + return sortHashtagsByUse(state, tags.map(item => ({ ...item, type: 'hashtag' }))); } }; |