Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix emoji autosuggestions (#11442)

Browse source 
Regression from cfb2ed7823
This commit is contained in:
Eugen Rochko 2019-07-29 15:04:49 +02:00 • committed by GitHub
parent 2f0820963d
commit 784c88e16d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/actions/compose.js
View file

@ -418,16 +418,16 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
return (dispatch, getState) => {
let completion, startPosition;
if (typeof suggestion === 'object' && suggestion.id) {
if (suggestion.type === 'emoji') {
completion = suggestion.native || suggestion.colons;
startPosition = position - 1;
dispatch(useEmoji(suggestion));
} else if (typeof suggestion === 'object' && suggestion.name) {
} else if (suggestion.type === 'hashtag') {
completion = `#${suggestion.name}`;
startPosition = position - 1;
} else {
completion = getState().getIn(['accounts', suggestion, 'acct']);
} else if (suggestion.type === 'account') {
completion = getState().getIn(['accounts', suggestion.id, 'acct']);
startPosition = position;
}