treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix spurious error and incorrect state change when adding a reaction twice (#12957) 

* Fix spurious error and incorrect state change when adding a reaction twice

* Remove superfluous top border for announcements box
lolsob-rspec
ThibG 2020-01-25 18:19:24 +01:00 committed by Eugen Rochko
parent ab01849287
commit 1c85e84b4e
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/javascript/mastodon/actions/announcements.js
View File

@ -56,12 +56,27 @@ export const updateAnnouncements = announcement => ({
});
export const addReaction = (announcementId, name) => (dispatch, getState) => {
dispatch(addReactionRequest(announcementId, name));
const announcement = getState().getIn(['announcements', 'items']).find(x => x.get('id') === announcementId);
let alreadyAdded = false;
if (announcement) {
const reaction = announcement.get('reactions').find(x => x.get('name') === name);
if (reaction && reaction.get('me')) {
alreadyAdded = true;
}
}
if (!alreadyAdded) {
dispatch(addReactionRequest(announcementId, name, alreadyAdded));
}
api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${name}`).then(() => {
dispatch(addReactionSuccess(announcementId, name));
dispatch(addReactionSuccess(announcementId, name, alreadyAdded));
}).catch(err => {
dispatch(addReactionFail(announcementId, name, err));
if (!alreadyAdded) {
dispatch(addReactionFail(announcementId, name, err));
}
});
};

1
app/javascript/styles/mastodon/components.scss
View File

@ -6632,7 +6632,6 @@ noscript {
.announcements {
background: lighten($ui-base-color, 8%);
border-top: 1px solid $ui-base-color;
font-size: 13px;
display: flex;
align-items: flex-end;