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

This commit is contained in:
KMY 2024-08-24 09:39:11 +09:00
commit a5bbc3f93b
164 changed files with 1913 additions and 1534 deletions

View file

@ -7,12 +7,13 @@ class REST::InstanceSerializer < ActiveModel::Serializer
has_one :account, serializer: REST::AccountSerializer
end
include InstanceHelper
include RoutingHelper
include KmyblueCapabilitiesHelper
include RegistrationLimitationHelper
attributes :domain, :title, :version, :source_url, :description,
:usage, :thumbnail, :languages, :configuration,
:usage, :thumbnail, :icon, :languages, :configuration,
:registrations, :fedibird_capabilities, :api_versions
has_one :contact, serializer: ContactSerializer
@ -35,6 +36,18 @@ class REST::InstanceSerializer < ActiveModel::Serializer
end
end
def icon
SiteUpload::ANDROID_ICON_SIZES.map do |size|
src = app_icon_path(size.to_i)
src = URI.join(root_url, src).to_s if src.present?
{
src: src || frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
size: "#{size}x#{size}",
}
end
end
def usage
{
users: {