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

diff --combined CHANGELOG.md
index 1b1ea02ac2444b9668e7fb00b6949ecbd9a35a6c,75442b5f0d9d0a7e56cb639b11753ff7045116af..f57e191fa63f5869c564119c10c7d06f32938b19
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,31 -5,31 +5,32 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
- ### Added
+ ### Changed
  
- - MRF policy to rewrite bot posts scope from public to unlisted
+ - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated.
+ - Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated.
  
  ### Removed
  
  - **Breaking:** Removed `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab`.
  
- 
  ## unreleased-patch - ???
  
  ### Added
  
  - Rich media failure tracking (along with `:failure_backoff` option)
++- MRF policy to rewrite bot posts scope from public to unlisted
  
  ### Fixed
  
  - Possible OOM errors with the default HTTP adapter
+ - Fixed uploading webp images when the Exiftool Upload Filter is enabled by skipping them
  - Mastodon API: Search parameter `following` now correctly returns the followings rather than the followers
  - Mastodon API: Timelines hanging for (`number of posts with links * rich media timeout`) in the worst case.
    Reduced to just rich media timeout.
  - Mastodon API: Cards being wrong for preview statuses due to cache key collision
  - Password resets no longer processed for deactivated accounts
  
- 
  ## [2.1.0] - 2020-08-28
  
  ### Changed

diff --combined config/description.exs
index 2191e8d6dd488f0476a70d1435c7f06df1a6431e,eac97ad64c5a864d93bce5e40db65cc27b73c01e..d9f9b6b84042606f5eaac7a197e2ad97e9995e2d
--- 1/config/description.exs
--- 2/config/description.exs
+++ b/config/description.exs
@@@ -1669,15 -1669,6 +1669,15 @@@ config :pleroma, :config_description, 
        }
      ]
    },
 +  %{
 +    group: :pleroma,
 +    key: :mrf_force_bot_unlisted,
 +    tab: :mrf,
 +    related_policy: "Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy",
 +    label: "MRF Force Bot Unlisted Policy",
 +    type: :boolean,
 +    description: "Makes bot posts to disappear from public timelines"
 +  },
    %{
      group: :pleroma,
      key: :mrf_subchain,
@@@ -3386,7 -3377,7 +3386,7 @@@
          suggestions: [250]
        },
        %{
-         key: :await_up_timeout,
+         key: :connect_timeout,
          type: :integer,
          description: "Timeout while `gun` will wait until connection is up. Default: 5000ms.",
          suggestions: [5000]
@@@ -3424,6 -3415,12 +3424,12 @@@
                description:
                  "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errrors when a new request is made",
                suggestions: [10]
+             },
+             %{
+               key: :recv_timeout,
+               type: :integer,
+               description: "Timeout for the pool while gun will wait for response",
+               suggestions: [10_000]
              }
            ]
          }

diff --combined docs/configuration/cheatsheet.md
index 2ca4d73513b2f95251fdfd51c9727698412be495,7f0725b48e1cbb6363c89dce560e38bbade439bb..bffce95e79aaa0fb0ae91c86ac7ab40983a556e1
--- 1/docs/configuration/cheatsheet.md
--- 2/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -115,7 -115,6 +115,7 @@@ To add configuration to your config fil
      * `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
      * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
      * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.ActivityExpiration` to be enabled for processing the scheduled delections.
 +    * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
  * `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
  * `transparency_exclusions`: Exclude specific instance names from MRF transparency.  The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
  
@@@ -499,7 -498,7 +499,7 @@@ Settings for HTTP connection pool
  * `:connection_acquisition_wait` - Timeout to acquire a connection from pool.The total max time is this value multiplied by the number of retries.
  * `connection_acquisition_retries` - Number of attempts to acquire the connection from the pool if it is overloaded. Each attempt is timed `:connection_acquisition_wait` apart.
  * `:max_connections` - Maximum number of connections in the pool.
- * `:await_up_timeout` - Timeout to connect to the host.
+ * `:connect_timeout` - Timeout to connect to the host.
  * `:reclaim_multiplier` - Multiplied by `:max_connections` this will be the maximum number of idle connections that will be reclaimed in case the pool is overloaded.
  
  ### :pools
@@@ -518,7 -517,7 +518,7 @@@ There are four pools used
  For each pool, the options are:
  
  * `:size` - limit to how much requests can be concurrently executed.
- * `:timeout` - timeout while `gun` will wait for response
+ * `:recv_timeout` - timeout while `gun` will wait for response
  * `:max_waiting` - limit to how much requests can be waiting for others to finish, after this is reached, subsequent requests will be dropped.
  
  ## Captcha