[build] upgrade eslint to 9.37.0 (#88)
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:
@@ -1,28 +1,28 @@
|
||||
import PropTypes from 'prop-types';
|
||||
import PropTypes from "prop-types";
|
||||
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import { FormattedMessage } from "react-intl";
|
||||
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
import ImmutablePropTypes from "react-immutable-proptypes";
|
||||
import ImmutablePureComponent from "react-immutable-pure-component";
|
||||
import { connect } from "react-redux";
|
||||
|
||||
import { lookupAccount, fetchAccount } from 'flavours/glitch/actions/accounts';
|
||||
import { openModal } from 'flavours/glitch/actions/modal';
|
||||
import { expandAccountMediaTimeline } from 'flavours/glitch/actions/timelines';
|
||||
import { LoadMore } from 'flavours/glitch/components/load_more';
|
||||
import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
|
||||
import ScrollContainer from 'flavours/glitch/containers/scroll_container';
|
||||
import ProfileColumnHeader from 'flavours/glitch/features/account/components/profile_column_header';
|
||||
import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
|
||||
import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
|
||||
import Column from 'flavours/glitch/features/ui/components/column';
|
||||
import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
|
||||
import { getAccountGallery } from 'flavours/glitch/selectors';
|
||||
import { lookupAccount, fetchAccount } from "flavours/glitch/actions/accounts";
|
||||
import { openModal } from "flavours/glitch/actions/modal";
|
||||
import { expandAccountMediaTimeline } from "flavours/glitch/actions/timelines";
|
||||
import { LoadMore } from "flavours/glitch/components/load_more";
|
||||
import { LoadingIndicator } from "flavours/glitch/components/loading_indicator";
|
||||
import ScrollContainer from "flavours/glitch/containers/scroll_container";
|
||||
import ProfileColumnHeader from "flavours/glitch/features/account/components/profile_column_header";
|
||||
import HeaderContainer from "flavours/glitch/features/account_timeline/containers/header_container";
|
||||
import BundleColumnError from "flavours/glitch/features/ui/components/bundle_column_error";
|
||||
import Column from "flavours/glitch/features/ui/components/column";
|
||||
import { normalizeForLookup } from "flavours/glitch/reducers/accounts_map";
|
||||
import { getAccountGallery } from "flavours/glitch/selectors";
|
||||
|
||||
import MediaItem from './components/media_item';
|
||||
import MediaItem from "./components/media_item";
|
||||
|
||||
const mapStateToProps = (state, { params: { acct, id } }) => {
|
||||
const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
|
||||
const accountId = id || state.getIn(["accounts_map", normalizeForLookup(acct)]);
|
||||
|
||||
if (!accountId) {
|
||||
return {
|
||||
@@ -32,12 +32,12 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
|
||||
|
||||
return {
|
||||
accountId,
|
||||
settings: state.get('local_settings'),
|
||||
isAccount: !!state.getIn(['accounts', accountId]),
|
||||
settings: state.get("local_settings"),
|
||||
isAccount: !!state.getIn(["accounts", accountId]),
|
||||
attachments: getAccountGallery(state, accountId),
|
||||
isLoading: state.getIn(['timelines', `account:${accountId}:media`, 'isLoading']),
|
||||
hasMore: state.getIn(['timelines', `account:${accountId}:media`, 'hasMore']),
|
||||
suspended: state.getIn(['accounts', accountId, 'suspended'], false),
|
||||
isLoading: state.getIn(["timelines", `account:${accountId}:media`, "isLoading"]),
|
||||
hasMore: state.getIn(["timelines", `account:${accountId}:media`, "hasMore"]),
|
||||
suspended: state.getIn(["accounts", accountId, "suspended"], false),
|
||||
};
|
||||
};
|
||||
|
||||
@@ -88,7 +88,9 @@ class AccountGallery extends ImmutablePureComponent {
|
||||
_load () {
|
||||
const { accountId, isAccount, dispatch } = this.props;
|
||||
|
||||
if (!isAccount) dispatch(fetchAccount(accountId));
|
||||
if (!isAccount) {
|
||||
dispatch(fetchAccount(accountId));
|
||||
}
|
||||
dispatch(expandAccountMediaTimeline(accountId));
|
||||
}
|
||||
|
||||
@@ -118,7 +120,7 @@ class AccountGallery extends ImmutablePureComponent {
|
||||
|
||||
handleScrollToBottom = () => {
|
||||
if (this.props.hasMore) {
|
||||
this.handleLoadMore(this.props.attachments.size > 0 ? this.props.attachments.last().getIn(['status', 'id']) : undefined);
|
||||
this.handleLoadMore(this.props.attachments.size > 0 ? this.props.attachments.last().getIn(["status", "id"]) : undefined);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -146,25 +148,25 @@ class AccountGallery extends ImmutablePureComponent {
|
||||
|
||||
handleOpenMedia = attachment => {
|
||||
const { dispatch } = this.props;
|
||||
const statusId = attachment.getIn(['status', 'id']);
|
||||
const lang = attachment.getIn(['status', 'language']);
|
||||
const statusId = attachment.getIn(["status", "id"]);
|
||||
const lang = attachment.getIn(["status", "language"]);
|
||||
|
||||
if (attachment.get('type') === 'video') {
|
||||
if (attachment.get("type") === "video") {
|
||||
dispatch(openModal({
|
||||
modalType: 'VIDEO',
|
||||
modalType: "VIDEO",
|
||||
modalProps: { media: attachment, statusId, lang, options: { autoPlay: true } },
|
||||
}));
|
||||
} else if (attachment.get('type') === 'audio') {
|
||||
} else if (attachment.get("type") === "audio") {
|
||||
dispatch(openModal({
|
||||
modalType: 'AUDIO',
|
||||
modalType: "AUDIO",
|
||||
modalProps: { media: attachment, statusId, lang, options: { autoPlay: true } },
|
||||
}));
|
||||
} else {
|
||||
const media = attachment.getIn(['status', 'media_attachments']);
|
||||
const index = media.findIndex(x => x.get('id') === attachment.get('id'));
|
||||
const media = attachment.getIn(["status", "media_attachments"]);
|
||||
const index = media.findIndex(x => x.get("id") === attachment.get("id"));
|
||||
|
||||
dispatch(openModal({
|
||||
modalType: 'MEDIA',
|
||||
modalType: "MEDIA",
|
||||
modalProps: { media, index, statusId, lang },
|
||||
}));
|
||||
}
|
||||
@@ -215,14 +217,14 @@ class AccountGallery extends ImmutablePureComponent {
|
||||
) : (
|
||||
<div role='feed' className='account-gallery__container' ref={this.handleRef}>
|
||||
{attachments.map((attachment, index) => attachment === null ? (
|
||||
<LoadMoreMedia key={'more:' + attachments.getIn(index + 1, 'id')} maxId={index > 0 ? attachments.getIn(index - 1, 'id') : null} onLoadMore={this.handleLoadMore} />
|
||||
<LoadMoreMedia key={"more:" + attachments.getIn(index + 1, "id")} maxId={index > 0 ? attachments.getIn(index - 1, "id") : null} onLoadMore={this.handleLoadMore} />
|
||||
) : (
|
||||
<MediaItem
|
||||
key={attachment.get('id')}
|
||||
key={attachment.get("id")}
|
||||
attachment={attachment}
|
||||
displayWidth={width}
|
||||
onOpenMedia={this.handleOpenMedia}
|
||||
useBlurhash={settings.getIn(['media', 'use_blurhash'])}
|
||||
useBlurhash={settings.getIn(["media", "use_blurhash"])}
|
||||
/>
|
||||
))}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user