Merge remote-tracking branch 'origin/develop' into global-status-expiration

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

diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex
index eaaded5cb15ef16415bf5c7aefeeaf283fd50f07..c3312507e93786dcbebe0194177d84f9fc112c38 100644 (file)
--- a/lib/mix/tasks/pleroma/relay.ex
+++ b/lib/mix/tasks/pleroma/relay.ex
@@ -1,42 +1,44 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Mix.Tasks.Pleroma.Relay do
   use Mix.Task
+  import Mix.Pleroma
   alias Pleroma.Web.ActivityPub.Relay
 
   @shortdoc "Manages remote relays"
-  @moduledoc """
-  Manages remote relays
-
-  ## Follow a remote relay
-
-  ``mix pleroma.relay unfollow <relay_url>``
-
-  Example: ``mix pleroma.relay follow  https://example.org/relay``
-
-  ## Unfollow a remote relay
-
-  ``mix pleroma.relay unfollow <relay_url>``
+  @moduledoc File.read!("docs/administration/CLI_tasks/relay.md")
 
-  Example: ``mix pleroma.relay unfollow https://example.org/relay``
-  """
   def run(["follow", target]) do
-    Mix.Task.run("app.start")
+    start_pleroma()
 
-    with {:ok, activity} <- Relay.follow(target) do
+    with {:ok, _activity} <- Relay.follow(target) do
       # put this task to sleep to allow the genserver to push out the messages
       :timer.sleep(500)
     else
-      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
+      {:error, e} -> shell_error("Error while following #{target}: #{inspect(e)}")
     end
   end
 
   def run(["unfollow", target]) do
-    Mix.Task.run("app.start")
+    start_pleroma()
 
-    with {:ok, activity} <- Relay.follow(target) do
+    with {:ok, _activity} <- Relay.unfollow(target) do
       # put this task to sleep to allow the genserver to push out the messages
       :timer.sleep(500)
     else
-      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
+      {:error, e} -> shell_error("Error while following #{target}: #{inspect(e)}")
+    end
+  end
+
+  def run(["list"]) do
+    start_pleroma()
+
+    with {:ok, list} <- Relay.list(true) do
+      list |> Enum.each(&shell_info(&1))
+    else
+      {:error, e} -> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
     end
   end
 end