]> cat aescling's git repositories - mastodon.git/commit
Change silences to always require approval on follow (#11975)
authorThibG <thib@sitedethib.com>
Fri, 27 Sep 2019 19:13:51 +0000 (21:13 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 27 Sep 2019 19:13:51 +0000 (21:13 +0200)
commit18b451c0e6cf6a927a22084f94b423982de0ee8b
tree9f2f657b793f499cece2a97dd902c285019dfb61
parent2f90a38f44c9c414a2020b2a0031835f3335fea0
Change silences to always require approval on follow (#11975)

* Change silenced accounts to require approval on follow

* Also require approval for follows by people explicitly muted by target accounts

* Do not auto-accept silenced or muted accounts when switching from locked to unlocked

* Add `follow_requests_count` to verify_credentials

* Show “Follow requests” menu item if needed even if account is locked

* Add tests

* Correctly reflect that follow requests weren't auto-accepted when local account is silenced

* Accept follow requests from user-muted accounts to avoid leaking mutes
app/controllers/api/v1/accounts_controller.rb
app/javascript/mastodon/features/getting_started/index.js
app/lib/activitypub/activity/follow.rb
app/serializers/rest/credential_account_serializer.rb
app/services/follow_service.rb
app/services/update_account_service.rb
spec/lib/activitypub/activity/follow_spec.rb
spec/services/follow_service_spec.rb
spec/services/update_account_service_spec.rb [new file with mode: 0644]