hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix mark as read in notifications to be saved immediately 

Port bec8b12bb5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
signup-info-prompt
Takeshi Umeda 2020-10-01 11:17:46 +09:00 committed by Thibaut Girka
parent c3d82027cf
commit 8071613dd7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/actions/markers.js
View File

@ -100,8 +100,12 @@ export function submitMarkersSuccess({ home, notifications }) {
}; };
}; };
export function submitMarkers() { export function submitMarkers(params = {}) {
return (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState); const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
if (params.immediate === true) {
debouncedSubmitMarkers.flush();
}
return result;
}; };
export const fetchMarkers = () => (dispatch, getState) => { export const fetchMarkers = () => (dispatch, getState) => {

2
app/javascript/flavours/glitch/features/notifications/index.js
View File

@ -71,7 +71,7 @@ const mapDispatchToProps = dispatch => ({
}, },
onMarkAsRead() { onMarkAsRead() {
dispatch(markNotificationsAsRead()); dispatch(markNotificationsAsRead());
dispatch(submitMarkers()); dispatch(submitMarkers({ immediate: true }));
}, },
onMount() { onMount() {
dispatch(mountNotifications()); dispatch(mountNotifications());

2
app/javascript/flavours/glitch/features/ui/index.js
View File

@ -359,7 +359,7 @@ class UI extends React.Component {
const visibility = !document[this.visibilityHiddenProp]; const visibility = !document[this.visibilityHiddenProp];
this.props.dispatch(notificationsSetVisibility(visibility)); this.props.dispatch(notificationsSetVisibility(visibility));
if (visibility) { if (visibility) {
this.props.dispatch(submitMarkers()); this.props.dispatch(submitMarkers({ immediate: true }));
} }
} }