diff options
author | ThibG <thib@sitedethib.com> | 2019-12-02 18:25:24 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-12-02 18:25:24 +0100 |
commit | 27d5d02925252314e4ec81bca8f72c5f91a55b7f (patch) | |
tree | 76996b39c847d066261235ab79d9dfb7ffae1797 /app | |
parent | c7da6db28d3c51a1f6b10e00c3f925bb7294e14f (diff) |
Fix blocking/unblocking users from status dropdown menu (#12535)
Fixes #12511
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/components/status_action_bar.js | 4 | ||||
-rw-r--r-- | app/javascript/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 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); } } |