From bf12fd776120c1b9ea2b69bd433046a72f414fd8 Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Thu, 9 Oct 2025 13:35:34 +0300 Subject: [PATCH] implement functionality for favourite confirmation --- .../flavours/glitch/containers/status_container.js | 7 ++++--- app/javascript/flavours/glitch/features/status/index.jsx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js index 855db656946527a8dc6083a9d3765aa78ca8ab6d..d14a6b9773e377e5ec6bae6f6bbc7808fa2dabbb 100644 --- a/app/javascript/flavours/glitch/containers/status_container.js +++ b/app/javascript/flavours/glitch/containers/status_container.js @@ -38,7 +38,6 @@ import { undoStatusTranslation, } from 'flavours/glitch/actions/statuses'; import Status from 'flavours/glitch/components/status'; -import { favouriteModal } from 'flavours/glitch/initial_state'; import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors'; import { showAlertForError } from '../actions/alerts'; @@ -148,10 +147,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({ }, onFavourite (status, e) { + dispatch((_, getState) => { + let state = getState(); if (status.get('favourited')) { dispatch(unfavourite(status)); } else { - if (e.shiftKey || !favouriteModal) { + if (e.shiftKey || !state.getIn(['local_settings', 'confirm_favourite'])) { this.onModalFavourite(status); } else { dispatch(openModal({ @@ -162,7 +163,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({ }, })); } - } + }}); }, onPin (status) { diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx index 9f9ba92e87df24661ecfb5a01e47af18bc83e3cc..b3ceef31420544429ccff74037d19284616ad5da 100644 --- a/app/javascript/flavours/glitch/features/status/index.jsx +++ b/app/javascript/flavours/glitch/features/status/index.jsx @@ -278,7 +278,7 @@ class Status extends ImmutablePureComponent { if (status.get('favourited')) { dispatch(unfavourite(status)); } else { - if ((e && e.shiftKey) || !favouriteModal) { + if ((e && e.shiftKey) || !settings.get('confirm_favourite')) { this.handleModalFavourite(status); } else { dispatch(openModal({