add emojo

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 450da89304e2d75858c8efa550d8ae1fa34aaf69..a3f33cfbbf453ff0d5c15747d33880dfd5cedb4f 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -208,6 +208,12 @@ config :pleroma, :instance,
   avatar_upload_limit: 2_000_000,
   background_upload_limit: 4_000_000,
   banner_upload_limit: 4_000_000,
+  poll_limits: %{
+    max_options: 20,
+    max_option_chars: 200,
+    min_expiration: 0,
+    max_expiration: 365 * 24 * 60 * 60
+  },
   registrations_open: true,
   federating: true,
   federation_reachability_timeout_days: 7,
@@ -237,7 +243,8 @@ config :pleroma, :instance,
   max_report_comment_size: 1000,
   safe_dm_mentions: false,
   healthcheck: false,
-  remote_post_retention_days: 90
+  remote_post_retention_days: 90,
+  skip_thread_containment: false
 
 config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
 
@@ -320,8 +327,7 @@ config :pleroma, :mrf_keyword,
   federated_timeline_removal: [],
   replace: []
 
-config :pleroma, :mrf_subchain,
-  match_actor: %{}
+config :pleroma, :mrf_subchain, match_actor: %{}
 
 config :pleroma, :rich_media, enabled: true
 
@@ -456,7 +462,11 @@ config :pleroma, :ldap,
 config :esshd,
   enabled: false
 
-oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "")
+oauth_consumer_strategies =
+  System.get_env("OAUTH_CONSUMER_STRATEGIES")
+  |> to_string()
+  |> String.split()
+  |> Enum.map(&hd(String.split(&1, ":")))
 
 ueberauth_providers =
   for strategy <- oauth_consumer_strategies do