Merge branch 'develop' into feature/account-export

diff --combined CHANGELOG.md
index b4076c416d452e3c28c4d015556f7c4e542b4412,afeaa930bb8591454b8d7b646baef95d749c83a7..ec6228280a5c1e9026adf3701151f1fdbf62a5a1
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,7 -12,6 +12,7 @@@ The format is based on [Keep a Changelo
  - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
  - Pleroma API: Importing the mutes users from CSV files.
  - Experimental websocket-based federation between Pleroma instances.
 +- Account backup
  
  ### Changed
  
@@@ -48,6 -47,7 +48,7 @@@ switched to a new configuration mechani
  
  - Add documented-but-missing chat pagination.
  - Allow sending out emails again.
+ - Allow sending chat messages to yourself
  
  ## Unreleased (Patch)
  

diff --combined config/config.exs
index c758c818cd18ac9ae7fcd246621462b55d97136c,124f30a77b3cc6713f3901b007b2f7a10f5e7cd8..4adac435cc7275bbcd043bb0643d907eda947695
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -123,7 -123,6 +123,6 @@@ websocket_config = 
  
  # Configures the endpoint
  config :pleroma, Pleroma.Web.Endpoint,
-   instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
    url: [host: "localhost"],
    http: [
      ip: {127, 0, 0, 1},
@@@ -143,7 -142,7 +142,7 @@@
    secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
    signing_salt: "CqaoopA2",
    render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
-   pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
+   pubsub_server: Pleroma.PubSub,
    secure_cookie_flag: true,
    extra_cookie_attrs: [
      "SameSite=Lax"
@@@ -551,7 -550,6 +550,7 @@@ config :pleroma, Oban
    queues: [
      activity_expiration: 10,
      token_expiration: 5,
 +    backup: 1,
      federator_incoming: 50,
      federator_outgoing: 50,
      ingestion_queue: 50,
@@@ -831,11 -829,6 +830,11 @@@ config :floki, :html_parser, Floki.HTML
  
  config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator
  
 +config :pleroma, Pleroma.User.Backup,
 +  purge_after_days: 30,
 +  limit_days: 7,
 +  dir: nil
 +
  # Import environment specific config. This must remain at the bottom
  # of this file so it overrides the configuration defined above.
  import_config "#{Mix.env()}.exs"