logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://anongit.hacktivis.me/git/pleroma.git/
commit: ca7dd87e2de41ffaf6ad754fdb01b6548df02cbe
parent cda7cbf2a1b184998bf31fde82f84fe32706604f
Author: vaartis <vaartis@kotobank.ch>
Date:   Wed, 18 Jun 2025 10:48:15 +0000

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

Expose markup configuration in InstanceView

See merge request pleroma/pleroma!4346

Diffstat:

Achangelog.d/expose-markup-configuration.add1+
Mlib/pleroma/web/mastodon_api/views/instance_view.ex11++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/changelog.d/expose-markup-configuration.add b/changelog.d/expose-markup-configuration.add @@ -0,0 +1 @@ +Expose markup configuration in InstanceView diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -287,7 +287,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do birthday_required: Config.get([:instance, :birthday_required]), birthday_min_age: Config.get([:instance, :birthday_min_age]), translation: supported_languages(), - base_urls: base_urls + base_urls: base_urls, + markup: markup() }, stats: %{mau: Pleroma.User.active_user_count()}, vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key) @@ -338,4 +339,12 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do target_languages: target_languages } 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