commit: a5a10988e87dfb7bc4bedf6c9cb3f52e739286d7
parent: 920886882155db7af64abd4a3ae0296b4dc7374e
Author: lambda <pleromagit@rogerbraun.net>
Date: Thu, 13 Dec 2018 15:10:50 +0000
Merge branch 'fix/mix-tasks-set-user-info' into 'develop'
Fix mix task User
See merge request pleroma/pleroma!539
Diffstat:
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
@@ -142,8 +142,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 +218,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 +271,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 +283,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 +297,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