Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch protocols to AP when post come in through AP.

Browse Source
This commit is contained in:
lain 2018-02-18 12:04:59 +01:00
parent 77c6c424a6
commit 68752b2047
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/user.ex
View File

@ -427,5 +427,5 @@ defmodule Pleroma.User do
Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
end
def ap_enabled?(%User{info: %{"ap_enabled" => ap}}), do: ap
def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
end

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

@ -23,13 +23,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
# TODO: Ensure that this inbox is a recipient of the message
def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
# File.write("/tmp/incoming.json", Poison.encode!(params))
with {:ok, activity} <- Transmogrifier.handle_incoming(params) do
with {:ok, _user} <- ap_enabled_actor(params["actor"]),
{:ok, activity} <- Transmogrifier.handle_incoming(params) do
json(conn, "ok")
else
e -> IO.inspect(e)
end
end
def ap_enabled_actor(id) do
user = User.get_by_ap_id(id)
if User.ap_enabled?(user) do
{:ok, user}
else
ActivityPub.make_user_from_ap_id(id)
end
end
def errors(conn, _e) do
conn
|> put_status(500)