Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 364aaf7769085532ad9046d6383a251a98d36519..cb1551c2ad8347b4c7bb79fa413ff8ba895c1bba 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -241,7 +241,7 @@ config :pleroma, :instance,
   mrf_transparency_exclusions: [],
   autofollowed_nicknames: [],
   max_pinned_statuses: 1,
-  no_attachment_links: true,
+  attachment_links: false,
   welcome_user_nickname: nil,
   welcome_message: nil,
   max_report_comment_size: 1000,
@@ -326,6 +326,7 @@ config :pleroma, :activitypub,
   unfollow_blocked: true,
   outgoing_blocks: true,
   follow_handshake_timeout: 500,
+  note_replies_output_limit: 5,
   sign_object_fetches: true
 
 config :pleroma, :streamer,
@@ -480,6 +481,7 @@ config :pleroma, Oban,
     transmogrifier: 20,
     scheduled_activities: 10,
     background: 5,
+    remote_fetcher: 2,
     attachments_cleanup: 5
   ],
   crontab: [
@@ -612,8 +614,6 @@ config :pleroma, :modules, runtime_dir: "instance/modules"
 
 config :pleroma, configurable_from_database: false
 
-config :floki, :html_parser, Floki.HTMLParser.FastHtml
-
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"