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/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 => ({