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/direct_timeline/components/conversation.jsx
+33 -33
View File
@@ -1,31 +1,31 @@
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 { Link } from 'react-router-dom';
import classNames from "classnames";
import { Link } from "react-router-dom";
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 { HotKeys } from 'react-hotkeys';
import { HotKeys } from "react-hotkeys";
import AttachmentList from 'mastodon/components/attachment_list';
import AvatarComposite from 'mastodon/components/avatar_composite';
import { IconButton } from 'mastodon/components/icon_button';
import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
import StatusContent from 'mastodon/components/status_content';
import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
import { autoPlayGif } from 'mastodon/initial_state';
import AttachmentList from "mastodon/components/attachment_list";
import AvatarComposite from "mastodon/components/avatar_composite";
import { IconButton } from "mastodon/components/icon_button";
import { RelativeTimestamp } from "mastodon/components/relative_timestamp";
import StatusContent from "mastodon/components/status_content";
import DropdownMenuContainer from "mastodon/containers/dropdown_menu_container";
import { autoPlayGif } from "mastodon/initial_state";
const messages = defineMessages({
more: { id: 'status.more', defaultMessage: 'More' },
open: { id: 'conversation.open', defaultMessage: 'View conversation' },
reply: { id: 'status.reply', defaultMessage: 'Reply' },
markAsRead: { id: 'conversation.mark_as_read', defaultMessage: 'Mark as read' },
delete: { id: 'conversation.delete', defaultMessage: 'Delete conversation' },
muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
more: { id: "status.more", defaultMessage: "More" },
open: { id: "conversation.open", defaultMessage: "View conversation" },
reply: { id: "status.reply", defaultMessage: "Reply" },
markAsRead: { id: "conversation.mark_as_read", defaultMessage: "Mark as read" },
delete: { id: "conversation.delete", defaultMessage: "Delete conversation" },
muteConversation: { id: "status.mute_conversation", defaultMessage: "Mute conversation" },
unmuteConversation: { id: "status.unmute_conversation", defaultMessage: "Unmute conversation" },
});
class Conversation extends ImmutablePureComponent {
@@ -52,11 +52,11 @@ class Conversation extends ImmutablePureComponent {
return;
}
const emojis = currentTarget.querySelectorAll('.custom-emoji');
const emojis = currentTarget.querySelectorAll(".custom-emoji");
for (var i = 0; i < emojis.length; i++) {
let emoji = emojis[i];
emoji.src = emoji.getAttribute('data-original');
emoji.src = emoji.getAttribute("data-original");
}
};
@@ -65,11 +65,11 @@ class Conversation extends ImmutablePureComponent {
return;
}
const emojis = currentTarget.querySelectorAll('.custom-emoji');
const emojis = currentTarget.querySelectorAll(".custom-emoji");
for (var i = 0; i < emojis.length; i++) {
let emoji = emojis[i];
emoji.src = emoji.getAttribute('data-static');
emoji.src = emoji.getAttribute("data-static");
}
};
@@ -84,7 +84,7 @@ class Conversation extends ImmutablePureComponent {
markRead();
}
this.context.router.history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
this.context.router.history.push(`/@${lastStatus.getIn(["account", "acct"])}/${lastStatus.get("id")}`);
};
handleMarkAsRead = () => {
@@ -127,7 +127,7 @@ class Conversation extends ImmutablePureComponent {
null,
];
menu.push({ text: intl.formatMessage(lastStatus.get('muted') ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMute });
menu.push({ text: intl.formatMessage(lastStatus.get("muted") ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMute });
if (unread) {
menu.push({ text: intl.formatMessage(messages.markAsRead), action: this.handleMarkAsRead });
@@ -136,7 +136,7 @@ class Conversation extends ImmutablePureComponent {
menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDelete });
const names = accounts.map(a => <Link to={`/@${a.get('acct')}`} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Link>).reduce((prev, cur) => [prev, ', ', cur]);
const names = accounts.map(a => <Link to={`/@${a.get("acct")}`} key={a.get("id")} title={a.get("acct")}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get("display_name_html") }} /></bdi></Link>).reduce((prev, cur) => [prev, ", ", cur]);
const handlers = {
reply: this.handleReply,
@@ -148,7 +148,7 @@ class Conversation extends ImmutablePureComponent {
return (
<HotKeys handlers={handlers}>
<div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex={0}>
<div className={classNames("conversation focusable muted", { "conversation--unread": unread })} tabIndex={0}>
<div className='conversation__avatar' onClick={this.handleClick} role='presentation'>
<AvatarComposite accounts={accounts} size={48} />
</div>
@@ -156,7 +156,7 @@ class Conversation extends ImmutablePureComponent {
<div className='conversation__content'>
<div className='conversation__content__info'>
<div className='conversation__content__relative-time'>
{unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
{unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get("created_at")} />
</div>
<div className='conversation__content__names' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
@@ -167,15 +167,15 @@ class Conversation extends ImmutablePureComponent {
<StatusContent
status={lastStatus}
onClick={this.handleClick}
expanded={!lastStatus.get('hidden')}
expanded={!lastStatus.get("hidden")}
onExpandedToggle={this.handleShowMore}
collapsible
/>
{lastStatus.get('media_attachments').size > 0 && (
{lastStatus.get("media_attachments").size > 0 && (
<AttachmentList
compact
media={lastStatus.get('media_attachments')}
media={lastStatus.get("media_attachments")}
/>
)}
app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
+11 -11
View File
@@ -1,12 +1,12 @@
import PropTypes from 'prop-types';
import PropTypes from "prop-types";
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 { debounce } from 'lodash';
import { debounce } from "lodash";
import ScrollableList from '../../../components/scrollable_list';
import ConversationContainer from '../containers/conversation_container';
import ScrollableList from "../../../components/scrollable_list";
import ConversationContainer from "../containers/conversation_container";
export default class ConversationsList extends ImmutablePureComponent {
@@ -18,7 +18,7 @@ export default class ConversationsList extends ImmutablePureComponent {
onLoadMore: PropTypes.func,
};
getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id);
getCurrentIndex = id => this.props.conversations.findIndex(x => x.get("id") === id);
handleMoveUp = id => {
const elementIndex = this.getCurrentIndex(id) - 1;
@@ -51,8 +51,8 @@ export default class ConversationsList extends ImmutablePureComponent {
handleLoadOlder = debounce(() => {
const last = this.props.conversations.last();
if (last && last.get('last_status')) {
this.props.onLoadMore(last.get('last_status'));
if (last && last.get("last_status")) {
this.props.onLoadMore(last.get("last_status"));
}
}, 300, { leading: true });
@@ -63,8 +63,8 @@ export default class ConversationsList extends ImmutablePureComponent {
<ScrollableList {...other} isLoading={isLoading} showLoading={isLoading && conversations.isEmpty()} onLoadMore={onLoadMore && this.handleLoadOlder} ref={this.setRef}>
{conversations.map(item => (
<ConversationContainer
key={item.get('id')}
conversationId={item.get('id')}
key={item.get("id")}
conversationId={item.get("id")}
onMoveUp={this.handleMoveUp}
onMoveDown={this.handleMoveDown}
scrollKey={this.props.scrollKey}
app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
+22 -22
View File
@@ -1,30 +1,30 @@
import { defineMessages, injectIntl } from 'react-intl';
import { defineMessages, injectIntl } from "react-intl";
import { connect } from 'react-redux';
import { connect } from "react-redux";
import { replyCompose } from 'mastodon/actions/compose';
import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
import { openModal } from 'mastodon/actions/modal';
import { muteStatus, unmuteStatus, hideStatus, revealStatus } from 'mastodon/actions/statuses';
import { makeGetStatus } from 'mastodon/selectors';
import { replyCompose } from "mastodon/actions/compose";
import { markConversationRead, deleteConversation } from "mastodon/actions/conversations";
import { openModal } from "mastodon/actions/modal";
import { muteStatus, unmuteStatus, hideStatus, revealStatus } from "mastodon/actions/statuses";
import { makeGetStatus } from "mastodon/selectors";
import Conversation from '../components/conversation';
import Conversation from "../components/conversation";
const messages = defineMessages({
replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
replyConfirm: { id: "confirmations.reply.confirm", defaultMessage: "Reply" },
replyMessage: { id: "confirmations.reply.message", defaultMessage: "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?" },
});
const mapStateToProps = () => {
const getStatus = makeGetStatus();
return (state, { conversationId }) => {
const conversation = state.getIn(['conversations', 'items']).find(x => x.get('id') === conversationId);
const lastStatusId = conversation.get('last_status', null);
const conversation = state.getIn(["conversations", "items"]).find(x => x.get("id") === conversationId);
const lastStatusId = conversation.get("last_status", null);
return {
accounts: conversation.get('accounts').map(accountId => state.getIn(['accounts', accountId], null)),
unread: conversation.get('unread'),
accounts: conversation.get("accounts").map(accountId => state.getIn(["accounts", accountId], null)),
unread: conversation.get("unread"),
lastStatus: lastStatusId && getStatus(state, { id: lastStatusId }),
};
};
@@ -40,9 +40,9 @@ const mapDispatchToProps = (dispatch, { intl, conversationId }) => ({
dispatch((_, getState) => {
let state = getState();
if (state.getIn(['compose', 'text']).trim().length !== 0) {
if (state.getIn(["compose", "text"]).trim().length !== 0) {
dispatch(openModal({
modalType: 'CONFIRM',
modalType: "CONFIRM",
modalProps: {
message: intl.formatMessage(messages.replyMessage),
confirm: intl.formatMessage(messages.replyConfirm),
@@ -60,18 +60,18 @@ const mapDispatchToProps = (dispatch, { intl, conversationId }) => ({
},
onMute (status) {
if (status.get('muted')) {
dispatch(unmuteStatus(status.get('id')));
if (status.get("muted")) {
dispatch(unmuteStatus(status.get("id")));
} else {
dispatch(muteStatus(status.get('id')));
dispatch(muteStatus(status.get("id")));
}
},
onToggleHidden (status) {
if (status.get('hidden')) {
dispatch(revealStatus(status.get('id')));
if (status.get("hidden")) {
dispatch(revealStatus(status.get("id")));
} else {
dispatch(hideStatus(status.get('id')));
dispatch(hideStatus(status.get("id")));
}
},
app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
+6 -6
View File
@@ -1,12 +1,12 @@
import { connect } from 'react-redux';
import { connect } from "react-redux";
import { expandConversations } from '../../../actions/conversations';
import ConversationsList from '../components/conversations_list';
import { expandConversations } from "../../../actions/conversations";
import ConversationsList from "../components/conversations_list";
const mapStateToProps = state => ({
conversations: state.getIn(['conversations', 'items']),
isLoading: state.getIn(['conversations', 'isLoading'], true),
hasMore: state.getIn(['conversations', 'hasMore'], false),
conversations: state.getIn(["conversations", "items"]),
isLoading: state.getIn(["conversations", "isLoading"], true),
hasMore: state.getIn(["conversations", "hasMore"], false),
});
const mapDispatchToProps = dispatch => ({
app/javascript/mastodon/features/direct_timeline/index.jsx
+13 -13
View File
@@ -1,22 +1,22 @@
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 { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { mountConversations, unmountConversations, expandConversations } from 'mastodon/actions/conversations';
import { connectDirectStream } from 'mastodon/actions/streaming';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';
import { addColumn, removeColumn, moveColumn } from "mastodon/actions/columns";
import { mountConversations, unmountConversations, expandConversations } from "mastodon/actions/conversations";
import { connectDirectStream } from "mastodon/actions/streaming";
import Column from "mastodon/components/column";
import ColumnHeader from "mastodon/components/column_header";
import ConversationsListContainer from './containers/conversations_list_container';
import ConversationsListContainer from "./containers/conversations_list_container";
const messages = defineMessages({
title: { id: 'column.direct', defaultMessage: 'Private mentions' },
title: { id: "column.direct", defaultMessage: "Private mentions" },
});
class DirectTimeline extends PureComponent {
@@ -35,7 +35,7 @@ class DirectTimeline extends PureComponent {
if (columnId) {
dispatch(removeColumn(columnId));
} else {
dispatch(addColumn('DIRECT', {}));
dispatch(addColumn("DIRECT", {}));
}
};