astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fixes #12511
pull/12546/head
ThibG 2019-12-02 18:25:24 +01:00 committed by Eugen Rochko
parent c7da6db28d
commit 27d5d02925
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/components/status_action_bar.js
View File

@ -173,9 +173,9 @@ class StatusActionBar extends ImmutablePureComponent {
const account = status.get('account'); const account = status.get('account');
if (relationship && relationship.get('blocking')) { if (relationship && relationship.get('blocking')) {
onBlock(status);
} else {
onUnblock(account); onUnblock(account);
} else {
onBlock(status);
} }
} }

4
app/javascript/mastodon/features/status/components/action_bar.js
View File

@ -120,9 +120,9 @@ class ActionBar extends React.PureComponent {
const account = status.get('account'); const account = status.get('account');
if (relationship && relationship.get('blocking')) { if (relationship && relationship.get('blocking')) {
onBlock(status);
} else {
onUnblock(account); onUnblock(account);
} else {
onBlock(status);
} }
} }