about summary refs log tree commit diff
path: root/app/assets/javascripts/components/actions/statuses.jsx
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-02-26 22:44:31 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-02-26 22:44:31 +0100
commit4bb8ff7c8ea3ab7c291a23893af2846811b99faf (patch)
tree64aebde8e2bfec8b20947f5f1ee43308d55f3fbb /app/assets/javascripts/components/actions/statuses.jsx
parent03000fee5fd30f2d057ac0d6531990d83f58dd4a (diff)
parentdfd4a42b350a0f258b0b1f8dcd2296289a98381c (diff)
Merge branch 'fix_626' of https://github.com/rmhasan/mastodon into rmhasan-fix_626
Diffstat (limited to 'app/assets/javascripts/components/actions/statuses.jsx')
-rw-r--r--app/assets/javascripts/components/actions/statuses.jsx9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/actions/statuses.jsx b/app/assets/javascripts/components/actions/statuses.jsx
index ee662fe79..6f43539e0 100644
--- a/app/assets/javascripts/components/actions/statuses.jsx
+++ b/app/assets/javascripts/components/actions/statuses.jsx
@@ -28,7 +28,6 @@ export function fetchStatus(id) {
     const skipLoading = getState().getIn(['statuses', id], null) !== null;
 
     dispatch(fetchContext(id));
-    dispatch(fetchStatusCard(id));
 
     if (skipLoading) {
       return;
@@ -102,8 +101,14 @@ export function fetchContext(id) {
 
     api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
       dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
+      dispatch(fetchStatusCard(id));
     }).catch(error => {
-      dispatch(fetchContextFail(id, error));
+      if (error.response.status == 404){
+        dispatch(deleteStatusSuccess(id));
+        dispatch(deleteFromTimelines(id));
+      }else{
+        dispatch(fetchContextFail(id, error));
+      }
     });
   };
 };