0
0
Fork 0

Redirect non-logged-in user to owner statuses on single user mode (#19333)

This commit is contained in:
Yamagishi Kazutoshi 2022-10-13 04:07:30 +09:00 committed by GitHub
parent 5f6c0d63e3
commit 7afc6a630c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 77 additions and 20 deletions

View file

@ -30,6 +30,7 @@ class InitialStateSerializer < ActiveModel::Serializer
registrations_open: Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode,
timeline_preview: Setting.timeline_preview,
activity_api_enabled: Setting.activity_api_enabled,
single_user_mode: Rails.configuration.x.single_user_mode,
}
if object.current_account
@ -55,6 +56,10 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:crop_images] = Setting.crop_images
end
if Rails.configuration.x.single_user_mode
store[:owner] = object.owner&.id&.to_s
end
store
end
# rubocop:enable Metrics/AbcSize
@ -78,6 +83,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store = {}
store[object.current_account.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
store[object.admin.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin
store[object.owner.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.owner, serializer: REST::AccountSerializer) if object.owner
store
end