diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-01 20:06:13 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-01 20:06:13 +0200 |
| commit | 62bafa20a112ccdddaedb25723fc819dbbcd8e9a (patch) | |
| tree | bfad870e5366780dc13cc65280268695eb807858 /app/serializers/rest | |
| parent | 67eb47e25f1e7704dd9ecd32695ff3b53c807375 (diff) | |
Hide blocking accounts from blocked users (#10442)
* Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa974dcd3231e73826a56e08dbeedadc. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b198375ba23f7fde879f6d75ce2df0f. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup from bd02ec6daa974dcd3231e73826a56e08dbeedadc * Refactor by adding `without_blocking` scope
Diffstat (limited to 'app/serializers/rest')
| -rw-r--r-- | app/serializers/rest/relationship_serializer.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb index 1a3fd915c..c6c722a54 100644 --- a/app/serializers/rest/relationship_serializer.rb +++ b/app/serializers/rest/relationship_serializer.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class REST::RelationshipSerializer < ActiveModel::Serializer - attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :blocked_by, + attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :muting, :muting_notifications, :requested, :domain_blocking, :endorsed @@ -27,10 +27,6 @@ class REST::RelationshipSerializer < ActiveModel::Serializer instance_options[:relationships].blocking[object.id] || false end - def blocked_by - instance_options[:relationships].blocked_by[object.id] || false - end - def muting instance_options[:relationships].muting[object.id] ? true : false end |