Merge branch 'instance-view-markup' into 'develop'

Expose markup configuration in InstanceView

See merge request soapbox-pub/rebased!246
This commit is contained in:
marcin mikołajczak 2023-05-08 22:21:29 +00:00
commit aa13f6918c

View file

@ -255,7 +255,8 @@ defp pleroma_configuration(instance) do
birthday_required: Config.get([:instance, :birthday_required]),
birthday_min_age: Config.get([:instance, :birthday_min_age]),
migration_cooldown_period: Config.get([:instance, :migration_cooldown_period]),
translation: translation_configuration()
translation: translation_configuration(),
markup: markup()
},
stats: %{mau: Pleroma.User.active_user_count()},
vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key),
@ -326,4 +327,12 @@ defp contact_account(username) do
nil
end
end
defp markup do
%{
allow_inline_images: Config.get([:markup, :allow_inline_images]),
allow_headings: Config.get([:markup, :allow_headings]),
allow_tables: Config.get([:markup, :allow_tables])
}
end
end