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/public_timeline/components/column_settings.jsx
+7 -7
View File
@@ -1,11 +1,11 @@
import PropTypes from 'prop-types';
import { PureComponent } from 'react';
import PropTypes from "prop-types";
import { PureComponent } from "react";
import { injectIntl, FormattedMessage } from 'react-intl';
import { injectIntl, FormattedMessage } from "react-intl";
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePropTypes from "react-immutable-proptypes";
import SettingToggle from '../../notifications/components/setting_toggle';
import SettingToggle from "../../notifications/components/setting_toggle";
class ColumnSettings extends PureComponent {
@@ -22,8 +22,8 @@ class ColumnSettings extends PureComponent {
return (
<div>
<div className='column-settings__row'>
<SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
<SettingToggle settings={settings} settingPath={['other', 'onlyRemote']} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
<SettingToggle settings={settings} settingPath={["other", "onlyMedia"]} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
<SettingToggle settings={settings} settingPath={["other", "onlyRemote"]} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
</div>
</div>
);
app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js
+8 -8
View File
@@ -1,16 +1,16 @@
import { connect } from 'react-redux';
import { connect } from "react-redux";
import { changeColumnParams } from '../../../actions/columns';
import { changeSetting } from '../../../actions/settings';
import ColumnSettings from '../components/column_settings';
import { changeColumnParams } from "../../../actions/columns";
import { changeSetting } from "../../../actions/settings";
import ColumnSettings from "../components/column_settings";
const mapStateToProps = (state, { columnId }) => {
const uuid = columnId;
const columns = state.getIn(['settings', 'columns']);
const index = columns.findIndex(c => c.get('uuid') === uuid);
const columns = state.getIn(["settings", "columns"]);
const index = columns.findIndex(c => c.get("uuid") === uuid);
return {
settings: (uuid && index >= 0) ? columns.get(index).get('params') : state.getIn(['settings', 'public']),
settings: (uuid && index >= 0) ? columns.get(index).get("params") : state.getIn(["settings", "public"]),
};
};
@@ -20,7 +20,7 @@ const mapDispatchToProps = (dispatch, { columnId }) => {
if (columnId) {
dispatch(changeColumnParams(columnId, key, checked));
} else {
dispatch(changeSetting(['public', ...key], checked));
dispatch(changeSetting(["public", ...key], checked));
}
},
};
app/javascript/mastodon/features/public_timeline/index.jsx
+23 -23
View File
@@ -1,38 +1,38 @@
import PropTypes from 'prop-types';
import { PureComponent } from 'react';
import PropTypes from "prop-types";
import { PureComponent } from "react";
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { defineMessages, injectIntl, FormattedMessage } from "react-intl";
import { Helmet } from 'react-helmet';
import { Helmet } from "react-helmet";
import { connect } from 'react-redux';
import { connect } from "react-redux";
import { DismissableBanner } from 'mastodon/components/dismissable_banner';
import { domain } from 'mastodon/initial_state';
import { DismissableBanner } from "mastodon/components/dismissable_banner";
import { domain } from "mastodon/initial_state";
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import { connectPublicStream } from '../../actions/streaming';
import { expandPublicTimeline } from '../../actions/timelines';
import Column from '../../components/column';
import ColumnHeader from '../../components/column_header';
import StatusListContainer from '../ui/containers/status_list_container';
import { addColumn, removeColumn, moveColumn } from "../../actions/columns";
import { connectPublicStream } from "../../actions/streaming";
import { expandPublicTimeline } from "../../actions/timelines";
import Column from "../../components/column";
import ColumnHeader from "../../components/column_header";
import StatusListContainer from "../ui/containers/status_list_container";
import ColumnSettingsContainer from './containers/column_settings_container';
import ColumnSettingsContainer from "./containers/column_settings_container";
const messages = defineMessages({
title: { id: 'column.public', defaultMessage: 'Federated timeline' },
title: { id: "column.public", defaultMessage: "Federated timeline" },
});
const mapStateToProps = (state, { columnId }) => {
const uuid = columnId;
const columns = state.getIn(['settings', 'columns']);
const index = columns.findIndex(c => c.get('uuid') === uuid);
const onlyMedia = (columnId && index >= 0) ? columns.get(index).getIn(['params', 'other', 'onlyMedia']) : state.getIn(['settings', 'public', 'other', 'onlyMedia']);
const onlyRemote = (columnId && index >= 0) ? columns.get(index).getIn(['params', 'other', 'onlyRemote']) : state.getIn(['settings', 'public', 'other', 'onlyRemote']);
const timelineState = state.getIn(['timelines', `public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`]);
const columns = state.getIn(["settings", "columns"]);
const index = columns.findIndex(c => c.get("uuid") === uuid);
const onlyMedia = (columnId && index >= 0) ? columns.get(index).getIn(["params", "other", "onlyMedia"]) : state.getIn(["settings", "public", "other", "onlyMedia"]);
const onlyRemote = (columnId && index >= 0) ? columns.get(index).getIn(["params", "other", "onlyRemote"]) : state.getIn(["settings", "public", "other", "onlyRemote"]);
const timelineState = state.getIn(["timelines", `public${onlyRemote ? ":remote" : ""}${onlyMedia ? ":media" : ""}`]);
return {
hasUnread: !!timelineState && timelineState.get('unread') > 0,
hasUnread: !!timelineState && timelineState.get("unread") > 0,
onlyMedia,
onlyRemote,
};
@@ -65,7 +65,7 @@ class PublicTimeline extends PureComponent {
if (columnId) {
dispatch(removeColumn(columnId));
} else {
dispatch(addColumn(onlyRemote ? 'REMOTE' : 'PUBLIC', { other: { onlyMedia, onlyRemote } }));
dispatch(addColumn(onlyRemote ? "REMOTE" : "PUBLIC", { other: { onlyMedia, onlyRemote } }));
}
};
@@ -145,7 +145,7 @@ class PublicTimeline extends PureComponent {
<StatusListContainer
prepend={<DismissableBanner id='public_timeline'><FormattedMessage id='dismissable_banner.public_timeline' defaultMessage='These are the most recent public posts from people on the social web that people on {domain} follow.' values={{ domain }} /></DismissableBanner>}
timelineId={`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`}
timelineId={`public${onlyRemote ? ":remote" : ""}${onlyMedia ? ":media" : ""}`}
onLoadMore={this.handleLoadMore}
trackScroll={!pinned}
scrollKey={`public_timeline-${columnId}`}