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/actions/compose.js | |
| 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/actions/compose.js')
| -rw-r--r-- | app/javascript/flavours/glitch/actions/compose.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js index 134b69855..16b0e7ad2 100644 --- a/app/javascript/flavours/glitch/actions/compose.js +++ b/app/javascript/flavours/glitch/actions/compose.js @@ -444,13 +444,13 @@ export const readyComposeSuggestionsTags = (token, tags) => ({ export function selectComposeSuggestion(position, token, suggestion, path) { return (dispatch, getState) => { let completion; - if (typeof suggestion === 'object' && suggestion.id) { + if (suggestion.type === 'emoji') { dispatch(useEmoji(suggestion)); completion = suggestion.native || suggestion.colons; - } else if (typeof suggestion === 'object' && suggestion.name) { + } else if (suggestion.type === 'hashtag') { completion = `#${suggestion.name}`; - } else { - completion = '@' + getState().getIn(['accounts', suggestion, 'acct']); + } else if (suggestion.type === 'account') { + completion = '@' + getState().getIn(['accounts', suggestion.id, 'acct']); } dispatch({ |