mirror of
https://github.com/yingziwu/mastodon.git
synced 2026-02-04 03:25:14 +00:00
Split timeline_preview setting into more granular settings (#36338)
This commit is contained in:
parent
62f91eddf4
commit
2d2c525097
88 changed files with 156 additions and 173 deletions
|
|
@ -111,12 +111,13 @@ class InitialStateSerializer < ActiveModel::Serializer
|
|||
sso_redirect: sso_redirect,
|
||||
status_page_url: Setting.status_page_url,
|
||||
streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
|
||||
timeline_preview: Setting.timeline_preview,
|
||||
title: instance_presenter.title,
|
||||
trends_as_landing_page: Setting.trends_as_landing_page,
|
||||
trends_enabled: Setting.trends,
|
||||
version: instance_presenter.version,
|
||||
terms_of_service_enabled: TermsOfService.current.present?,
|
||||
local_live_feed_access: Setting.local_live_feed_access,
|
||||
remote_live_feed_access: Setting.remote_live_feed_access,
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -100,6 +100,21 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
|||
enabled: TranslationService.configured?,
|
||||
},
|
||||
|
||||
timelines_access: {
|
||||
live_feeds: {
|
||||
local: Setting.local_live_feed_access,
|
||||
remote: Setting.remote_live_feed_access,
|
||||
},
|
||||
hashtag_feeds: {
|
||||
local: Setting.local_topic_feed_access,
|
||||
remote: Setting.remote_topic_feed_access,
|
||||
},
|
||||
trending_link_feeds: {
|
||||
local: Setting.local_topic_feed_access,
|
||||
remote: Setting.remote_topic_feed_access,
|
||||
},
|
||||
},
|
||||
|
||||
limited_federation: limited_federation?,
|
||||
}
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue