gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Change delivering to misskey setting to send as private

Browse source
This commit is contained in:
KMY 2023-05-01 12:16:16 +09:00
parent 29180de672
commit a4332babb5
10 changed files with 133 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/account_statuses_filter.rb
View file

@ -27,8 +27,8 @@ class AccountStatusesFilter
scope.merge!(hashtag_scope) if tagged?
scope.merge!(scope.where(searchability: :public)) if domain_block&.reject_send_not_public_searchability
scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted || (domain_block&.detect_invalid_subscription && @account.user&.setting_reject_public_unlisted_subscription)
scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.detect_invalid_subscription && @account.user&.setting_unlisted_subscription
scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted || (domain_block&.detect_invalid_subscription && @account.user&.reject_public_unlisted_subscription?)
scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.detect_invalid_subscription && @account.user&.unlisted_subscription?
scope.merge!(scope.where(spoiler_text: ['', nil])) if domain_block&.reject_send_sensitive
scope

8
app/models/user.rb
View file

@ -320,6 +320,14 @@ class User < ApplicationRecord
settings.default_searchability || 'public'
end
def reject_public_unlisted_subscription?
settings.reject_public_unlisted_subscription
end
def reject_unlisted_subscription?
settings.reject_unlisted_subscription
end
def allows_report_emails?
settings.notification_emails['report']
end