From: ThibG <thib@sitedethib.com>
Date: Mon, 2 Dec 2019 17:25:24 +0000 (+0100)
Subject: Fix blocking/unblocking users from status dropdown menu (#12535)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=27d5d02925252314e4ec81bca8f72c5f91a55b7f;p=mastodon.git

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

Fixes #12511
---

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index bd3bb16bb..4b3c79d0d 100644
--- 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
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);
     }
   }