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

Merge remote-tracking branch 'parent/main' into upstream-20240913

Browse source
This commit is contained in:
KMY 2024-09-13 10:31:48 +09:00
commit fc9d27ff91
392 changed files with 3757 additions and 3233 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/services/activitypub/process_account_service.rb
View file

@ -137,6 +137,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.settings = other_settings
@account.master_settings = (@account.master_settings || {}).merge(master_settings(@account.note))
@account.memorial = @json['memorial'] || false
@account.attribution_domains = as_array(@json['attributionDomains'] || []).map { |item| value_or_id(item) }
end
def blocking_new_account?