hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support activity+json request for activity

Browse source
This commit is contained in:
sxsdv1 2019-01-08 23:22:15 +01:00
commit 20c0dd1e24
3 changed files with 57 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,23 +112,27 @@ defmodule Pleroma.Web.OStatus.OStatusController do
end
def activity(conn, %{"uuid" => uuid}) do
with id <- o_status_url(conn, :activity, uuid),
{_, %Activity{} = activity} <- {:activity, Activity.normalize(id)},
{_, true} <- {:public?, ActivityPub.is_public?(activity)},
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
case format = get_format(conn) do
"html" -> redirect(conn, to: "/notice/#{activity.id}")
_ -> represent_activity(conn, format, activity, user)
end
if get_format(conn) == "activity+json" do
ActivityPubController.call(conn, :activity)
else
{:public?, false} ->
{:error, :not_found}
with id <- o_status_url(conn, :activity, uuid),
{_, %Activity{} = activity} <- {:activity, Activity.normalize(id)},
{_, true} <- {:public?, ActivityPub.is_public?(activity)},
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
case format = get_format(conn) do
"html" -> redirect(conn, to: "/notice/#{activity.id}")
_ -> represent_activity(conn, format, activity, user)
end
else
{:public?, false} ->
{:error, :not_found}
{:activity, nil} ->
{:error, :not_found}
{:activity, nil} ->
{:error, :not_found}
e ->
e
e ->
e
end
end
end