Merge branch 'feature/mediaproxy-inline-images' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index d88a56adf1198dfd655f914b969027967d2691bf..2290119f70c502232e0c942315709c7b592d21af 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -76,6 +76,18 @@ config :pleroma, :instance,
   quarantined_instances: [],
   managed_config: true
 
+config :pleroma, :markup,
+  # XXX - unfortunately, inline images must be enabled by default right now, because
+  # of custom emoji.  Issue #275 discusses defanging that somehow.
+  allow_inline_images: true,
+  allow_headings: false,
+  allow_tables: false,
+  allow_fonts: false,
+  scrub_policy: [
+    Pleroma.HTML.Transform.MediaProxy,
+    Pleroma.HTML.Scrubber.Default
+  ]
+
 config :pleroma, :fe,
   theme: "pleroma-dark",
   logo: "/static/logo.png",
@@ -95,6 +107,8 @@ config :pleroma, :activitypub,
 
 config :pleroma, :user, deny_follow_blocked: true
 
+config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default
+
 config :pleroma, :mrf_rejectnonpublic,
   allow_followersonly: false,
   allow_direct: false
@@ -128,6 +142,7 @@ config :pleroma, :suggestions,
   third_party_engine:
     "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
   timeout: 300_000,
+  limit: 23,
   web: "https://vinayaka.distsn.org/?{{host}}+{{user}}"
 
 # Import environment specific config. This must remain at the bottom