parent
2f0820963d
commit
784c88e16d
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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' })));
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Reference in New Issue