moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename modal -> modals 

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-02-02 14:33:12 +01:00
parent e0f0370579
commit a041a4452b
49 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/actions/compose.js
View File

@ -15,7 +15,7 @@ import { showAlert, showAlertForError } from './alerts';
import { useEmoji } from './emojis'; import { useEmoji } from './emojis';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { uploadMedia, fetchMedia, updateMedia } from './media'; import { uploadMedia, fetchMedia, updateMedia } from './media';
import { openModal, closeModal } from './modal'; import { openModal, closeModal } from './modals';
import { getSettings } from './settings'; import { getSettings } from './settings';
import { createStatus } from './statuses'; import { createStatus } from './statuses';

0
app/soapbox/actions/modal.js → app/soapbox/actions/modals.js
View File

2
app/soapbox/actions/moderation.js
View File

@ -3,7 +3,7 @@ import { defineMessages } from 'react-intl';
import { fetchAccountByUsername } from 'soapbox/actions/accounts'; import { fetchAccountByUsername } from 'soapbox/actions/accounts';
import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin'; import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import AccountContainer from 'soapbox/containers/account_container'; import AccountContainer from 'soapbox/containers/account_container';
import { isLocal } from 'soapbox/utils/accounts'; import { isLocal } from 'soapbox/utils/accounts';

2
app/soapbox/actions/mutes.js
View File

@ -5,7 +5,7 @@ import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts'; import { fetchRelationships } from './accounts';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { openModal } from './modal'; import { openModal } from './modals';
export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST'; export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS'; export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';

2
app/soapbox/actions/reports.js
View File

@ -1,6 +1,6 @@
import api from '../api'; import api from '../api';
import { openModal, closeModal } from './modal'; import { openModal, closeModal } from './modals';
export const REPORT_INIT = 'REPORT_INIT'; export const REPORT_INIT = 'REPORT_INIT';
export const REPORT_CANCEL = 'REPORT_CANCEL'; export const REPORT_CANCEL = 'REPORT_CANCEL';

2
app/soapbox/actions/statuses.js
View File

@ -5,7 +5,7 @@ import { shouldHaveCard } from 'soapbox/utils/status';
import api from '../api'; import api from '../api';
import { importFetchedStatus, importFetchedStatuses } from './importer'; import { importFetchedStatus, importFetchedStatuses } from './importer';
import { openModal } from './modal'; import { openModal } from './modals';
import { deleteFromTimelines } from './timelines'; import { deleteFromTimelines } from './timelines';
export const STATUS_CREATE_REQUEST = 'STATUS_CREATE_REQUEST'; export const STATUS_CREATE_REQUEST = 'STATUS_CREATE_REQUEST';

2
app/soapbox/components/attachment_thumbs.js
View File

@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Bundle from 'soapbox/features/ui/components/bundle'; import Bundle from 'soapbox/features/ui/components/bundle';
import { MediaGallery } from 'soapbox/features/ui/util/async-components'; import { MediaGallery } from 'soapbox/features/ui/util/async-components';

2
app/soapbox/components/birthday_reminders.js
View File

@ -9,7 +9,7 @@ import { connect } from 'react-redux';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { fetchBirthdayReminders } from 'soapbox/actions/accounts'; import { fetchBirthdayReminders } from 'soapbox/actions/accounts';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import { makeGetAccount } from 'soapbox/selectors'; import { makeGetAccount } from 'soapbox/selectors';

2
app/soapbox/components/modal_root.js
View File

@ -6,7 +6,7 @@ import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { cancelReplyCompose } from '../actions/compose'; import { cancelReplyCompose } from '../actions/compose';
import { openModal, closeModal } from '../actions/modal'; import { openModal, closeModal } from '../actions/modals';
const messages = defineMessages({ const messages = defineMessages({
confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },

2
app/soapbox/components/poll.js
View File

@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import spring from 'react-motion/lib/spring'; import spring from 'react-motion/lib/spring';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import { vote, fetchPoll } from 'soapbox/actions/polls'; import { vote, fetchPoll } from 'soapbox/actions/polls';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import emojify from 'soapbox/features/emoji/emoji'; import emojify from 'soapbox/features/emoji/emoji';

2
app/soapbox/components/status_action_bar.js
View File

@ -15,7 +15,7 @@ import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji_reacts';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types';
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modals';
import DropdownMenuContainer from '../containers/dropdown_menu_container'; import DropdownMenuContainer from '../containers/dropdown_menu_container';
import IconButton from './icon_button'; import IconButton from './icon_button';

2
app/soapbox/components/status_reply_mentions.js
View File

@ -6,7 +6,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({

2
app/soapbox/components/sub_navigation.js
View File

@ -5,7 +5,7 @@ import React from 'react';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Helmet from 'soapbox/components/helmet'; import Helmet from 'soapbox/components/helmet';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import IconButton from 'soapbox/components/icon_button'; import IconButton from 'soapbox/components/icon_button';

2
app/soapbox/containers/account_container.js
View File

@ -10,7 +10,7 @@ import {
muteAccount, muteAccount,
unmuteAccount, unmuteAccount,
} from '../actions/accounts'; } from '../actions/accounts';
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modals';
import { initMuteModal } from '../actions/mutes'; import { initMuteModal } from '../actions/mutes';
import { getSettings } from '../actions/settings'; import { getSettings } from '../actions/settings';
import Account from '../components/account'; import Account from '../components/account';

2
app/soapbox/containers/domain_container.js
View File

@ -3,7 +3,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { blockDomain, unblockDomain } from '../actions/domain_blocks'; import { blockDomain, unblockDomain } from '../actions/domain_blocks';
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modals';
import Domain from '../components/domain'; import Domain from '../components/domain';
const messages = defineMessages({ const messages = defineMessages({

4
app/soapbox/containers/dropdown_menu_container.js
View File

@ -1,12 +1,12 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu'; import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
import { openModal, closeModal } from '../actions/modal'; import { openModal, closeModal } from '../actions/modals';
import DropdownMenu from '../components/dropdown_menu'; import DropdownMenu from '../components/dropdown_menu';
import { isUserTouching } from '../is_mobile'; import { isUserTouching } from '../is_mobile';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
isModalOpen: state.get('modal').size && state.get('modal').last().modalType === 'ACTIONS', isModalOpen: state.get('modals').size && state.get('modals').last().modalType === 'ACTIONS',
dropdownPlacement: state.getIn(['dropdown_menu', 'placement']), dropdownPlacement: state.getIn(['dropdown_menu', 'placement']),
openDropdownId: state.getIn(['dropdown_menu', 'openId']), openDropdownId: state.getIn(['dropdown_menu', 'openId']),
openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']), openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),

2
app/soapbox/containers/status_container.js
View File

@ -28,7 +28,7 @@ import {
pin, pin,
unpin, unpin,
} from '../actions/interactions'; } from '../actions/interactions';
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modals';
import { initMuteModal } from '../actions/mutes'; import { initMuteModal } from '../actions/mutes';
import { initReport } from '../actions/reports'; import { initReport } from '../actions/reports';
import { getSettings } from '../actions/settings'; import { getSettings } from '../actions/settings';

2
app/soapbox/features/account/components/header.js
View File

@ -11,7 +11,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { NavLink } from 'react-router-dom'; import { NavLink } from 'react-router-dom';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Avatar from 'soapbox/components/avatar'; import Avatar from 'soapbox/components/avatar';
import Badge from 'soapbox/components/badge'; import Badge from 'soapbox/components/badge';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';

2
app/soapbox/features/account_gallery/index.js
View File

@ -10,7 +10,7 @@ import {
fetchAccount, fetchAccount,
fetchAccountByUsername, fetchAccountByUsername,
} from 'soapbox/actions/accounts'; } from 'soapbox/actions/accounts';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Column from 'soapbox/components/column'; import Column from 'soapbox/components/column';
import LoadMore from 'soapbox/components/load_more'; import LoadMore from 'soapbox/components/load_more';
import LoadingIndicator from 'soapbox/components/loading_indicator'; import LoadingIndicator from 'soapbox/components/loading_indicator';

2
app/soapbox/features/account_timeline/containers/header_container.js
View File

@ -34,7 +34,7 @@ import {
directCompose, directCompose,
} from '../../../actions/compose'; } from '../../../actions/compose';
import { blockDomain, unblockDomain } from '../../../actions/domain_blocks'; import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
import { initMuteModal } from '../../../actions/mutes'; import { initMuteModal } from '../../../actions/mutes';
import { initReport } from '../../../actions/reports'; import { initReport } from '../../../actions/reports';
import { makeGetAccount } from '../../../selectors'; import { makeGetAccount } from '../../../selectors';

2
app/soapbox/features/admin/components/report_status.js
View File

@ -5,7 +5,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import { deleteStatusModal } from 'soapbox/actions/moderation'; import { deleteStatusModal } from 'soapbox/actions/moderation';
import StatusContent from 'soapbox/components/status_content'; import StatusContent from 'soapbox/components/status_content';
import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; import DropdownMenu from 'soapbox/containers/dropdown_menu_container';

2
app/soapbox/features/auth_login/components/registration_form.js
View File

@ -12,7 +12,7 @@ import { v4 as uuidv4 } from 'uuid';
import { accountLookup } from 'soapbox/actions/accounts'; import { accountLookup } from 'soapbox/actions/accounts';
import { register, verifyCredentials } from 'soapbox/actions/auth'; import { register, verifyCredentials } from 'soapbox/actions/auth';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import { getSettings } from 'soapbox/actions/settings'; import { getSettings } from 'soapbox/actions/settings';
import BirthdayInput from 'soapbox/components/birthday_input'; import BirthdayInput from 'soapbox/components/birthday_input';
import ShowablePassword from 'soapbox/components/showable_password'; import ShowablePassword from 'soapbox/components/showable_password';

2
app/soapbox/features/chats/components/chat_message_list.js
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { fetchChatMessages, deleteChatMessage } from 'soapbox/actions/chats'; import { fetchChatMessages, deleteChatMessage } from 'soapbox/actions/chats';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import { initReportById } from 'soapbox/actions/reports'; import { initReportById } from 'soapbox/actions/reports';
import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container'; import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container';
import emojify from 'soapbox/features/emoji/emoji'; import emojify from 'soapbox/features/emoji/emoji';

2
app/soapbox/features/compose/containers/compose_form_container.js
View File

@ -26,7 +26,7 @@ const mapStateToProps = state => ({
isUploading: state.getIn(['compose', 'is_uploading']), isUploading: state.getIn(['compose', 'is_uploading']),
showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']), showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
anyMedia: state.getIn(['compose', 'media_attachments']).size > 0, anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
isModalOpen: state.get('modal').size && state.get('modal').last().modalType === 'COMPOSE', isModalOpen: state.get('modals').size && state.get('modals').last().modalType === 'COMPOSE',
maxTootChars: state.getIn(['instance', 'configuration', 'statuses', 'max_characters']), maxTootChars: state.getIn(['instance', 'configuration', 'statuses', 'max_characters']),
scheduledAt: state.getIn(['compose', 'schedule']), scheduledAt: state.getIn(['compose', 'schedule']),
scheduledStatusCount: state.get('scheduled_statuses').size, scheduledStatusCount: state.get('scheduled_statuses').size,

4
app/soapbox/features/compose/containers/privacy_dropdown_container.js
View File

@ -1,12 +1,12 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { changeComposeVisibility } from '../../../actions/compose'; import { changeComposeVisibility } from '../../../actions/compose';
import { openModal, closeModal } from '../../../actions/modal'; import { openModal, closeModal } from '../../../actions/modals';
import { isUserTouching } from '../../../is_mobile'; import { isUserTouching } from '../../../is_mobile';
import PrivacyDropdown from '../components/privacy_dropdown'; import PrivacyDropdown from '../components/privacy_dropdown';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
isModalOpen: state.get('modal').size && state.get('modal').last().modalType === 'ACTIONS', isModalOpen: state.get('modals').size && state.get('modals').last().modalType === 'ACTIONS',
value: state.getIn(['compose', 'privacy']), value: state.getIn(['compose', 'privacy']),
}); });

2
app/soapbox/features/compose/containers/reply_mentions_container.js
View File

@ -1,6 +1,6 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import { makeGetStatus } from 'soapbox/selectors'; import { makeGetStatus } from 'soapbox/selectors';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';

2
app/soapbox/features/compose/containers/upload_container.js
View File

@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import { undoUploadCompose, changeUploadCompose } from '../../../actions/compose'; import { undoUploadCompose, changeUploadCompose } from '../../../actions/compose';
import { submitCompose } from '../../../actions/compose'; import { submitCompose } from '../../../actions/compose';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
import Upload from '../components/upload'; import Upload from '../components/upload';
const mapStateToProps = (state, { id }) => ({ const mapStateToProps = (state, { id }) => ({

2
app/soapbox/features/crypto_donate/components/crypto_address.js
View File

@ -3,7 +3,7 @@ import React from 'react';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import { CopyableInput } from 'soapbox/features/forms'; import { CopyableInput } from 'soapbox/features/forms';

2
app/soapbox/features/list_timeline/index.js
View File

@ -8,7 +8,7 @@ import Button from 'soapbox/components/button';
import Column from 'soapbox/features/ui/components/column'; import Column from 'soapbox/features/ui/components/column';
import { fetchList, deleteList } from '../../actions/lists'; import { fetchList, deleteList } from '../../actions/lists';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modals';
import { connectListStream } from '../../actions/streaming'; import { connectListStream } from '../../actions/streaming';
import { expandListTimeline } from '../../actions/timelines'; import { expandListTimeline } from '../../actions/timelines';
import LoadingIndicator from '../../components/loading_indicator'; import LoadingIndicator from '../../components/loading_indicator';

2
app/soapbox/features/new_status/index.js
View File

@ -3,7 +3,7 @@ import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modals';
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({

2
app/soapbox/features/notifications/containers/column_settings_container.js
View File

@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
import { setFilter } from '../../../actions/notifications'; import { setFilter } from '../../../actions/notifications';
import { clearNotifications } from '../../../actions/notifications'; import { clearNotifications } from '../../../actions/notifications';
import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications'; import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';

2
app/soapbox/features/notifications/containers/notification_container.js
View File

@ -9,7 +9,7 @@ import {
unreblog, unreblog,
unfavourite, unfavourite,
} from '../../../actions/interactions'; } from '../../../actions/interactions';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
import { import {
hideStatus, hideStatus,
revealStatus, revealStatus,

2
app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js
View File

@ -5,7 +5,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import { cancelScheduledStatus } from 'soapbox/actions/scheduled_statuses'; import { cancelScheduledStatus } from 'soapbox/actions/scheduled_statuses';
import { getSettings } from 'soapbox/actions/settings'; import { getSettings } from 'soapbox/actions/settings';
import IconButton from 'soapbox/components/icon_button'; import IconButton from 'soapbox/components/icon_button';

2
app/soapbox/features/status/components/action_bar.js
View File

@ -11,7 +11,7 @@ import { getReactForStatus } from 'soapbox/utils/emoji_reacts';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
import IconButton from '../../../components/icon_button'; import IconButton from '../../../components/icon_button';
import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container';

2
app/soapbox/features/status/components/status_interaction_bar.js
View File

@ -5,7 +5,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { FormattedNumber } from 'react-intl'; import { FormattedNumber } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import { getSoapboxConfig } from 'soapbox/actions/soapbox'; import { getSoapboxConfig } from 'soapbox/actions/soapbox';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import emojify from 'soapbox/features/emoji/emoji'; import emojify from 'soapbox/features/emoji/emoji';

2
app/soapbox/features/status/containers/detailed_status_container.js
View File

@ -23,7 +23,7 @@ import {
pin, pin,
unpin, unpin,
} from '../../../actions/interactions'; } from '../../../actions/interactions';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
import { initMuteModal } from '../../../actions/mutes'; import { initMuteModal } from '../../../actions/mutes';
import { initReport } from '../../../actions/reports'; import { initReport } from '../../../actions/reports';
import { import {

2
app/soapbox/features/status/index.js
View File

@ -41,7 +41,7 @@ import {
pin, pin,
unpin, unpin,
} from '../../actions/interactions'; } from '../../actions/interactions';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modals';
import { initMuteModal } from '../../actions/mutes'; import { initMuteModal } from '../../actions/mutes';
import { initReport } from '../../actions/reports'; import { initReport } from '../../actions/reports';
import { import {

2
app/soapbox/features/ui/components/action_button.js
View File

@ -12,7 +12,7 @@ import {
blockAccount, blockAccount,
unblockAccount, unblockAccount,
} from 'soapbox/actions/accounts'; } from 'soapbox/actions/accounts';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Button from 'soapbox/components/button'; import Button from 'soapbox/components/button';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';

2
app/soapbox/features/ui/components/compose_modal.js
View File

@ -6,7 +6,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { cancelReplyCompose } from 'soapbox/actions/compose'; import { cancelReplyCompose } from 'soapbox/actions/compose';
import { openModal, closeModal } from 'soapbox/actions/modal'; import { openModal, closeModal } from 'soapbox/actions/modals';
import IconButton from 'soapbox/components/icon_button'; import IconButton from 'soapbox/components/icon_button';
import ComposeFormContainer from '../../compose/containers/compose_form_container'; import ComposeFormContainer from '../../compose/containers/compose_form_container';

2
app/soapbox/features/ui/components/instance_moderation_panel.js
View File

@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'; import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; import DropdownMenu from 'soapbox/containers/dropdown_menu_container';
import InstanceRestrictions from 'soapbox/features/federation_restrictions/components/instance_restrictions'; import InstanceRestrictions from 'soapbox/features/federation_restrictions/components/instance_restrictions';
import { makeGetRemoteInstance } from 'soapbox/selectors'; import { makeGetRemoteInstance } from 'soapbox/selectors';

2
app/soapbox/features/ui/components/link_footer.js
View File

@ -10,7 +10,7 @@ import { getBaseURL, isAdmin } from 'soapbox/utils/accounts';
import sourceCode from 'soapbox/utils/code'; import sourceCode from 'soapbox/utils/code';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
const mapStateToProps = state => { const mapStateToProps = state => {
const me = state.get('me'); const me = state.get('me');

2
app/soapbox/features/ui/components/mute_modal.js
View File

@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import Toggle from 'react-toggle'; import Toggle from 'react-toggle';
import { muteAccount } from 'soapbox/actions/accounts'; import { muteAccount } from 'soapbox/actions/accounts';
import { closeModal } from 'soapbox/actions/modal'; import { closeModal } from 'soapbox/actions/modals';
import { toggleHideNotifications } from 'soapbox/actions/mutes'; import { toggleHideNotifications } from 'soapbox/actions/mutes';
import Button from 'soapbox/components/button'; import Button from 'soapbox/components/button';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';

2
app/soapbox/features/ui/components/profile_media_panel.js
View File

@ -5,7 +5,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { FormattedMessage, injectIntl } from 'react-intl'; import { FormattedMessage, injectIntl } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal'; import { openModal } from 'soapbox/actions/modals';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import LoadingIndicator from 'soapbox/components/loading_indicator'; import LoadingIndicator from 'soapbox/components/loading_indicator';
import { getAccountGallery } from 'soapbox/selectors'; import { getAccountGallery } from 'soapbox/selectors';

2
app/soapbox/features/ui/components/tabs_bar.js
View File

@ -14,7 +14,7 @@ import SearchContainer from 'soapbox/features/compose/containers/search_containe
import { isStaff } from 'soapbox/utils/accounts'; import { isStaff } from 'soapbox/utils/accounts';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modals';
import { openSidebar } from '../../../actions/sidebar'; import { openSidebar } from '../../../actions/sidebar';
import Avatar from '../../../components/avatar'; import Avatar from '../../../components/avatar';
import ThemeToggle from '../../ui/components/theme_toggle_container'; import ThemeToggle from '../../ui/components/theme_toggle_container';

4
app/soapbox/features/ui/containers/modal_container.js
View File

@ -1,11 +1,11 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { cancelReplyCompose } from '../../../actions/compose'; import { cancelReplyCompose } from '../../../actions/compose';
import { closeModal } from '../../../actions/modal'; import { closeModal } from '../../../actions/modals';
import ModalRoot from '../components/modal_root'; import ModalRoot from '../components/modal_root';
const mapStateToProps = state => { const mapStateToProps = state => {
const modal = state.get('modal').last({ const modal = state.get('modals').last({
modalType: null, modalType: null,
modalProps: {}, modalProps: {},
}); });

2
app/soapbox/features/ui/index.js
View File

@ -38,7 +38,7 @@ import { fetchReports, fetchUsers, fetchConfig } from '../../actions/admin';
import { uploadCompose, resetCompose } from '../../actions/compose'; import { uploadCompose, resetCompose } from '../../actions/compose';
import { fetchFilters } from '../../actions/filters'; import { fetchFilters } from '../../actions/filters';
import { clearHeight } from '../../actions/height_cache'; import { clearHeight } from '../../actions/height_cache';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modals';
import { expandNotifications } from '../../actions/notifications'; import { expandNotifications } from '../../actions/notifications';
import { fetchScheduledStatuses } from '../../actions/scheduled_statuses'; import { fetchScheduledStatuses } from '../../actions/scheduled_statuses';
import { connectUserStream } from '../../actions/streaming'; import { connectUserStream } from '../../actions/streaming';

4
app/soapbox/reducers/__tests__/modal-test.js → app/soapbox/reducers/__tests__/modals-test.js
View File

@ -1,8 +1,8 @@
import { List as ImmutableList } from 'immutable'; import { List as ImmutableList } from 'immutable';
import { MODAL_OPEN, MODAL_CLOSE } from 'soapbox/actions/modal'; import { MODAL_OPEN, MODAL_CLOSE } from 'soapbox/actions/modals';
import reducer from '../modal'; import reducer from '../modals';
describe('modal reducer', () => { describe('modal reducer', () => {
it('should return the initial state', () => { it('should return the initial state', () => {

4
app/soapbox/reducers/index.js
View File

@ -34,7 +34,7 @@ import listEditor from './list_editor';
import lists from './lists'; import lists from './lists';
import me from './me'; import me from './me';
import meta from './meta'; import meta from './meta';
import modal from './modal'; import modals from './modals';
import mutes from './mutes'; import mutes from './mutes';
import notifications from './notifications'; import notifications from './notifications';
import patron from './patron'; import patron from './patron';
@ -62,7 +62,7 @@ const appReducer = combineReducers({
timelines, timelines,
meta, meta,
alerts, alerts,
modal, modals,
user_lists, user_lists,
domain_lists, domain_lists,
status_lists, status_lists,

2
app/soapbox/reducers/modal.js → app/soapbox/reducers/modals.js
View File

@ -1,6 +1,6 @@
import { List as ImmutableList } from 'immutable'; import { List as ImmutableList } from 'immutable';
import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modal'; import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modals';
const initialState = ImmutableList(); const initialState = ImmutableList();