moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

activitypub: refactor relay concerns into new relay module

This commit is contained in:
William Pitcock 2018-08-06 06:15:22 +00:00
parent 00e890264c
commit b7ca7f282a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View File

@ -3,6 +3,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
alias Pleroma.{User, Object} alias Pleroma.{User, Object}
alias Pleroma.Web.ActivityPub.{ObjectView, UserView} alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Web.Federator alias Pleroma.Web.Federator
require Logger require Logger
@ -108,7 +109,7 @@ def inbox(conn, params) do
end end
def relay(conn, params) do def relay(conn, params) do
with %User{} = user <- User.get_or_create_instance_user(), with %User{} = user <- Relay.get_actor(),
{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
conn conn
|> put_resp_header("content-type", "application/activity+json") |> put_resp_header("content-type", "application/activity+json")

7
lib/pleroma/web/activity_pub/relay.ex Normal file
View File

@ -0,0 +1,7 @@
defmodule Pleroma.Web.ActivityPub.Relay do
alias Pleroma.User
def get_actor do
User.get_or_create_instance_user()
end
end