Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge commit from fork

Browse source 
* Fix domain blocks/rationales being visible to unapproved/unconfirmed users

* Fix domain blocks/rationales being visible to suspended users

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Allow moved users to view domain blocks

* Add authorization specs for `/api/v1/instance/domain_blocks` spec

* Fix tests

* Fix incorrect test setup

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Jeremy Kescher 2025-02-27 15:49:57 +01:00 • committed by GitHub
parent 06f879ce9b
commit 6b519cfefa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 94 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/v1/instances/domain_blocks_controller.rb
View file

@ -31,7 +31,7 @@ class Api::V1::Instances::DomainBlocksController < Api::V1::Instances::BaseContr
end
def show_domain_blocks_to_user?
Setting.show_domain_blocks == 'users' && user_signed_in?
Setting.show_domain_blocks == 'users' && user_signed_in? && current_user.functional_or_moved?
end
def set_domain_blocks
@ -47,6 +47,6 @@ class Api::V1::Instances::DomainBlocksController < Api::V1::Instances::BaseContr
end
def show_rationale_for_user?
Setting.show_domain_blocks_rationale == 'users' && user_signed_in?
Setting.show_domain_blocks_rationale == 'users' && user_signed_in? && current_user.functional_or_moved?
end
end