about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/javascript/glitch/components/status/container.js5
-rw-r--r--app/javascript/mastodon/features/account_timeline/containers/header_container.js1
-rw-r--r--app/javascript/mastodon/features/ui/components/mute_modal.js9
-rw-r--r--app/javascript/mastodon/reducers/mutes.js38
4 files changed, 26 insertions, 27 deletions
diff --git a/app/javascript/glitch/components/status/container.js b/app/javascript/glitch/components/status/container.js
index 6e49081b7..b4d7fb4cc 100644
--- a/app/javascript/glitch/components/status/container.js
+++ b/app/javascript/glitch/components/status/container.js
@@ -39,10 +39,7 @@ import {
   unreblog,
   unfavourite,
 } from '../../../mastodon/actions/interactions';
-import {
-  blockAccount,
-  muteAccount,
-} from '../../../mastodon/actions/accounts';
+import { blockAccount } from '../../../mastodon/actions/accounts';
 import { initMuteModal } from '../../../mastodon/actions/mutes';
 import {
   muteStatus,
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index 3f521f048..ac1364441 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -7,7 +7,6 @@ import {
   unfollowAccount,
   blockAccount,
   unblockAccount,
-  muteAccount,
   unmuteAccount,
 } from '../../../actions/accounts';
 import { mentionCompose } from '../../../actions/compose';
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.js b/app/javascript/mastodon/features/ui/components/mute_modal.js
index 51a2d70e0..0f3bcb708 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.js
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.js
@@ -19,7 +19,7 @@ const mapStateToProps = state => {
 const mapDispatchToProps = dispatch => {
   return {
     onConfirm(account, notifications) {
-      dispatch(muteAccount(account.get('id'), notifications))
+      dispatch(muteAccount(account.get('id'), notifications));
     },
 
     onClose() {
@@ -35,6 +35,7 @@ const mapDispatchToProps = dispatch => {
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
 export default class MuteModal extends React.PureComponent {
+
   static propTypes = {
     isSubmitting: PropTypes.bool.isRequired,
     account: PropTypes.object.isRequired,
@@ -73,14 +74,15 @@ export default class MuteModal extends React.PureComponent {
       <div className='modal-root__modal mute-modal'>
         <div className='mute-modal__container'>
           <p>
-            <FormattedMessage id='confirmations.mute.message'
+            <FormattedMessage
+              id='confirmations.mute.message'
               defaultMessage='Are you sure you want to mute {name}?'
               values={{ name: <strong>@{account.get('acct')}</strong> }}
             />
           </p>
           <p>
             <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
-            <input type="checkbox" checked={notifications} onChange={this.toggleNotifications} />
+            <input type='checkbox' checked={notifications} onChange={this.toggleNotifications} />
           </p>
         </div>
 
@@ -95,4 +97,5 @@ export default class MuteModal extends React.PureComponent {
       </div>
     );
   }
+
 }
\ No newline at end of file
diff --git a/app/javascript/mastodon/reducers/mutes.js b/app/javascript/mastodon/reducers/mutes.js
index 6d6a9a3b8..400a7c423 100644
--- a/app/javascript/mastodon/reducers/mutes.js
+++ b/app/javascript/mastodon/reducers/mutes.js
@@ -1,29 +1,29 @@
 import Immutable from 'immutable';
 
 import {
-	MUTES_INIT_MODAL,
-	MUTES_TOGGLE_HIDE_NOTIFICATIONS,
+  MUTES_INIT_MODAL,
+  MUTES_TOGGLE_HIDE_NOTIFICATIONS,
 } from '../actions/mutes';
 
 const initialState = Immutable.Map({
-	new: Immutable.Map({
-		isSubmitting: false,
-		account: null,
-		notifications: true,
-	}),
+  new: Immutable.Map({
+    isSubmitting: false,
+    account: null,
+    notifications: true,
+  }),
 });
 
 export default function mutes(state = initialState, action) {
-	switch (action.type) {
-	case MUTES_INIT_MODAL:
-		return state.withMutations((state) => {
-			state.setIn(['new', 'isSubmitting'], false);
-			state.setIn(['new', 'account'], action.account);
-			state.setIn(['new', 'notifications'], true);
-		});
-	case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
-		return state.setIn(['new', 'notifications'], !state.getIn(['new', 'notifications']));
-	default:
-		return state;
-	}
+  switch (action.type) {
+  case MUTES_INIT_MODAL:
+    return state.withMutations((state) => {
+      state.setIn(['new', 'isSubmitting'], false);
+      state.setIn(['new', 'account'], action.account);
+      state.setIn(['new', 'notifications'], true);
+    });
+  case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
+    return state.setIn(['new', 'notifications'], !state.getIn(['new', 'notifications']));
+  default:
+    return state;
+  }
 }
\ No newline at end of file