From 667708f5b00ee8b7795eacd9c20d29f77c8ae602 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 29 Nov 2019 17:02:18 +0100
Subject: [PATCH] Fix pending upload count not being decremented on error
(#12499)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The arguments were passed to the wrong function… also, there is no
need to have a conditional decrementation: failure to upload means
we marked an upload as pending, in all cases.
---
app/javascript/mastodon/actions/compose.js | 5 ++---
app/javascript/mastodon/reducers/compose.js | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 727f02718..c3c6ff1a1 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -236,7 +236,7 @@ export function uploadCompose(files) {
dispatch(uploadComposeProgress(progress.reduce((a, v) => a + v, 0), total));
},
}).then(({ data }) => dispatch(uploadComposeSuccess(data, f)));
- }).catch(error => dispatch(uploadComposeFail(error, true)));
+ }).catch(error => dispatch(uploadComposeFail(error)));
};
};
};
@@ -267,11 +267,10 @@ export function changeUploadComposeSuccess(media) {
};
};
-export function changeUploadComposeFail(error, decrement = false) {
+export function changeUploadComposeFail(error) {
return {
type: COMPOSE_UPLOAD_CHANGE_FAIL,
error: error,
- decrement: decrement,
skipLoading: true,
};
};
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 4c3342ccc..c6653fe4c 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -328,7 +328,7 @@ export default function compose(state = initialState, action) {
case COMPOSE_UPLOAD_SUCCESS:
return appendMedia(state, fromJS(action.media), action.file);
case COMPOSE_UPLOAD_FAIL:
- return state.set('is_uploading', false).update('pending_media_attachments', n => action.decrement ? n - 1 : n);
+ return state.set('is_uploading', false).update('pending_media_attachments', n => n - 1);
case COMPOSE_UPLOAD_UNDO:
return removeMedia(state, action.media_id);
case COMPOSE_UPLOAD_PROGRESS: