Merge branch 'develop' into 'oembed_provider'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 9f0f4cd4f81cc636d6e7cc9df816dca8b0db6aec..e8cf2ed3ac1e89985a7438f28711f3a17c19fbfa 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -138,7 +138,9 @@ config :pleroma, :instance,
   ],
   finmoji_enabled: true,
   mrf_transparency: true,
-  autofollowed_nicknames: []
+  autofollowed_nicknames: [],
+  max_pinned_statuses: 1,
+  no_attachment_links: false
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
@@ -206,6 +208,8 @@ config :pleroma, :gopher,
   ip: {0, 0, 0, 0},
   port: 9999
 
+config :pleroma, Pleroma.Web.Metadata, providers: [], unfurl_nsfw: false
+
 config :pleroma, :suggestions,
   enabled: false,
   third_party_engine: