Reduce composer differences with upstream and simplify code (#2518)

glitch-soc · Dec 18, 2023 · 3d3fa75 · 3d3fa75
1 parent 1885637
commit 3d3fa75
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 252 deletions.
diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
@@ -251,9 +251,9 @@ export function submitCompose(routerHistory) {
         return;
       }
 
-      // To make the app more responsive, immediately get the status into the columns
-
-      const insertIfOnline = (timelineId) => {
+      // To make the app more responsive, immediately push the status
+      // into the columns
+      const insertIfOnline = timelineId => {
         const timeline = getState().getIn(['timelines', timelineId]);
 
         if (timeline && timeline.get('items').size > 0 && timeline.getIn(['items', 0]) !== null && timeline.get('online')) {
@@ -662,8 +662,9 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
   return (dispatch, getState) => {
     let completion;
     if (suggestion.type === 'emoji') {
-      dispatch(useEmoji(suggestion));
       completion = suggestion.native || suggestion.colons;
+
+      dispatch(useEmoji(suggestion));
     } else if (suggestion.type === 'hashtag') {
       completion = `#${suggestion.name}`;
     } else if (suggestion.type === 'account') {