Merge branch 'captcha' into 'develop'

[akkoma] / lib / mix / tasks / pleroma / user.ex

diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index 2675b021df2f9ed0f87dff24bff68d5149b90468..217a52fddcdcfcb7fdd9e415db5cc7c539fa3493 100644 (file)
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Mix.Tasks.Pleroma.User do
   use Mix.Task
   import Ecto.Changeset
@@ -94,19 +98,17 @@ defmodule Mix.Tasks.Pleroma.User do
     unless not proceed? do
       Common.start_pleroma()
 
-      params =
-        %{
-          nickname: nickname,
-          email: email,
-          password: password,
-          password_confirmation: password,
-          name: name,
-          bio: bio
-        }
-        |> IO.inspect()
+      params = %{
+        nickname: nickname,
+        email: email,
+        password: password,
+        password_confirmation: password,
+        name: name,
+        bio: bio
+      }
 
-      user = User.register_changeset(%User{}, params)
-      Repo.insert!(user)
+      changeset = User.register_changeset(%User{}, params, confirmed: true)
+      {:ok, _user} = User.register(changeset)
 
       Mix.shell().info("User #{nickname} created")
 
@@ -142,8 +144,11 @@ defmodule Mix.Tasks.Pleroma.User do
     Common.start_pleroma()
 
     with %User{} = user <- User.get_by_nickname(nickname) do
-      User.deactivate(user, !user.info["deactivated"])
-      Mix.shell().info("Activation status of #{nickname}: #{user.info["deactivated"]}")
+      {:ok, user} = User.deactivate(user, !user.info.deactivated)
+
+      Mix.shell().info(
+        "Activation status of #{nickname}: #{if(user.info.deactivated, do: "de", else: "")}activated"
+      )
     else
       _ ->
         Mix.shell().error("No user #{nickname}")
@@ -215,20 +220,23 @@ defmodule Mix.Tasks.Pleroma.User do
       )
 
     with %User{local: true} = user <- User.get_by_nickname(nickname) do
-      case Keyword.get(options, :moderator) do
-        nil -> nil
-        value -> set_moderator(user, value)
-      end
-
-      case Keyword.get(options, :locked) do
-        nil -> nil
-        value -> set_locked(user, value)
-      end
-
-      case Keyword.get(options, :admin) do
-        nil -> nil
-        value -> set_admin(user, value)
-      end
+      user =
+        case Keyword.get(options, :moderator) do
+          nil -> user
+          value -> set_moderator(user, value)
+        end
+
+      user =
+        case Keyword.get(options, :locked) do
+          nil -> user
+          value -> set_locked(user, value)
+        end
+
+      _user =
+        case Keyword.get(options, :admin) do
+          nil -> user
+          value -> set_admin(user, value)
+        end
     else
       _ ->
         Mix.shell().error("No local user #{nickname}")
@@ -265,6 +273,7 @@ defmodule Mix.Tasks.Pleroma.User do
     {:ok, user} = User.update_and_set_cache(user_cng)
 
     Mix.shell().info("Moderator status of #{user.nickname}: #{user.info.is_moderator}")
+    user
   end
 
   defp set_admin(user, value) do
@@ -276,7 +285,8 @@ defmodule Mix.Tasks.Pleroma.User do
 
     {:ok, user} = User.update_and_set_cache(user_cng)
 
-    Mix.shell().info("Admin status of #{user.nickname}: #{user.info.is_moderator}")
+    Mix.shell().info("Admin status of #{user.nickname}: #{user.info.is_admin}")
+    user
   end
 
   defp set_locked(user, value) do
@@ -289,5 +299,6 @@ defmodule Mix.Tasks.Pleroma.User do
     {:ok, user} = User.update_and_set_cache(user_cng)
 
     Mix.shell().info("Locked status of #{user.nickname}: #{user.info.locked}")
+    user
   end
 end