Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream

app/javascript/mastodon/actions/compose.js

@@ -673,7 +673,7 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
     let completion, startPosition;
 
     if (suggestion.type === 'emoji') {
-      completion    = suggestion.native || suggestion.colons;
+      completion    = suggestion.native || `:${suggestion.id}:`;
       startPosition = position - 1;
 
       dispatch(useEmoji(suggestion));

app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx

@@ -228,7 +228,7 @@ class EmojiPickerMenuImpl extends PureComponent {
 
   handleClick = (emoji, event) => {
     if (!emoji.native) {
-      emoji.native = emoji.colons;
+      emoji.native = `:${emoji.id}:`;
     }
     if (!(event.ctrlKey || event.metaKey)) {