Fix blocking/unblocking users from status dropdown menu (mastodon#12535)

Fixes mastodon#12511
julienw · Dec 2, 2019 · 27d5d02 · 27d5d02
1 parent c7da6db
commit 27d5d02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
@@ -173,9 +173,9 @@ class StatusActionBar extends ImmutablePureComponent {
  const account = status.get('account');
 
  if (relationship && relationship.get('blocking')) {
- onBlock(status);
- } else {
  onUnblock(account);
+ } else {
+ onBlock(status);
  }
  }
 

diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -120,9 +120,9 @@ class ActionBar extends React.PureComponent {
  const account = status.get('account');
 
  if (relationship && relationship.get('blocking')) {
- onBlock(status);
- } else {
  onUnblock(account);
+ } else {
+ onBlock(status);
  }
  }