aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/web/activity_pub/relay.ex8
-rw-r--r--lib/pleroma/web/admin_api/admin_api_controller.ex4
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/web/activity_pub/relay.ex b/lib/pleroma/web/activity_pub/relay.ex
index 107c57866..fcdc6b1c0 100644
--- a/lib/pleroma/web/activity_pub/relay.ex
+++ b/lib/pleroma/web/activity_pub/relay.ex
@@ -12,11 +12,11 @@ defmodule Pleroma.Web.ActivityPub.Relay do
%User{} = target_user <- User.get_or_fetch_by_ap_id(target_instance),
{:ok, activity} <- ActivityPub.follow(local_user, target_user) do
Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}")
- :ok
+ {:ok, activity}
else
e ->
Logger.error("error: #{inspect(e)}")
- :error
+ {:error, e}
end
end
@@ -25,11 +25,11 @@ defmodule Pleroma.Web.ActivityPub.Relay do
%User{} = target_user <- User.get_or_fetch_by_ap_id(target_instance),
{:ok, activity} <- ActivityPub.unfollow(local_user, target_user) do
Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}")
- :ok
+ {:ok, activity}
else
e ->
Logger.error("error: #{inspect(e)}")
- :error
+ {:error, e}
end
end
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 5f6c565ae..39e85036e 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -102,7 +102,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
end
def relay_follow(conn, %{"relay_url" => target}) do
- status = Relay.follow(target)
+ {status, message} = Relay.follow(target)
if status == :ok do
conn
@@ -115,7 +115,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
end
def relay_unfollow(conn, %{"relay_url" => target}) do
- status = Relay.unfollow(target)
+ {status, message} = Relay.unfollow(target)
if status == :ok do
conn