about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/account_timeline/components/header.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-03-05 05:09:35 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-03-05 05:09:35 +0100
commit46a9a23749d58eb3ec415fef99da065ca69ea9fc (patch)
tree79b2a34e52673614db6af7c6f7a5e6a0dc2d7ee2 /app/javascript/mastodon/features/account_timeline/components/header.js
parent4e929b2d173fa22b722c58c0e9f8223eb4f44b0e (diff)
Make more apparent that an account is blocked or muted (fixes #6544) (#6627)
* Add button to unblock blocked accounts from their profile

* Add “Blocked” badge in place of “Follows you” when the user is blocked

* Add “Muted” badge (below “follows you” badge)
Diffstat (limited to 'app/javascript/mastodon/features/account_timeline/components/header.js')
-rw-r--r--app/javascript/mastodon/features/account_timeline/components/header.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index b143e1d36..9d594fb0c 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -82,6 +82,7 @@ export default class Header extends ImmutablePureComponent {
         <InnerHeader
           account={account}
           onFollow={this.handleFollow}
+          onBlock={this.handleBlock}
         />
 
         <ActionBar