projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into stable
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
relay.ex
diff --git
a/lib/mix/tasks/pleroma/relay.ex
b/lib/mix/tasks/pleroma/relay.ex
index c3312507e93786dcbebe0194177d84f9fc112c38..c32fcdc33b57216f79db1b2dcbc7e54c6e34cda3 100644
(file)
--- a/
lib/mix/tasks/pleroma/relay.ex
+++ b/
lib/mix/tasks/pleroma/relay.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Relay do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Relay do
@@
-8,7
+8,7
@@
defmodule Mix.Tasks.Pleroma.Relay do
alias Pleroma.Web.ActivityPub.Relay
@shortdoc "Manages remote relays"
alias Pleroma.Web.ActivityPub.Relay
@shortdoc "Manages remote relays"
- @moduledoc File.read!("docs/administration/CLI_tasks/relay.md")
+ @moduledoc File.read!("docs/
docs/
administration/CLI_tasks/relay.md")
def run(["follow", target]) do
start_pleroma()
def run(["follow", target]) do
start_pleroma()
@@
-21,10
+21,19
@@
defmodule Mix.Tasks.Pleroma.Relay do
end
end
end
end
- def run(["unfollow", target]) do
+ def run(["unfollow", target
| rest
]) do
start_pleroma()
start_pleroma()
- with {:ok, _activity} <- Relay.unfollow(target) do
+ {options, [], []} =
+ OptionParser.parse(
+ rest,
+ strict: [force: :boolean],
+ aliases: [f: :force]
+ )
+
+ force = Keyword.get(options, :force, false)
+
+ with {:ok, _activity} <- Relay.unfollow(target, %{force: force}) do
# put this task to sleep to allow the genserver to push out the messages
:timer.sleep(500)
else
# put this task to sleep to allow the genserver to push out the messages
:timer.sleep(500)
else
@@
-35,10
+44,16
@@
defmodule Mix.Tasks.Pleroma.Relay do
def run(["list"]) do
start_pleroma()
def run(["list"]) do
start_pleroma()
- with {:ok, list} <- Relay.list(
true
) do
-
list |> Enum.each(&shell_info(&1)
)
+ with {:ok, list} <- Relay.list() do
+
Enum.each(list, &print_relay_url/1
)
else
{:error, e} -> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
end
end
else
{:error, e} -> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
end
end
+
+ defp print_relay_url(%{followed_back: false} = relay) do
+ shell_info("#{relay.actor} - no Accept received (relay didn't follow back)")
+ end
+
+ defp print_relay_url(relay), do: shell_info(relay.actor)
end
end