From 1f5580ce6606fffafc5f42bbae0d9546fde1fd2c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 27 Jun 2021 14:17:37 -0500
Subject: [PATCH] Separate status creation from composer

---
 app/soapbox/actions/compose.js  | 29 +++++++++++++++--------------
 app/soapbox/actions/statuses.js | 20 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 6c3057436..3939c42fd 100644
--- a/app/soapbox/actions/compose.js
+++ b/app/soapbox/actions/compose.js
@@ -14,6 +14,7 @@ import { getSettings } from './settings';
 import { getFeatures } from 'soapbox/utils/features';
 import { uploadMedia } from './media';
 import { isLoggedIn } from 'soapbox/utils/auth';
+import { createStatus } from './statuses';
 
 let cancelFetchComposeSuggestionsAccounts;
 
@@ -134,11 +135,11 @@ export function directCompose(account, routerHistory) {
   };
 };
 
-export function handleComposeSubmit(dispatch, getState, response, status) {
+export function handleComposeSubmit(dispatch, getState, data, status) {
   if (!dispatch || !getState) return;
 
-  dispatch(insertIntoTagHistory(response.data.tags || [], status));
-  dispatch(submitComposeSuccess({ ...response.data }));
+  dispatch(insertIntoTagHistory(data.tags || [], status));
+  dispatch(submitComposeSuccess({ ...data }));
 
   // To make the app more responsive, immediately push the status into the columns
   const insertIfOnline = timelineId => {
@@ -148,13 +149,13 @@ export function handleComposeSubmit(dispatch, getState, response, status) {
       let dequeueArgs = {};
       if (timelineId === 'community') dequeueArgs.onlyMedia = getSettings(getState()).getIn(['community', 'other', 'onlyMedia']);
       dispatch(dequeueTimeline(timelineId, null, dequeueArgs));
-      dispatch(updateTimeline(timelineId, response.data.id));
+      dispatch(updateTimeline(timelineId, data.id));
     }
   };
 
-  if (response.data.visibility !== 'direct') {
+  if (data.visibility !== 'direct') {
     insertIfOnline('home');
-  } else if (response.data.visibility === 'public') {
+  } else if (data.visibility === 'public') {
     insertIfOnline('community');
     insertIfOnline('public');
   }
@@ -168,7 +169,9 @@ export function submitCompose(routerHistory, group) {
       dispatch(submitComposeRequest());
       dispatch(closeModal());
 
-      api(getState).post('/api/v1/statuses', {
+      const idempotencyKey = getState().getIn(['compose', 'idempotencyKey']);
+
+      const params = {
         status,
         in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
         media_ids: media.map(item => item.get('id')),
@@ -178,15 +181,13 @@ export function submitCompose(routerHistory, group) {
         content_type: getState().getIn(['compose', 'content_type']),
         poll: getState().getIn(['compose', 'poll'], null),
         scheduled_at: getState().getIn(['compose', 'schedule'], null),
-      }, {
-        headers: {
-          'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
-        },
-      }).then(function(response) {
-        if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
+      };
+
+      dispatch(createStatus(params, idempotencyKey)).then(function(data) {
+        if (data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
           routerHistory.push('/messages');
         }
-        handleComposeSubmit(dispatch, getState, response, status);
+        handleComposeSubmit(dispatch, getState, data, status);
       }).catch(function(error) {
         dispatch(submitComposeFail(error));
       });
diff --git a/app/soapbox/actions/statuses.js b/app/soapbox/actions/statuses.js
index f06aefa39..a9123cd64 100644
--- a/app/soapbox/actions/statuses.js
+++ b/app/soapbox/actions/statuses.js
@@ -6,6 +6,10 @@ import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus
 import { openModal } from './modal';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+export const STATUS_CREATE_REQUEST = 'STATUS_CREATE_REQUEST';
+export const STATUS_CREATE_SUCCESS = 'STATUS_CREATE_SUCCESS';
+export const STATUS_CREATE_FAIL    = 'STATUS_CREATE_FAIL';
+
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
 export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
 export const STATUS_FETCH_FAIL    = 'STATUS_FETCH_FAIL';
@@ -39,6 +43,22 @@ export function fetchStatusRequest(id, skipLoading) {
   };
 };
 
+export function createStatus(params, idempotencyKey) {
+  return (dispatch, getState) => {
+    dispatch({ type: STATUS_CREATE_REQUEST, params, idempotencyKey });
+
+    return api(getState).post('/api/v1/statuses', params, {
+      headers: { 'Idempotency-Key': idempotencyKey },
+    }).then(({ data: status }) => {
+      dispatch({ type: STATUS_CREATE_SUCCESS, status, params, idempotencyKey });
+      return status;
+    }).catch(error => {
+      dispatch({ type: STATUS_CREATE_FAIL, error, params, idempotencyKey });
+      throw error;
+    });
+  };
+};
+
 function getFromDB(dispatch, getState, accountIndex, index, id) {
   return new Promise((resolve, reject) => {
     const request = index.get(id);