Merge branch 'develop' into feature/custom-runtime-modules

diff --combined CHANGELOG.md
index e2249f897d9c3adaf87dd50d368e5b8078666dc8,c133cd9ec4f3335f9132c025f5822bb457ffe7c7..22f199b3d14f4614b3e8f79f8e8ae459dcd604fd
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -21,7 -21,6 +21,7 @@@ The format is based on [Keep a Changelo
  - Deprecated `User.Info` embedded schema (fields moved to `User`)
  - Store status data inside Flag activity
  - Deprecated (reorganized as `UserRelationship` entity) User fields with user AP IDs (`blocks`, `mutes`, `muted_reblogs`, `muted_notifications`, `subscribers`).
 +- Logger: default log level changed from `warn` to `info`.
  <details>
    <summary>API Changes</summary>
  
@@@ -29,6 -28,7 +29,7 @@@
  - **Breaking:** Admin API: Return link alongside with token on password reset
  - **Breaking:** Admin API: `PUT /api/pleroma/admin/reports/:id` is now `PATCH /api/pleroma/admin/reports`, see admin_api.md for details
  - **Breaking:** `/api/pleroma/admin/users/invite_token` now uses `POST`, changed accepted params and returns full invite in json instead of only token string.
+ - **Breaking** replying to reports is now "report notes", enpoint changed from `POST /api/pleroma/admin/reports/:id/respond` to `POST /api/pleroma/admin/reports/:id/notes`
  - Admin API: Return `total` when querying for reports
  - Mastodon API: Return `pleroma.direct_conversation_id` when creating a direct message (`POST /api/v1/statuses`)
  - Admin API: Return link alongside with token on password reset
@@@ -51,8 -51,8 +52,9 @@@
  - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
  - MRF: New module which handles incoming posts based on their age. By default, all incoming posts that are older than 2 days will be unlisted and not shown to their followers.
  - User notification settings: Add `privacy_option` option.
 +- Support for custom Elixir modules (such as MRF policies)
  - User settings: Add _This account is a_ option.
+ - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
  <details>
    <summary>API Changes</summary>
  
@@@ -84,6 -84,8 +86,8 @@@
  - ActivityPub: Configurable `type` field of the actors.
  - Mastodon API: `/api/v1/accounts/:id` has `source/pleroma/actor_type` field.
  - Mastodon API: `/api/v1/update_credentials` accepts `actor_type` field.
+ - Captcha: Support native provider
+ - Captcha: Enable by default
  </details>
  
  ### Fixed
@@@ -92,6 -94,7 +96,7 @@@
  - MRF: `Delete` activities being exempt from MRF policies
  - OTP releases: Not being able to configure OAuth expired token cleanup interval
  - OTP releases: Not being able to configure HTML sanitization policy
+ - Favorites timeline now ordered by favorite date instead of post date
  <details>
    <summary>API Changes</summary>
  

diff --combined config/config.exs
index 82d62004cf5ee823f2cc46ddd892be7b20bd7ebb,370ddd855063b801c1ee4c198484a43a0c68f44c..a9bc1b0aa289ee47f3036a157afb07606d663452
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -66,9 -66,9 +66,9 @@@ config :pleroma, Pleroma.Scheduler
    jobs: scheduled_jobs
  
  config :pleroma, Pleroma.Captcha,
-   enabled: false,
+   enabled: true,
    seconds_valid: 60,
-   method: Pleroma.Captcha.Kocaptcha
+   method: Pleroma.Captcha.Native
  
  config :pleroma, :hackney_pools,
    federation: [
@@@ -84,8 -84,6 +84,6 @@@
      timeout: 300_000
    ]
  
- config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
- 
  # Upload configuration
  config :pleroma, Pleroma.Upload,
    uploader: Pleroma.Uploaders.Local,
@@@ -563,7 -561,10 +561,10 @@@ config :ueberauth
         base_path: "/oauth",
         providers: ueberauth_providers
  
- config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
+ config :pleroma,
+        :auth,
+        enforce_oauth_admin_scope_usage: false,
+        oauth_consumer_strategies: oauth_consumer_strategies
  
  config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
  
@@@ -618,8 -619,6 +619,8 @@@ config :pleroma, :web_cache_ttl
    activity_pub: nil,
    activity_pub_question: 30_000
  
 +config :pleroma, :modules, runtime_dir: "instance/modules"
 +
  config :swarm, node_blacklist: [~r/myhtml_.*$/]
  # Import environment specific config. This must remain at the bottom
  # of this file so it overrides the configuration defined above.

diff --combined config/test.exs
index 8b9bf5c773f40535a65c7dab188efbb41ddad111,b48b89c8fffd5a2e980f424146970cfde526b7ec..6f6ab733e8ea8ffe39dfb0cf99a8bcb461be0be9
--- 1/config/test.exs
--- 2/config/test.exs
+++ b/config/test.exs
@@@ -68,7 -68,9 +68,9 @@@ config :pleroma, Oban
    queues: false,
    prune: :disabled
  
- config :pleroma, Pleroma.Scheduler, jobs: []
+ config :pleroma, Pleroma.Scheduler,
+   jobs: [],
+   global: false
  
  config :pleroma, Pleroma.ScheduledActivity,
    daily_user_limit: 2,
@@@ -93,8 -95,8 +95,10 @@@ config :joken, default_signer: "yU8uHKq
  
  config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
  
 +config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
 +
+ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+ 
  if File.exists?("./config/test.secret.exs") do
    import_config "test.secret.exs"
  else

diff --combined docs/configuration/cheatsheet.md
index b3a13833c2b7fb8d4a2da4f3a5dadd463473f044,ce2a1421069733840044d37c461014b3f813722d..a214b6e2fef85e90991e59ed0b19bedd266d14f4
--- 1/docs/configuration/cheatsheet.md
--- 2/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -379,13 -379,19 +379,19 @@@ For each pool, the options are
  ## Captcha
  
  ### Pleroma.Captcha
+ 
  * `enabled`: Whether the captcha should be shown on registration.
  * `method`: The method/service to use for captcha.
  * `seconds_valid`: The time in seconds for which the captcha is valid.
  
  ### Captcha providers
  
+ #### Pleroma.Captcha.Native
+ 
+ A built-in captcha provider. Enabled by default.
+ 
  #### Pleroma.Captcha.Kocaptcha
+ 
  Kocaptcha is a very simple captcha service with a single API endpoint,
  the source code is here: https://github.com/koto-bank/kocaptcha. The default endpoint
  `https://captcha.kotobank.ch` is hosted by the developer.
@@@ -830,7 -836,3 +836,7 @@@ config :auto_linker
      rel: "ugc"
    ]
  ```
 +
 +## Custom Runtime Modules (`:modules`)
 +
 +* `runtime_dir`: A path to custom Elixir modules (such as MRF policies).