Rename modal -> modals

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

app/soapbox/actions/compose.js

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

app/soapbox/actions/moderation.js

@@ -3,7 +3,7 @@ import { defineMessages } from 'react-intl';
 
 import { fetchAccountByUsername } from 'soapbox/actions/accounts';
 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 AccountContainer from 'soapbox/containers/account_container';
 import { isLocal } from 'soapbox/utils/accounts';

app/soapbox/actions/mutes.js

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

app/soapbox/actions/reports.js

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

app/soapbox/actions/statuses.js

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

app/soapbox/components/attachment_thumbs.js

@@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 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 { MediaGallery } from 'soapbox/features/ui/util/async-components';
 

app/soapbox/components/birthday_reminders.js

@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
 
 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 { makeGetAccount } from 'soapbox/selectors';
 

app/soapbox/components/modal_root.js

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

app/soapbox/components/poll.js

@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 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 Icon from 'soapbox/components/icon';
 import emojify from 'soapbox/features/emoji/emoji';

app/soapbox/components/status_action_bar.js

@@ -15,7 +15,7 @@ import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji_reacts';
 import { getFeatures } from 'soapbox/utils/features';
 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 IconButton from './icon_button';

app/soapbox/components/status_reply_mentions.js

@@ -6,7 +6,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 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';
 
 const mapDispatchToProps = (dispatch) => ({

app/soapbox/components/sub_navigation.js

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

app/soapbox/containers/account_container.js

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

app/soapbox/containers/domain_container.js

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

app/soapbox/containers/dropdown_menu_container.js

@@ -1,12 +1,12 @@
 import { connect } from 'react-redux';
 
 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 { isUserTouching } from '../is_mobile';
 
 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']),
   openDropdownId: state.getIn(['dropdown_menu', 'openId']),
   openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),

app/soapbox/containers/status_container.js

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

app/soapbox/features/account/components/header.js

@@ -11,7 +11,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 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 Badge from 'soapbox/components/badge';
 import Icon from 'soapbox/components/icon';

app/soapbox/features/account_gallery/index.js

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

app/soapbox/features/account_timeline/containers/header_container.js

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

app/soapbox/features/admin/components/report_status.js

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

app/soapbox/features/auth_login/components/registration_form.js

@@ -12,7 +12,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { accountLookup } from 'soapbox/actions/accounts';
 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 BirthdayInput from 'soapbox/components/birthday_input';
 import ShowablePassword from 'soapbox/components/showable_password';

app/soapbox/features/chats/components/chat_message_list.js

@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 
 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 DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container';
 import emojify from 'soapbox/features/emoji/emoji';

app/soapbox/features/compose/containers/compose_form_container.js

@@ -26,7 +26,7 @@ const mapStateToProps = state => ({
   isUploading: state.getIn(['compose', 'is_uploading']),
   showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
   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']),
   scheduledAt: state.getIn(['compose', 'schedule']),
   scheduledStatusCount: state.get('scheduled_statuses').size,

app/soapbox/features/compose/containers/privacy_dropdown_container.js

@@ -1,12 +1,12 @@
 import { connect } from 'react-redux';
 
 import { changeComposeVisibility } from '../../../actions/compose';
-import { openModal, closeModal } from '../../../actions/modal';
+import { openModal, closeModal } from '../../../actions/modals';
 import { isUserTouching } from '../../../is_mobile';
 import PrivacyDropdown from '../components/privacy_dropdown';
 
 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']),
 });
 

app/soapbox/features/compose/containers/reply_mentions_container.js

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

app/soapbox/features/compose/containers/upload_container.js

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

app/soapbox/features/crypto_donate/components/crypto_address.js

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

app/soapbox/features/list_timeline/index.js

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

app/soapbox/features/new_status/index.js

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

app/soapbox/features/notifications/containers/column_settings_container.js

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

app/soapbox/features/notifications/containers/notification_container.js

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

app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js

@@ -5,7 +5,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { defineMessages, injectIntl } from 'react-intl';
 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 { getSettings } from 'soapbox/actions/settings';
 import IconButton from 'soapbox/components/icon_button';

app/soapbox/features/status/components/action_bar.js

@@ -11,7 +11,7 @@ import { getReactForStatus } from 'soapbox/utils/emoji_reacts';
 import { getFeatures } from 'soapbox/utils/features';
 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 DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 

app/soapbox/features/status/components/status_interaction_bar.js

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

app/soapbox/features/status/containers/detailed_status_container.js

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

app/soapbox/features/status/index.js

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

app/soapbox/features/ui/components/action_button.js

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

app/soapbox/features/ui/components/compose_modal.js

@@ -6,7 +6,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 
 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 ComposeFormContainer from '../../compose/containers/compose_form_container';

app/soapbox/features/ui/components/instance_moderation_panel.js

@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
 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 InstanceRestrictions from 'soapbox/features/federation_restrictions/components/instance_restrictions';
 import { makeGetRemoteInstance } from 'soapbox/selectors';

app/soapbox/features/ui/components/link_footer.js

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

app/soapbox/features/ui/components/mute_modal.js

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import Toggle from 'react-toggle';
 
 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 Button from 'soapbox/components/button';
 import Icon from 'soapbox/components/icon';

app/soapbox/features/ui/components/profile_media_panel.js

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

app/soapbox/features/ui/components/tabs_bar.js

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

app/soapbox/features/ui/containers/modal_container.js

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

app/soapbox/features/ui/index.js

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

app/soapbox/reducers/__tests__/modals-test.js

@@ -1,8 +1,8 @@
 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', () => {
   it('should return the initial state', () => {

app/soapbox/reducers/index.js

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

app/soapbox/reducers/modals.js

@@ -1,6 +1,6 @@
 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();