X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmix%2Ftasks%2Fpleroma%2Frelay.ex;h=7ef5f9678534a8669cb434910d5b56a78b7866f3;hb=791bcfd90f41da9d77ab5a5ad6eec22ae8050b8a;hp=03586d6c3bb0bf702a8e4784828581cfcf7e86a8;hpb=443d59baa05165c3b5b7ab14f3eabd6f2eba09f2;p=akkoma

diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex
index 03586d6c3..7ef5f9678 100644
--- a/lib/mix/tasks/pleroma/relay.ex
+++ b/lib/mix/tasks/pleroma/relay.ex
@@ -1,43 +1,44 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 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
-  alias Mix.Tasks.Pleroma.Common
 
   @shortdoc "Manages remote relays"
-  @moduledoc """
-  Manages remote relays
-
-  ## Follow a remote relay
-
-  ``mix pleroma.relay follow <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
-    Common.start_pleroma()
+    start_pleroma()
 
     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
-    Common.start_pleroma()
+    start_pleroma()
 
     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() do
+      list |> Enum.each(&shell_info(&1))
+    else
+      {:error, e} -> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
     end
   end
 end