From 784c88e16d8e0f75c0d27e34f926569607e02044 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 29 Jul 2019 15:04:49 +0200
Subject: [PATCH] Fix emoji autosuggestions (#11442)
Regression from cfb2ed78231758a79af038a964ab7f7b7b35274e
---
app/javascript/mastodon/actions/compose.js | 8 ++++----
.../mastodon/components/autosuggest_input.js | 10 +++++-----
.../mastodon/components/autosuggest_textarea.js | 10 +++++-----
app/javascript/mastodon/reducers/compose.js | 6 +++---
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index cd9955505f..c27c53df0b 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -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;
}
diff --git a/app/javascript/mastodon/components/autosuggest_input.js b/app/javascript/mastodon/components/autosuggest_input.js
index 0df8bf64e1..6d2035add0 100644
--- a/app/javascript/mastodon/components/autosuggest_input.js
+++ b/app/javascript/mastodon/components/autosuggest_input.js
@@ -168,15 +168,15 @@ export default class AutosuggestInput extends ImmutablePureComponent {
const { selectedSuggestion } = this.state;
let inner, key;
- if (typeof suggestion === 'object' && suggestion.shortcode) {
+ if (suggestion.type === 'emoji') {
inner = <AutosuggestEmoji emoji={suggestion} />;
key = suggestion.id;
- } else if (typeof suggestion === 'object' && suggestion.name) {
+ } else if (suggestion.type ==='hashtag') {
inner = <AutosuggestHashtag tag={suggestion} />;
key = suggestion.name;
- } else {
- inner = <AutosuggestAccountContainer id={suggestion} />;
- key = suggestion;
+ } else if (suggestion.type === 'account') {
+ inner = <AutosuggestAccountContainer id={suggestion.id} />;
+ key = suggestion.id;
}
return (
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.js b/app/javascript/mastodon/components/autosuggest_textarea.js
index 2bd06d28a9..ac2a6366a0 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.js
+++ b/app/javascript/mastodon/components/autosuggest_textarea.js
@@ -174,15 +174,15 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
const { selectedSuggestion } = this.state;
let inner, key;
- if (typeof suggestion === 'object' && suggestion.shortcode) {
+ if (suggestion.type === 'emoji') {
inner = <AutosuggestEmoji emoji={suggestion} />;
key = suggestion.id;
- } else if (typeof suggestion === 'object' && suggestion.name) {
+ } else if (suggestion.type === 'hashtag') {
inner = <AutosuggestHashtag tag={suggestion} />;
key = suggestion.name;
- } else {
- inner = <AutosuggestAccountContainer id={suggestion} />;
- key = suggestion;
+ } else if (suggestion.type === 'account') {
+ inner = <AutosuggestAccountContainer id={suggestion.id} />;
+ key = suggestion.id;
}
return (
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index fc6d5f30f1..e683a9c1af 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -207,11 +207,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' })));
}
};