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

diff --combined config/config.exs
index ca2506a8e1be452a1e4dbab1b3b39e0e5d859eb0,6a7bb9e063e18242ab50ac4aeb791f7bae63aead..d16cdf43f890b47f5c4c6c8e16eaacb173551b33
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -222,7 -222,6 +222,7 @@@ config :pleroma, :instance
    ],
    mrf_transparency: true,
    mrf_transparency_exclusions: [],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
    max_pinned_statuses: 1,
    attachment_links: false,
@@@ -372,6 -371,8 +372,8 @@@ config :pleroma, :mrf_keyword
  
  config :pleroma, :mrf_subchain, match_actor: %{}
  
+ config :pleroma, :mrf_activity_expiration, days: 365
+ 
  config :pleroma, :mrf_vocabulary,
    accept: [],
    reject: []
@@@ -386,7 -387,6 +388,6 @@@ config :pleroma, :rich_media
    ignore_tld: ["local", "localdomain", "lan"],
    parsers: [
      Pleroma.Web.RichMedia.Parsers.TwitterCard,
-     Pleroma.Web.RichMedia.Parsers.OGP,
      Pleroma.Web.RichMedia.Parsers.OEmbed
    ],
    ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]

diff --combined lib/mix/tasks/pleroma/user.ex
index 884fe8377f0042ba1d3a32a755b0b25a80f770ab,bca7e87bf533c01391f681a79dfaa7dfe2b7ff8e..b8d65b03eb52e762956d42da1052fe0a658af090
--- 1/lib/mix/tasks/pleroma/user.ex
--- 2/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@@ -144,6 -144,18 +144,18 @@@ defmodule Mix.Tasks.Pleroma.User d
      end
    end
  
+   def run(["reset_mfa", nickname]) do
+     start_pleroma()
+ 
+     with %User{local: true} = user <- User.get_cached_by_nickname(nickname),
+          {:ok, _token} <- Pleroma.MFA.disable(user) do
+       shell_info("Multi-Factor Authentication disabled for #{user.nickname}")
+     else
+       _ ->
+         shell_error("No local user #{nickname}")
+     end
+   end
+ 
    def run(["deactivate", nickname]) do
      start_pleroma()
  
@@@ -326,39 -338,6 +338,39 @@@
      end
    end
  
 +  def run(["change_email", nickname, email]) do
 +    start_pleroma()
 +
 +    with %User{} = user <- User.get_cached_by_nickname(nickname) do
 +      user
 +      |> User.update_changeset(%{"email" => email})
 +      |> User.update_and_set_cache()
 +
 +      shell_info("#{nickname}'s email updated")
 +    end
 +  end
 +
 +  def run(["show", nickname]) do
 +    start_pleroma()
 +
 +    nickname
 +    |> User.get_cached_by_nickname()
 +    |> IO.inspect()
 +  end
 +
 +  def run(["send_confirmation", nickname]) do
 +    start_pleroma()
 +
 +    with %User{} = user <- User.get_cached_by_nickname(nickname) do
 +      user
 +      |> Pleroma.Emails.UserEmail.account_confirmation_email()
 +      |> IO.inspect()
 +      |> Pleroma.Emails.Mailer.deliver!()
 +
 +      shell_info("#{nickname}'s email sent")
 +    end
 +  end
 +
    def run(["toggle_confirmed", nickname]) do
      start_pleroma()