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

diff --combined lib/mix/tasks/pleroma/user.ex
index 3827fe601cb4b50953b947f864b0c7c21d308943,e848222b8c352f8d70f6bf0438c44705f8a2d221..0252acc4ba8d8aea188e944f35fbd4b8f8b39a4e
--- 1/lib/mix/tasks/pleroma/user.ex
--- 2/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@@ -51,9 -51,7 +51,7 @@@ defmodule Mix.Tasks.Pleroma.User d
      A user will be created with the following information:
        - nickname: #{nickname}
        - email: #{email}
-       - password: #{
-       if(generated_password?, do: "[generated; a reset link will be created]", else: password)
-     }
+       - password: #{if(generated_password?, do: "[generated; a reset link will be created]", else: password)}
        - name: #{name}
        - bio: #{bio}
        - moderator: #{if(moderator?, do: "true", else: "false")}
@@@ -114,15 -112,9 +112,9 @@@
           {:ok, token} <- Pleroma.PasswordResetToken.create_token(user) do
        shell_info("Generated password reset token for #{user.nickname}")
  
-       IO.puts(
-         "URL: #{
-           Pleroma.Web.Router.Helpers.reset_password_url(
-             Pleroma.Web.Endpoint,
-             :reset,
-             token.token
-           )
-         }"
-       )
+       IO.puts("URL: #{Pleroma.Web.Router.Helpers.reset_password_url(Pleroma.Web.Endpoint,
+       :reset,
+       token.token)}")
      else
        _ ->
          shell_error("No local user #{nickname}")
@@@ -321,9 -313,7 +313,7 @@@
          end
  
        shell_info(
-         "ID: #{invite.id} | Token: #{invite.token} | Token type: #{invite.invite_type} | Used: #{
-           invite.used
-         }#{expire_info}#{using_info}"
+         "ID: #{invite.id} | Token: #{invite.token} | Token type: #{invite.invite_type} | Used: #{invite.used}#{expire_info}#{using_info}"
        )
      end)
    end
@@@ -351,39 -341,6 +341,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(["confirm", nickname]) do
      start_pleroma()
  
@@@ -457,9 -414,7 +447,7 @@@
        users
        |> Enum.each(fn user ->
          shell_info(
-           "#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{
-             user.is_locked
-           }, is_active: #{user.is_active}"
+           "#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{user.is_locked}, is_active: #{user.is_active}"
          )
        end)
      end)