fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix spurious error and incorrect state change when adding a reaction twice

Browse source 
Port c06d2ff437 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
ThibG 2020-01-25 18:19:24 +01:00 committed by Thibaut Girka
parent 3d9310bf3f
commit 98d5ab6be9
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/javascript/flavours/glitch/actions/announcements.js
View file

@ -56,12 +56,27 @@ export const updateAnnouncements = announcement => ({
}); });
export const addReaction = (announcementId, name) => (dispatch, getState) => { 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(() => { api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${name}`).then(() => {
dispatch(addReactionSuccess(announcementId, name)); dispatch(addReactionSuccess(announcementId, name, alreadyAdded));
}).catch(err => { }).catch(err => {
if (!alreadyAdded) {
dispatch(addReactionFail(announcementId, name, err)); dispatch(addReactionFail(announcementId, name, err));
}
}); });
}; };

1
app/javascript/flavours/glitch/styles/components/announcements.scss
View file

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