Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] upgrade eslint to 9.37.0 (#88)

Browse Source 
Co-authored-by: tobi <tobi.smethurst@protonmail.com>
Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/88
Co-authored-by: Zoë Bijl <moiety@noreply.codeberg.org>
Co-committed-by: Zoë Bijl <moiety@noreply.codeberg.org>
This commit is contained in:
Zoë Bijl
2025-10-12 13:42:02 +02:00
committed by tobi
parent 75d7a62693
commit 1ff70886a1
975 changed files with 22196 additions and 21964 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+29 -29
View File
@@ -1,35 +1,35 @@
import { defineMessages, injectIntl } from 'react-intl';
import { defineMessages, injectIntl } from "react-intl";
import { connect } from 'react-redux';
import { connect } from "react-redux";
import { showAlert } from '../../../actions/alerts';
import { openModal } from '../../../actions/modal';
import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
import { changeSetting } from '../../../actions/settings';
import ColumnSettings from '../components/column_settings';
import { showAlert } from "../../../actions/alerts";
import { openModal } from "../../../actions/modal";
import { setFilter, clearNotifications, requestBrowserPermission } from "../../../actions/notifications";
import { changeAlerts as changePushNotifications } from "../../../actions/push_notifications";
import { changeSetting } from "../../../actions/settings";
import ColumnSettings from "../components/column_settings";
const messages = defineMessages({
clearMessage: { id: 'notifications.clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all your notifications?' },
clearConfirm: { id: 'notifications.clear', defaultMessage: 'Clear notifications' },
permissionDenied: { id: 'notifications.permission_denied_alert', defaultMessage: 'Desktop notifications can\'t be enabled, as browser permission has been denied before' },
clearMessage: { id: "notifications.clear_confirmation", defaultMessage: "Are you sure you want to permanently clear all your notifications?" },
clearConfirm: { id: "notifications.clear", defaultMessage: "Clear notifications" },
permissionDenied: { id: "notifications.permission_denied_alert", defaultMessage: "Desktop notifications can't be enabled, as browser permission has been denied before" },
});
const mapStateToProps = state => ({
settings: state.getIn(['settings', 'notifications']),
pushSettings: state.get('push_notifications'),
alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
browserSupport: state.getIn(['notifications', 'browserSupport']),
browserPermission: state.getIn(['notifications', 'browserPermission']),
settings: state.getIn(["settings", "notifications"]),
pushSettings: state.get("push_notifications"),
alertsEnabled: state.getIn(["settings", "notifications", "alerts"]).includes(true),
browserSupport: state.getIn(["notifications", "browserSupport"]),
browserPermission: state.getIn(["notifications", "browserPermission"]),
});
const mapDispatchToProps = (dispatch, { intl }) => ({
onChange (path, checked) {
if (path[0] === 'push') {
if (checked && typeof window.Notification !== 'undefined' && Notification.permission !== 'granted') {
if (path[0] === "push") {
if (checked && typeof window.Notification !== "undefined" && Notification.permission !== "granted") {
dispatch(requestBrowserPermission((permission) => {
if (permission === 'granted') {
if (permission === "granted") {
dispatch(changePushNotifications(path.slice(1), checked));
} else {
dispatch(showAlert({ message: messages.permissionDenied }));
@@ -38,29 +38,29 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
} else {
dispatch(changePushNotifications(path.slice(1), checked));
}
} else if (path[0] === 'quickFilter') {
dispatch(changeSetting(['notifications', ...path], checked));
dispatch(setFilter('all'));
} else if (path[0] === 'alerts' && checked && typeof window.Notification !== 'undefined' && Notification.permission !== 'granted') {
if (checked && typeof window.Notification !== 'undefined' && Notification.permission !== 'granted') {
} else if (path[0] === "quickFilter") {
dispatch(changeSetting(["notifications", ...path], checked));
dispatch(setFilter("all"));
} else if (path[0] === "alerts" && checked && typeof window.Notification !== "undefined" && Notification.permission !== "granted") {
if (checked && typeof window.Notification !== "undefined" && Notification.permission !== "granted") {
dispatch(requestBrowserPermission((permission) => {
if (permission === 'granted') {
dispatch(changeSetting(['notifications', ...path], checked));
if (permission === "granted") {
dispatch(changeSetting(["notifications", ...path], checked));
} else {
dispatch(showAlert({ message: messages.permissionDenied }));
}
}));
} else {
dispatch(changeSetting(['notifications', ...path], checked));
dispatch(changeSetting(["notifications", ...path], checked));
}
} else {
dispatch(changeSetting(['notifications', ...path], checked));
dispatch(changeSetting(["notifications", ...path], checked));
}
},
onClear () {
dispatch(openModal({
modalType: 'CONFIRM',
modalType: "CONFIRM",
modalProps: {
message: intl.formatMessage(messages.clearMessage),
confirm: intl.formatMessage(messages.clearConfirm),