projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/unsubscribe-route' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
relay.ex
diff --git
a/lib/pleroma/web/activity_pub/relay.ex
b/lib/pleroma/web/activity_pub/relay.ex
index 03fc434a98119975fc01dc1b603fd1e29d1de739..99a804568ccf0830529d55d1c17e916fce146c5f 100644
(file)
--- a/
lib/pleroma/web/activity_pub/relay.ex
+++ b/
lib/pleroma/web/activity_pub/relay.ex
@@
-10,8
+10,15
@@
defmodule Pleroma.Web.ActivityPub.Relay do
require Logger
def get_actor do
require Logger
def get_actor do
+ actor =
+ relay_ap_id()
+ |> User.get_or_create_service_actor_by_ap_id()
+
+ actor
+ end
+
+ def relay_ap_id do
"#{Pleroma.Web.Endpoint.url()}/relay"
"#{Pleroma.Web.Endpoint.url()}/relay"
- |> User.get_or_create_service_actor_by_ap_id()
end
@spec follow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
end
@spec follow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
@@
-53,9
+60,10
@@
defmodule Pleroma.Web.ActivityPub.Relay do
@spec list() :: {:ok, [String.t()]} | {:error, any()}
def list do
@spec list() :: {:ok, [String.t()]} | {:error, any()}
def list do
- with %User{
following: following} = _
user <- get_actor() do
+ with %User{
} =
user <- get_actor() do
list =
list =
- following
+ user
+ |> User.following()
|> Enum.map(fn entry -> URI.parse(entry).host end)
|> Enum.uniq()
|> Enum.map(fn entry -> URI.parse(entry).host end)
|> Enum.uniq()