X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fuser.ex;h=f8c6d57812753610532e273d6707b0eba9e67bd7;hb=d2a185c01385ef53c712c8d315c69d5deb044e2f;hp=d4cca09614929581aab93aa35990fc2988ded88e;hpb=3aa25b008d145bc7bfda907bca3b327753380728;p=akkoma

diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index d4cca0961..f8c6d5781 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -7,12 +7,13 @@ defmodule Mix.Tasks.Pleroma.User do
   import Mix.Pleroma
   alias Ecto.Changeset
   alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.UserInviteToken
   alias Pleroma.Web.ActivityPub.Builder
   alias Pleroma.Web.ActivityPub.Pipeline
 
   @shortdoc "Manages Pleroma users"
-  @moduledoc File.read!("docs/administration/CLI_tasks/user.md")
+  @moduledoc File.read!("docs/docs/administration/CLI_tasks/user.md")
 
   def run(["new", nickname, email | rest]) do
     {options, [], []} =
@@ -51,9 +52,7 @@ defmodule Mix.Tasks.Pleroma.User do
     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")}
@@ -107,21 +106,6 @@ defmodule Mix.Tasks.Pleroma.User do
     end
   end
 
-  def run(["toggle_activated", nickname]) do
-    start_pleroma()
-
-    with %User{} = user <- User.get_cached_by_nickname(nickname) do
-      {:ok, user} = User.deactivate(user, !user.deactivated)
-
-      shell_info(
-        "Activation status of #{nickname}: #{if(user.deactivated, do: "de", else: "")}activated"
-      )
-    else
-      _ ->
-        shell_error("No user #{nickname}")
-    end
-  end
-
   def run(["reset_password", nickname]) do
     start_pleroma()
 
@@ -129,15 +113,9 @@ defmodule Mix.Tasks.Pleroma.User do
          {: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}")
@@ -156,20 +134,41 @@ defmodule Mix.Tasks.Pleroma.User do
     end
   end
 
+  def run(["activate", nickname]) do
+    start_pleroma()
+
+    with %User{} = user <- User.get_cached_by_nickname(nickname),
+         false <- user.is_active do
+      User.set_activation(user, true)
+      :timer.sleep(500)
+
+      shell_info("Successfully activated #{nickname}")
+    else
+      true ->
+        shell_info("User #{nickname} already activated")
+
+      _ ->
+        shell_error("No user #{nickname}")
+    end
+  end
+
   def run(["deactivate", nickname]) do
     start_pleroma()
 
-    with %User{} = user <- User.get_cached_by_nickname(nickname) do
-      shell_info("Deactivating #{user.nickname}")
-      User.deactivate(user)
+    with %User{} = user <- User.get_cached_by_nickname(nickname),
+         true <- user.is_active do
+      User.set_activation(user, false)
       :timer.sleep(500)
 
       user = User.get_cached_by_id(user.id)
 
       if Enum.empty?(Enum.filter(User.get_friends(user), & &1.local)) do
-        shell_info("Successfully unsubscribed all local followers from #{user.nickname}")
+        shell_info("Successfully deactivated #{nickname} and unsubscribed all local followers")
       end
     else
+      false ->
+        shell_info("User #{nickname} already deactivated")
+
       _ ->
         shell_error("No user #{nickname}")
     end
@@ -315,9 +314,7 @@ defmodule Mix.Tasks.Pleroma.User do
         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
@@ -398,7 +395,7 @@ defmodule Mix.Tasks.Pleroma.User do
 
     Pleroma.User.Query.build(%{
       local: true,
-      deactivated: false,
+      is_active: true,
       is_moderator: false,
       is_admin: false,
       invisible: false
@@ -416,7 +413,7 @@ defmodule Mix.Tasks.Pleroma.User do
 
     Pleroma.User.Query.build(%{
       local: true,
-      deactivated: false,
+      is_active: true,
       is_moderator: false,
       is_admin: false,
       invisible: false
@@ -442,6 +439,38 @@ defmodule Mix.Tasks.Pleroma.User do
     end
   end
 
+  def run(["blocking", nickname]) do
+    start_pleroma()
+
+    with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
+      blocks = User.following_ap_ids(user)
+      IO.inspect(blocks, limit: :infinity)
+    end
+  end
+
+  def run(["timeline_query", nickname]) do
+    start_pleroma()
+    params = %{local: true}
+
+    with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
+      params =
+        params
+        |> Map.put(:type, ["Create", "Announce"])
+        |> Map.put(:limit, 20)
+        |> Map.put(:blocking_user, user)
+        |> Map.put(:muting_user, user)
+        |> Map.put(:reply_filtering_user, user)
+        |> Map.put(:announce_filtering_user, user)
+        |> Map.put(:user, user)
+        |> Map.put(:local_only, params[:local])
+        |> Map.delete(:local)
+
+      _activities =
+        [user.ap_id | User.following(user)]
+        |> ActivityPub.fetch_activities(params)
+    end
+  end
+
   def run(["list"]) do
     start_pleroma()
 
@@ -451,9 +480,7 @@ defmodule Mix.Tasks.Pleroma.User do
       users
       |> Enum.each(fn user ->
         shell_info(
-          "#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{
-            user.is_locked
-          }, deactivated: #{user.deactivated}"
+          "#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{user.is_locked}, is_active: #{user.is_active}"
         )
       end)
     end)