Merge branch 'develop' into 'remove-avatar-header'

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

diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex
index aa0232a32c0371c89e55ed72f12e9d98104215ac..83ed0ed02b6013827bd93da97e47ceb1240b18ea 100644 (file)
--- a/lib/mix/tasks/pleroma/relay.ex
+++ b/lib/mix/tasks/pleroma/relay.ex
@@ -1,5 +1,10 @@
+# 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.Relay do
   use Mix.Task
+  import Mix.Pleroma
   alias Pleroma.Web.ActivityPub.Relay
 
   @shortdoc "Manages remote relays"
@@ -8,35 +13,35 @@ defmodule Mix.Tasks.Pleroma.Relay do
 
   ## Follow a remote relay
 
-  ``mix pleroma.relay unfollow <relay_url>``
+  ``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>``
 
   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
 end