From 27d5d02925252314e4ec81bca8f72c5f91a55b7f Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 2 Dec 2019 18:25:24 +0100
Subject: [PATCH] Fix blocking/unblocking users from status dropdown menu
(#12535)
Fixes #12511
---
app/javascript/mastodon/components/status_action_bar.js | 4 ++--
.../mastodon/features/status/components/action_bar.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index bd3bb16bbc..4b3c79d0da 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 76334de69b..bf6469f2fc 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);
}
}
--
GitLab