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/components/poll.jsx
+45 -45
View File
@@ -1,38 +1,38 @@
import PropTypes from 'prop-types';
import PropTypes from "prop-types";
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { defineMessages, injectIntl, FormattedMessage } from "react-intl";
import classNames from 'classnames';
import classNames from "classnames";
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import ImmutablePropTypes from "react-immutable-proptypes";
import ImmutablePureComponent from "react-immutable-pure-component";
import escapeTextContentForBrowser from 'escape-html';
import spring from 'react-motion/lib/spring';
import escapeTextContentForBrowser from "escape-html";
import spring from "react-motion/lib/spring";
import { Icon } from 'mastodon/components/icon';
import emojify from 'mastodon/features/emoji/emoji';
import Motion from 'mastodon/features/ui/util/optional_motion';
import { Icon } from "mastodon/components/icon";
import emojify from "mastodon/features/emoji/emoji";
import Motion from "mastodon/features/ui/util/optional_motion";
import { RelativeTimestamp } from './relative_timestamp';
import { RelativeTimestamp } from "./relative_timestamp";
const messages = defineMessages({
closed: {
id: 'poll.closed',
defaultMessage: 'Closed',
id: "poll.closed",
defaultMessage: "Closed",
},
voted: {
id: 'poll.voted',
defaultMessage: 'You voted for this answer',
id: "poll.voted",
defaultMessage: "You voted for this answer",
},
votes: {
id: 'poll.votes',
defaultMessage: '{votes, plural, one {# vote} other {# votes}}',
id: "poll.votes",
defaultMessage: "{votes, plural, one {# vote} other {# votes}}",
},
});
const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
obj[`:${emoji.get('shortcode')}:`] = emoji.toJS();
const makeEmojiMap = record => record.get("emojis").reduce((obj, emoji) => {
obj[`:${emoji.get("shortcode")}:`] = emoji.toJS();
return obj;
}, {});
@@ -58,8 +58,8 @@ class Poll extends ImmutablePureComponent {
static getDerivedStateFromProps (props, state) {
const { poll } = props;
const expires_at = poll.get('expires_at');
const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < Date.now();
const expires_at = poll.get("expires_at");
const expired = poll.get("expired") || expires_at !== null && (new Date(expires_at)).getTime() < Date.now();
return (expired === state.expired) ? null : { expired };
}
@@ -79,7 +79,7 @@ class Poll extends ImmutablePureComponent {
const { poll } = this.props;
clearTimeout(this._timer);
if (!this.state.expired) {
const delay = (new Date(poll.get('expires_at'))).getTime() - Date.now();
const delay = (new Date(poll.get("expires_at"))).getTime() - Date.now();
this._timer = setTimeout(() => {
this.setState({ expired: true });
}, delay);
@@ -87,7 +87,7 @@ class Poll extends ImmutablePureComponent {
}
_toggleOption = value => {
if (this.props.poll.get('multiple')) {
if (this.props.poll.get("multiple")) {
const tmp = { ...this.state.selected };
if (tmp[value]) {
delete tmp[value];
@@ -107,8 +107,8 @@ class Poll extends ImmutablePureComponent {
};
handleOptionKeyPress = (e) => {
if (e.key === 'Enter' || e.key === ' ') {
this._toggleOption(e.target.getAttribute('data-index'));
if (e.key === "Enter" || e.key === " ") {
this._toggleOption(e.target.getAttribute("data-index"));
e.stopPropagation();
e.preventDefault();
}
@@ -136,14 +136,14 @@ class Poll extends ImmutablePureComponent {
renderOption (option, optionIndex, showResults) {
const { poll, lang, disabled, intl } = this.props;
const pollVotesCount = poll.get('voters_count') || poll.get('votes_count');
const percent = pollVotesCount === 0 ? 0 : (option.get('votes_count') / pollVotesCount) * 100;
const leading = poll.get('options').filterNot(other => other.get('title') === option.get('title')).every(other => option.get('votes_count') >= other.get('votes_count'));
const pollVotesCount = poll.get("voters_count") || poll.get("votes_count");
const percent = pollVotesCount === 0 ? 0 : (option.get("votes_count") / pollVotesCount) * 100;
const leading = poll.get("options").filterNot(other => other.get("title") === option.get("title")).every(other => option.get("votes_count") >= other.get("votes_count"));
const active = !!this.state.selected[`${optionIndex}`];
const voted = option.get('voted') || (poll.get('own_votes') && poll.get('own_votes').includes(optionIndex));
const voted = option.get("voted") || (poll.get("own_votes") && poll.get("own_votes").includes(optionIndex));
const title = option.getIn(['translation', 'title']) || option.get('title');
let titleHtml = option.getIn(['translation', 'titleHtml']) || option.get('titleHtml');
const title = option.getIn(["translation", "title"]) || option.get("title");
let titleHtml = option.getIn(["translation", "titleHtml"]) || option.get("titleHtml");
if (!titleHtml) {
const emojiMap = makeEmojiMap(poll);
@@ -151,11 +151,11 @@ class Poll extends ImmutablePureComponent {
}
return (
<li key={option.get('title')}>
<label className={classNames('poll__option', { selectable: !showResults })}>
<li key={option.get("title")}>
<label className={classNames("poll__option", { selectable: !showResults })}>
<input
name='vote-options'
type={poll.get('multiple') ? 'checkbox' : 'radio'}
type={poll.get("multiple") ? "checkbox" : "radio"}
value={optionIndex}
checked={active}
onChange={this.handleOptionChange}
@@ -164,9 +164,9 @@ class Poll extends ImmutablePureComponent {
{!showResults && (
<span
className={classNames('poll__input', { checkbox: poll.get('multiple'), active })}
className={classNames("poll__input", { checkbox: poll.get("multiple"), active })}
tabIndex={0}
role={poll.get('multiple') ? 'checkbox' : 'radio'}
role={poll.get("multiple") ? "checkbox" : "radio"}
onKeyPress={this.handleOptionKeyPress}
aria-checked={active}
aria-label={title}
@@ -178,7 +178,7 @@ class Poll extends ImmutablePureComponent {
<span
className='poll__number'
title={intl.formatMessage(messages.votes, {
votes: option.get('votes_count'),
votes: option.get("votes_count"),
})}
>
{Math.round(percent)}%
@@ -199,7 +199,7 @@ class Poll extends ImmutablePureComponent {
{showResults && (
<Motion defaultStyle={{ width: 0 }} style={{ width: spring(percent, { stiffness: 180, damping: 12 }) }}>
{({ width }) =>
<span className={classNames('poll__chart', { leading })} style={{ width: `${width}%` }} />
<span className={classNames("poll__chart", { leading })} style={{ width: `${width}%` }} />
}
</Motion>
)}
@@ -215,22 +215,22 @@ class Poll extends ImmutablePureComponent {
return null;
}
const timeRemaining = expired ? intl.formatMessage(messages.closed) : <RelativeTimestamp timestamp={poll.get('expires_at')} futureDate />;
const showResults = poll.get('voted') || revealed || expired;
const timeRemaining = expired ? intl.formatMessage(messages.closed) : <RelativeTimestamp timestamp={poll.get("expires_at")} futureDate />;
const showResults = poll.get("voted") || revealed || expired;
const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item);
let votesCount = null;
if (poll.get('voters_count') !== null && poll.get('voters_count') !== undefined) {
votesCount = <FormattedMessage id='poll.total_people' defaultMessage='{count, plural, one {# person} other {# people}}' values={{ count: poll.get('voters_count') }} />;
if (poll.get("voters_count") !== null && poll.get("voters_count") !== undefined) {
votesCount = <FormattedMessage id='poll.total_people' defaultMessage='{count, plural, one {# person} other {# people}}' values={{ count: poll.get("voters_count") }} />;
} else {
votesCount = <FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.get('votes_count') }} />;
votesCount = <FormattedMessage id='poll.total_votes' defaultMessage='{count, plural, one {# vote} other {# votes}}' values={{ count: poll.get("votes_count") }} />;
}
return (
<div className='poll'>
<ul>
{poll.get('options').map((option, i) => this.renderOption(option, i, showResults))}
{poll.get("options").map((option, i) => this.renderOption(option, i, showResults))}
</ul>
<div className='poll__footer'>
@@ -238,7 +238,7 @@ class Poll extends ImmutablePureComponent {
{!showResults && <><button className='poll__link' onClick={this.handleReveal}><FormattedMessage id='poll.reveal' defaultMessage='See results' /></button> · </>}
{showResults && !this.props.disabled && <><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </>}
{votesCount}
{poll.get('expires_at') && <> · {timeRemaining}</>}
{poll.get("expires_at") && <> · {timeRemaining}</>}
</div>
</div>
);