fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-27 16:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ActivityPub: Add object routes / controller.

Browse source
This commit is contained in:
Lain Iwakura 2017-12-11 18:21:33 +01:00
parent a89a613e4e
commit 64330d9455
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View file

@ -1,15 +1,23 @@
defmodule Pleroma.Web.ActivityPub.ActivityPubController do defmodule Pleroma.Web.ActivityPub.ActivityPubController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Pleroma.{User, Repo} alias Pleroma.{User, Repo, Object}
alias Pleroma.Web.ActivityPub.UserView alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.ActivityPub
def user(conn, %{"nickname" => nickname}) do def user(conn, %{"nickname" => nickname}) do
with %User{} = user <- User.get_cached_by_nickname(nickname) do with %User{} = user <- User.get_cached_by_nickname(nickname),
{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
json(conn, UserView.render("user.json", %{user: user})) json(conn, UserView.render("user.json", %{user: user}))
end end
end end
def object(conn, %{"uuid" => uuid}) do
with ap_id <- o_status_url(conn, :object, uuid),
%Object{} = object <- Object.get_cached_by_ap_id(ap_id) do
json(conn, ObjectView.render("object.json", %{object: object}))
end
end
def inbox(conn, params) do def inbox(conn, params) do
{:ok, activity} = ActivityPub.insert(params, false) {:ok, activity} = ActivityPub.insert(params, false)
json(conn, "ok") json(conn, "ok")

6
lib/pleroma/web/ostatus/ostatus_controller.ex
View file

@ -66,7 +66,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
|> send_resp(200, "") |> send_resp(200, "")
end end
def object(conn, %{"uuid" => uuid}) do def object(conn, %{"uuid" => uuid} = params) do
if get_format(conn) == "activity+json" do
ActivityPubController.object(conn, params)
else
with id <- o_status_url(conn, :object, uuid), with id <- o_status_url(conn, :object, uuid),
%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id), %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
@ -76,6 +79,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
end end
end end
end end
end
def activity(conn, %{"uuid" => uuid}) do def activity(conn, %{"uuid" => uuid}) do
with id <- o_status_url(conn, :activity, uuid), with id <- o_status_url(conn, :activity, uuid),