Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

diff --combined config/config.exs
index 8caefc9efb6e787d03ad0ac1a53d0354c4b7752d,ed37b93c0712429ea35f2cebf7472ca766a80391..40200c6f63f968e35f158ecca37c7d3b75aefb87
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -224,9 -224,6 +224,9 @@@ config :pleroma, :instance
      "text/markdown",
      "text/bbcode"
    ],
 +  mrf_transparency: true,
 +  mrf_transparency_exclusions: [],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
    max_pinned_statuses: 1,
    attachment_links: false,
@@@ -415,6 -412,7 +415,7 @@@ config :pleroma, :rich_media
      Pleroma.Web.RichMedia.Parsers.TwitterCard,
      Pleroma.Web.RichMedia.Parsers.OEmbed
    ],
+   failure_backoff: 60_000,
    ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
  
  config :pleroma, :media_proxy,
@@@ -743,19 -741,23 +744,23 @@@ config :pleroma, :connections_pool
  config :pleroma, :pools,
    federation: [
      size: 50,
-     max_waiting: 10
+     max_waiting: 10,
+     timeout: 10_000
    ],
    media: [
      size: 50,
-     max_waiting: 10
+     max_waiting: 10,
+     timeout: 10_000
    ],
    upload: [
      size: 25,
-     max_waiting: 5
+     max_waiting: 5,
+     timeout: 15_000
    ],
    default: [
      size: 10,
-     max_waiting: 2
+     max_waiting: 2,
+     timeout: 5_000
    ]
  
  config :pleroma, :hackney_pools,