X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fuser.ex;h=037e4471679d5f6ce780b80437964f49fa38c661;hb=6c8d15da110e86f799052c82df8b7b2404f8f722;hp=82f3514564948a656a188ede359482e2548fb8ce;hpb=88f92693f25c34f8ab82d4ed809b266bf5fb9ff8;p=akkoma

diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index 82f351456..037e44716 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -1,7 +1,12 @@
+# 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
-  alias Pleroma.{Repo, User}
+  alias Pleroma.Repo
+  alias Pleroma.User
   alias Mix.Tasks.Pleroma.Common
 
   @shortdoc "Manages Pleroma users"
@@ -18,10 +23,11 @@ defmodule Mix.Tasks.Pleroma.User do
   - `--password PASSWORD` - the user's password
   - `--moderator`/`--no-moderator` - whether the user is a moderator
   - `--admin`/`--no-admin` - whether the user is an admin
+  - `-y`, `--assume-yes`/`--no-assume-yes` - whether to assume yes to all questions 
 
   ## Generate an invite link.
-    
-     mix pleroma.user invite
+
+      mix pleroma.user invite
 
   ## Delete the user's account.
 
@@ -31,6 +37,10 @@ defmodule Mix.Tasks.Pleroma.User do
 
       mix pleroma.user toggle_activated NICKNAME
 
+  ## Unsubscribe local users from user's account and deactivate it
+
+      mix pleroma.user unsubscribe NICKNAME
+
   ## Create a password reset link.
 
       mix pleroma.user reset_password NICKNAME
@@ -43,6 +53,14 @@ defmodule Mix.Tasks.Pleroma.User do
   - `--locked`/`--no-locked` - whether the user's account is locked
   - `--moderator`/`--no-moderator` - whether the user is a moderator
   - `--admin`/`--no-admin` - whether the user is an admin
+
+  ## Add tags to a user.
+
+      mix pleroma.user tag NICKNAME TAGS
+
+  ## Delete tags from a user.
+
+      mix pleroma.user untag NICKNAME TAGS
   """
   def run(["new", nickname, email | rest]) do
     {options, [], []} =
@@ -53,7 +71,11 @@ defmodule Mix.Tasks.Pleroma.User do
           bio: :string,
           password: :string,
           moderator: :boolean,
-          admin: :boolean
+          admin: :boolean,
+          assume_yes: :boolean
+        ],
+        aliases: [
+          y: :assume_yes
         ]
       )
 
@@ -71,6 +93,7 @@ defmodule Mix.Tasks.Pleroma.User do
 
     moderator? = Keyword.get(options, :moderator, false)
     admin? = Keyword.get(options, :admin, false)
+    assume_yes? = Keyword.get(options, :assume_yes, false)
 
     Mix.shell().info("""
     A user will be created with the following information:
@@ -85,24 +108,22 @@ defmodule Mix.Tasks.Pleroma.User do
       - admin: #{if(admin?, do: "true", else: "false")}
     """)
 
-    proceed? = Mix.shell().yes?("Continue?")
+    proceed? = assume_yes? or Mix.shell().yes?("Continue?")
 
     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")
 
@@ -138,8 +159,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}")
@@ -188,7 +212,7 @@ defmodule Mix.Tasks.Pleroma.User do
 
       user = Repo.get(User, user.id)
 
-      if length(user.following) == 0 do
+      if Enum.empty?(user.following) do
         Mix.shell().info("Successfully unsubscribed all followers from #{user.nickname}")
       end
     else
@@ -211,31 +235,76 @@ 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
+      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}")
+    end
+  end
 
-      case Keyword.get(options, :locked) do
-        nil -> nil
-        value -> set_locked(user, value)
-      end
+  def run(["tag", nickname | tags]) do
+    Common.start_pleroma()
 
-      case Keyword.get(options, :admin) do
-        nil -> nil
-        value -> set_admin(user, value)
-      end
+    with %User{} = user <- User.get_by_nickname(nickname) do
+      user = user |> User.tag(tags)
+
+      Mix.shell().info("Tags of #{user.nickname}: #{inspect(tags)}")
     else
       _ ->
-        Mix.shell().error("No local user #{nickname}")
+        Mix.shell().error("Could not change user tags for #{nickname}")
     end
   end
 
-  defp set_moderator(user, value) do
-    info =
-      user.info
-      |> Map.put("is_moderator", value)
+  def run(["untag", nickname | tags]) do
+    Common.start_pleroma()
+
+    with %User{} = user <- User.get_by_nickname(nickname) do
+      user = user |> User.untag(tags)
+
+      Mix.shell().info("Tags of #{user.nickname}: #{inspect(tags)}")
+    else
+      _ ->
+        Mix.shell().error("Could not change user tags for #{nickname}")
+    end
+  end
+
+  def run(["invite"]) do
+    Common.start_pleroma()
+
+    with {:ok, token} <- Pleroma.UserInviteToken.create_token() do
+      Mix.shell().info("Generated user invite token")
 
+      url =
+        Pleroma.Web.Router.Helpers.redirect_url(
+          Pleroma.Web.Endpoint,
+          :registration_page,
+          token.token
+        )
+
+      IO.puts(url)
+    else
+      _ ->
+        Mix.shell().error("Could not create invite token.")
+    end
+  end
+
+  defp set_moderator(user, value) do
     info_cng = User.Info.admin_api_update(user.info, %{is_moderator: value})
 
     user_cng =
@@ -245,13 +314,10 @@ 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
-    info =
-      user.info
-      |> Map.put("is_admin", value)
-
     info_cng = User.Info.admin_api_update(user.info, %{is_admin: value})
 
     user_cng =
@@ -260,14 +326,11 @@ 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
-    info =
-      user.info
-      |> Map.put("locked", value)
-
     info_cng = User.Info.user_upgrade(user.info, %{locked: value})
 
     user_cng =
@@ -277,25 +340,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}")
-  end
-
-  def run(["invite"]) do
-    Common.start_pleroma()
-
-    with {:ok, token} <- Pleroma.UserInviteToken.create_token() do
-      Mix.shell().info("Generated user invite token")
-
-      url =
-        Pleroma.Web.Router.Helpers.redirect_url(
-          Pleroma.Web.Endpoint,
-          :registration_page,
-          token.token
-        )
-
-      IO.puts(url)
-    else
-      _ ->
-        Mix.shell().error("Could not create invite token.")
-    end
+    user
   end
 end