diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-19 21:05:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 21:05:32 +0200 |
| commit | f1ab70649b00e717a00ac295d42ff99160aa713b (patch) | |
| tree | 283147302494a44af53409ca71736ffc1bd6eda1 /app/views | |
| parent | 1548695c8300618d44efa8785f5c6eb7b3a86917 (diff) | |
Add buttons to block and unblock domain (#3127)
* Add buttons to block and unblock domain * Relationship API now returns "domain_blocking" status for accounts, rename "block entire domain" to "hide entire domain", fix unblocking domain, do not block notifications from domain-blocked-but-followed people, do not send Salmons to domain blocked users * Add test * Personal domain blocks shouldn't affect Salmon after all, since in this direction of communication the control is very thin when it comes to public stuff. Best stay consistent and not affect federation in this way * Ignore followers and follow request from domain blocked folks, ensure account domain blocks are not created for empty domain, and avoid duplicates in validation * Purge followers when blocking domain (without soft-blocks, since they are useless here) * Add tests, fix local timeline being empty when having any domain blocks
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/api/v1/accounts/relationship.rabl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/api/v1/accounts/relationship.rabl b/app/views/api/v1/accounts/relationship.rabl index d6f1dd48a..4f7763d9d 100644 --- a/app/views/api/v1/accounts/relationship.rabl +++ b/app/views/api/v1/accounts/relationship.rabl @@ -1,8 +1,9 @@ object @account attribute :id -node(:following) { |account| @following[account.id] || false } -node(:followed_by) { |account| @followed_by[account.id] || false } -node(:blocking) { |account| @blocking[account.id] || false } -node(:muting) { |account| @muting[account.id] || false } -node(:requested) { |account| @requested[account.id] || false } +node(:following) { |account| @following[account.id] || false } +node(:followed_by) { |account| @followed_by[account.id] || false } +node(:blocking) { |account| @blocking[account.id] || false } +node(:muting) { |account| @muting[account.id] || false } +node(:requested) { |account| @requested[account.id] || false } +node(:domain_blocking) { |account| @domain_blocking[account.id] || false } |