[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,17 +1,17 @@
|
||||
import { defineMessages, injectIntl } from 'react-intl';
|
||||
import { defineMessages, injectIntl } from "react-intl";
|
||||
|
||||
import { connect } from 'react-redux';
|
||||
import { connect } from "react-redux";
|
||||
|
||||
import { initBlockModal } from 'flavours/glitch/actions/blocks';
|
||||
import { initBoostModal } from 'flavours/glitch/actions/boosts';
|
||||
import { initBlockModal } from "flavours/glitch/actions/blocks";
|
||||
import { initBoostModal } from "flavours/glitch/actions/boosts";
|
||||
import {
|
||||
replyCompose,
|
||||
mentionCompose,
|
||||
directCompose,
|
||||
} from 'flavours/glitch/actions/compose';
|
||||
} from "flavours/glitch/actions/compose";
|
||||
import {
|
||||
initAddFilter,
|
||||
} from 'flavours/glitch/actions/filters';
|
||||
} from "flavours/glitch/actions/filters";
|
||||
import {
|
||||
reblog,
|
||||
favourite,
|
||||
@@ -21,12 +21,12 @@ import {
|
||||
unbookmark,
|
||||
pin,
|
||||
unpin,
|
||||
} from 'flavours/glitch/actions/interactions';
|
||||
import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
|
||||
import { openModal } from 'flavours/glitch/actions/modal';
|
||||
import { initMuteModal } from 'flavours/glitch/actions/mutes';
|
||||
import { deployPictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
|
||||
import { initReport } from 'flavours/glitch/actions/reports';
|
||||
} from "flavours/glitch/actions/interactions";
|
||||
import { changeLocalSetting } from "flavours/glitch/actions/local_settings";
|
||||
import { openModal } from "flavours/glitch/actions/modal";
|
||||
import { initMuteModal } from "flavours/glitch/actions/mutes";
|
||||
import { deployPictureInPicture } from "flavours/glitch/actions/picture_in_picture";
|
||||
import { initReport } from "flavours/glitch/actions/reports";
|
||||
import {
|
||||
muteStatus,
|
||||
unmuteStatus,
|
||||
@@ -36,26 +36,26 @@ import {
|
||||
editStatus,
|
||||
translateStatus,
|
||||
undoStatusTranslation,
|
||||
} from 'flavours/glitch/actions/statuses';
|
||||
import Status from 'flavours/glitch/components/status';
|
||||
import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
|
||||
import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
|
||||
} from "flavours/glitch/actions/statuses";
|
||||
import Status from "flavours/glitch/components/status";
|
||||
import { boostModal, favouriteModal, deleteModal } from "flavours/glitch/initial_state";
|
||||
import { makeGetStatus, makeGetPictureInPicture } from "flavours/glitch/selectors";
|
||||
|
||||
import { showAlertForError } from '../actions/alerts';
|
||||
import { showAlertForError } from "../actions/alerts";
|
||||
|
||||
const messages = defineMessages({
|
||||
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
|
||||
deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
|
||||
redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
|
||||
redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
|
||||
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?' },
|
||||
editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
|
||||
editMessage: { id: 'confirmations.edit.message', defaultMessage: 'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
|
||||
unfilterConfirm: { id: 'confirmations.unfilter.confirm', defaultMessage: 'Show' },
|
||||
author: { id: 'confirmations.unfilter.author', defaultMessage: 'Author' },
|
||||
matchingFilters: { id: 'confirmations.unfilter.filters', defaultMessage: 'Matching {count, plural, one {filter} other {filters}}' },
|
||||
editFilter: { id: 'confirmations.unfilter.edit_filter', defaultMessage: 'Edit filter' },
|
||||
deleteConfirm: { id: "confirmations.delete.confirm", defaultMessage: "Delete" },
|
||||
deleteMessage: { id: "confirmations.delete.message", defaultMessage: "Are you sure you want to delete this status?" },
|
||||
redraftConfirm: { id: "confirmations.redraft.confirm", defaultMessage: "Delete & redraft" },
|
||||
redraftMessage: { id: "confirmations.redraft.message", defaultMessage: "Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned." },
|
||||
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?" },
|
||||
editConfirm: { id: "confirmations.edit.confirm", defaultMessage: "Edit" },
|
||||
editMessage: { id: "confirmations.edit.message", defaultMessage: "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?" },
|
||||
unfilterConfirm: { id: "confirmations.unfilter.confirm", defaultMessage: "Show" },
|
||||
author: { id: "confirmations.unfilter.author", defaultMessage: "Author" },
|
||||
matchingFilters: { id: "confirmations.unfilter.filters", defaultMessage: "Matching {count, plural, one {filter} other {filters}}" },
|
||||
editFilter: { id: "confirmations.unfilter.edit_filter", defaultMessage: "Edit filter" },
|
||||
});
|
||||
|
||||
const makeMapStateToProps = () => {
|
||||
@@ -65,25 +65,25 @@ const makeMapStateToProps = () => {
|
||||
const mapStateToProps = (state, props) => {
|
||||
|
||||
let status = getStatus(state, props);
|
||||
let reblogStatus = status ? status.get('reblog', null) : null;
|
||||
let reblogStatus = status ? status.get("reblog", null) : null;
|
||||
let account = undefined;
|
||||
let prepend = undefined;
|
||||
|
||||
if (props.featured && status) {
|
||||
account = status.get('account');
|
||||
prepend = 'featured';
|
||||
} else if (reblogStatus !== null && typeof reblogStatus === 'object') {
|
||||
account = status.get('account');
|
||||
account = status.get("account");
|
||||
prepend = "featured";
|
||||
} else if (reblogStatus !== null && typeof reblogStatus === "object") {
|
||||
account = status.get("account");
|
||||
status = reblogStatus;
|
||||
prepend = 'reblogged_by';
|
||||
prepend = "reblogged_by";
|
||||
}
|
||||
|
||||
return {
|
||||
containerId: props.containerId || props.id, // Should match reblogStatus's id for reblogs
|
||||
status: status,
|
||||
nextInReplyToId: props.nextId ? state.getIn(['statuses', props.nextId, 'in_reply_to_id']) : null,
|
||||
nextInReplyToId: props.nextId ? state.getIn(["statuses", props.nextId, "in_reply_to_id"]) : null,
|
||||
account: account || props.account,
|
||||
settings: state.get('local_settings'),
|
||||
settings: state.get("local_settings"),
|
||||
prepend: prepend || props.prepend,
|
||||
pictureInPicture: getPictureInPicture(state, props),
|
||||
};
|
||||
@@ -98,13 +98,13 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
dispatch((_, getState) => {
|
||||
let state = getState();
|
||||
|
||||
if (state.getIn(['local_settings', 'confirm_before_clearing_draft']) && state.getIn(['compose', 'text']).trim().length !== 0) {
|
||||
if (state.getIn(["local_settings", "confirm_before_clearing_draft"]) && state.getIn(["compose", "text"]).trim().length !== 0) {
|
||||
dispatch(openModal({
|
||||
modalType: 'CONFIRM',
|
||||
modalType: "CONFIRM",
|
||||
modalProps: {
|
||||
message: intl.formatMessage(messages.replyMessage),
|
||||
confirm: intl.formatMessage(messages.replyConfirm),
|
||||
onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
|
||||
onDoNotAsk: () => dispatch(changeLocalSetting(["confirm_before_clearing_draft"], false)),
|
||||
onConfirm: () => dispatch(replyCompose(status, router)),
|
||||
},
|
||||
}));
|
||||
@@ -115,7 +115,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
},
|
||||
|
||||
onModalReblog (status, privacy) {
|
||||
if (status.get('reblogged')) {
|
||||
if (status.get("reblogged")) {
|
||||
dispatch(unreblog(status));
|
||||
} else {
|
||||
dispatch(reblog(status, privacy));
|
||||
@@ -125,7 +125,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
onReblog (status, e) {
|
||||
dispatch((_, getState) => {
|
||||
let state = getState();
|
||||
if (state.getIn(['local_settings', 'confirm_boost_missing_media_description']) && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
|
||||
if (state.getIn(["local_settings", "confirm_boost_missing_media_description"]) && status.get("media_attachments").some(item => !item.get("description")) && !status.get("reblogged")) {
|
||||
dispatch(initBoostModal({ status, onReblog: this.onModalReblog, missingMediaDescription: true }));
|
||||
} else if (e.shiftKey || !boostModal) {
|
||||
this.onModalReblog(status);
|
||||
@@ -136,7 +136,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
},
|
||||
|
||||
onBookmark (status) {
|
||||
if (status.get('bookmarked')) {
|
||||
if (status.get("bookmarked")) {
|
||||
dispatch(unbookmark(status));
|
||||
} else {
|
||||
dispatch(bookmark(status));
|
||||
@@ -148,14 +148,14 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
},
|
||||
|
||||
onFavourite (status, e) {
|
||||
if (status.get('favourited')) {
|
||||
if (status.get("favourited")) {
|
||||
dispatch(unfavourite(status));
|
||||
} else {
|
||||
if (e.shiftKey || !favouriteModal) {
|
||||
this.onModalFavourite(status);
|
||||
} else {
|
||||
dispatch(openModal({
|
||||
modalType: 'FAVOURITE',
|
||||
modalType: "FAVOURITE",
|
||||
modalProps: {
|
||||
status,
|
||||
onFavourite: this.onModalFavourite,
|
||||
@@ -166,7 +166,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
},
|
||||
|
||||
onPin (status) {
|
||||
if (status.get('pinned')) {
|
||||
if (status.get("pinned")) {
|
||||
dispatch(unpin(status));
|
||||
} else {
|
||||
dispatch(pin(status));
|
||||
@@ -175,9 +175,9 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
|
||||
onEmbed (status) {
|
||||
dispatch(openModal({
|
||||
modalType: 'EMBED',
|
||||
modalType: "EMBED",
|
||||
modalProps: {
|
||||
id: status.get('id'),
|
||||
id: status.get("id"),
|
||||
onError: error => dispatch(showAlertForError(error)),
|
||||
},
|
||||
}));
|
||||
@@ -185,14 +185,14 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
|
||||
onDelete (status, history, withRedraft = false) {
|
||||
if (!deleteModal) {
|
||||
dispatch(deleteStatus(status.get('id'), history, withRedraft));
|
||||
dispatch(deleteStatus(status.get("id"), history, withRedraft));
|
||||
} else {
|
||||
dispatch(openModal({
|
||||
modalType: 'CONFIRM',
|
||||
modalType: "CONFIRM",
|
||||
modalProps: {
|
||||
message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
|
||||
confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
|
||||
onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
|
||||
onConfirm: () => dispatch(deleteStatus(status.get("id"), history, withRedraft)),
|
||||
},
|
||||
}));
|
||||
}
|
||||
@@ -201,26 +201,26 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
onEdit (status, history) {
|
||||
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.editMessage),
|
||||
confirm: intl.formatMessage(messages.editConfirm),
|
||||
onConfirm: () => dispatch(editStatus(status.get('id'), history)),
|
||||
onConfirm: () => dispatch(editStatus(status.get("id"), history)),
|
||||
},
|
||||
}));
|
||||
} else {
|
||||
dispatch(editStatus(status.get('id'), history));
|
||||
dispatch(editStatus(status.get("id"), history));
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onTranslate (status) {
|
||||
if (status.get('translation')) {
|
||||
dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
|
||||
if (status.get("translation")) {
|
||||
dispatch(undoStatusTranslation(status.get("id"), status.get("poll")));
|
||||
} else {
|
||||
dispatch(translateStatus(status.get('id')));
|
||||
dispatch(translateStatus(status.get("id")));
|
||||
}
|
||||
},
|
||||
|
||||
@@ -234,25 +234,25 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
|
||||
onOpenMedia (statusId, media, index, lang) {
|
||||
dispatch(openModal({
|
||||
modalType: 'MEDIA',
|
||||
modalType: "MEDIA",
|
||||
modalProps: { statusId, media, index, lang },
|
||||
}));
|
||||
},
|
||||
|
||||
onOpenVideo (statusId, media, lang, options) {
|
||||
dispatch(openModal({
|
||||
modalType: 'VIDEO',
|
||||
modalType: "VIDEO",
|
||||
modalProps: { statusId, media, lang, options },
|
||||
}));
|
||||
},
|
||||
|
||||
onBlock (status) {
|
||||
const account = status.get('account');
|
||||
const account = status.get("account");
|
||||
dispatch(initBlockModal(account));
|
||||
},
|
||||
|
||||
onReport (status) {
|
||||
dispatch(initReport(status.get('account'), status));
|
||||
dispatch(initReport(status.get("account"), status));
|
||||
},
|
||||
|
||||
onAddFilter (status) {
|
||||
@@ -264,36 +264,36 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
|
||||
},
|
||||
|
||||
onMuteConversation (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")));
|
||||
}
|
||||
},
|
||||
|
||||
deployPictureInPicture (status, type, mediaProps) {
|
||||
dispatch((_, getState) => {
|
||||
if (getState().getIn(['local_settings', 'media', 'pop_in_player'])) {
|
||||
dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
|
||||
if (getState().getIn(["local_settings", "media", "pop_in_player"])) {
|
||||
dispatch(deployPictureInPicture(status.get("id"), status.getIn(["account", "id"]), type, mediaProps));
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onInteractionModal (type, status) {
|
||||
dispatch(openModal({
|
||||
modalType: 'INTERACTION',
|
||||
modalType: "INTERACTION",
|
||||
modalProps: {
|
||||
type,
|
||||
accountId: status.getIn(['account', 'id']),
|
||||
url: status.get('uri'),
|
||||
accountId: status.getIn(["account", "id"]),
|
||||
url: status.get("uri"),
|
||||
},
|
||||
}));
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user