projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for dropping posts/notifs in WS when mix task is executed
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
relay.ex
diff --git
a/lib/mix/tasks/pleroma/relay.ex
b/lib/mix/tasks/pleroma/relay.ex
index d7a7b599fee4f3a97a52edceb043f80b282fe5e6..bb808ca47dce09e903147dc655b1ec77cf4a2b8e 100644
(file)
--- a/
lib/mix/tasks/pleroma/relay.ex
+++ b/
lib/mix/tasks/pleroma/relay.ex
@@
-1,11
+1,10
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Relay do
use Mix.Task
import Mix.Pleroma
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Relay do
use Mix.Task
import Mix.Pleroma
- alias Pleroma.User
alias Pleroma.Web.ActivityPub.Relay
@shortdoc "Manages remote relays"
alias Pleroma.Web.ActivityPub.Relay
@shortdoc "Manages remote relays"
@@
-22,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
@@
-36,13
+44,16
@@
defmodule Mix.Tasks.Pleroma.Relay do
def run(["list"]) do
start_pleroma()
def run(["list"]) do
start_pleroma()
- with %User{following: following} = _user <- Relay.get_actor() do
- following
- |> Enum.map(fn entry -> URI.parse(entry).host end)
- |> Enum.uniq()
- |> Enum.each(&shell_info(&1))
+ with {:ok, list} <- Relay.list() do
+ Enum.each(list, &print_relay_url/1)
else
else
-
e
-> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
+
{:error, e}
-> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
end
end
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