Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 9508ae07718a24ddfb906506b150154edaa5527b..6a7bb9e063e18242ab50ac4aeb791f7bae63aead 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -371,6 +371,8 @@ config :pleroma, :mrf_keyword,
 
 config :pleroma, :mrf_subchain, match_actor: %{}
 
+config :pleroma, :mrf_activity_expiration, days: 365
+
 config :pleroma, :mrf_vocabulary,
   accept: [],
   reject: []
@@ -385,7 +387,6 @@ config :pleroma, :rich_media,
   ignore_tld: ["local", "localdomain", "lan"],
   parsers: [
     Pleroma.Web.RichMedia.Parsers.TwitterCard,
-    Pleroma.Web.RichMedia.Parsers.OGP,
     Pleroma.Web.RichMedia.Parsers.OEmbed
   ],
   ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]