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

diff --combined .gitignore
index b62891f264fe4bdcfeea2c94addd2d4a4038648f,599b52b9e0b8f2084a889bb9aca56ca0dec76e01..66d1376c53f173e3c5af516b9615cdcd839218f7
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,4 +1,5 @@@
  # App artifacts
 +secret
  /_build
  /db
  /deps
@@@ -28,8 -27,6 +28,6 @@@ erl_crash.dum
  # variables.
  /config/*.secret.exs
  /config/generated_config.exs
- /config/*.env
- 
  
  # Database setup file, some may forget to delete it
  /config/setup_db.psql

diff --combined config/config.exs
index 8cf7f169edcdea93b9af454f7d00d54db5391eb2,eb85a6ed41e5dbcd64a5584270c38c5e289dc904..5c223c6b62ed2318d4bf9c97543da7e1bb46a8ac
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -223,9 -223,6 +223,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,
@@@ -264,6 -261,11 +264,11 @@@ config :pleroma, :welcome
      sender_nickname: nil,
      message: nil
    ],
+   chat_message: [
+     enabled: false,
+     sender_nickname: nil,
+     message: nil
+   ],
    email: [
      enabled: false,
      sender: nil,
@@@ -377,6 -379,7 +382,7 @@@ config :pleroma, :mrf_simple
    federated_timeline_removal: [],
    report_removal: [],
    reject: [],
+   followers_only: [],
    accept: [],
    avatar_removal: [],
    banner_removal: [],
@@@ -395,8 -398,9 +401,9 @@@ config :pleroma, :mrf_vocabulary
    accept: [],
    reject: []
  
+ # threshold of 7 days
  config :pleroma, :mrf_object_age,
-   threshold: 172_800,
+   threshold: 604_800,
    actions: [:delist, :strip_followers]
  
  config :pleroma, :rich_media,
@@@ -511,8 -515,15 +518,15 @@@ config :pleroma, Pleroma.User
      "user-search",
      "user_exists",
      "users",
-     "web"
-   ]
+     "web",
+     "verify_credentials",
+     "update_credentials",
+     "relationships",
+     "search",
+     "confirmation_resend",
+     "mfa"
+   ],
+   email_blacklist: []
  
  config :pleroma, Oban,
    repo: Pleroma.Repo,
@@@ -722,7 -733,7 +736,7 @@@ config :pleroma, :restrict_unauthentica
  config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
  
  config :pleroma, :mrf,
-   policies: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
+   policies: Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy,
    transparency: true,
    transparency_exclusions: []
  
@@@ -732,6 -743,10 +746,10 @@@ config :ex_aws, http_client: Pleroma.HT
  
  config :pleroma, :instances_favicons, enabled: false
  
+ config :floki, :html_parser, Floki.HTMLParser.FastHtml
+ 
+ config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator
+ 
  # 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"