about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/status/components/action_bar.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-12-02 18:25:24 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-12-02 18:25:24 +0100
commit27d5d02925252314e4ec81bca8f72c5f91a55b7f (patch)
tree76996b39c847d066261235ab79d9dfb7ffae1797 /app/javascript/mastodon/features/status/components/action_bar.js
parentc7da6db28d3c51a1f6b10e00c3f925bb7294e14f (diff)
Fix blocking/unblocking users from status dropdown menu (#12535)
Fixes #12511
Diffstat (limited to 'app/javascript/mastodon/features/status/components/action_bar.js')
-rw-r--r--app/javascript/mastodon/features/status/components/action_bar.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 76334de69..bf6469f2f 100644
--- 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);
     }
   }