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

fix fetching AP objects with application/json

Browse Source
This commit is contained in:
William Pitcock 2019-02-20 20:45:40 +00:00
parent aa45674be6
commit 1803d9a022
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/ostatus/ostatus_controller.ex
View File

@ -33,6 +33,9 @@ defmodule Pleroma.Web.OStatus.OStatusController do
"activity+json" ->
ActivityPubController.call(conn, :user)
"json" ->
ActivityPubController.call(conn, :user)
_ ->
with %User{} = user <- User.get_cached_by_nickname(nickname) do
redirect(conn, external: OStatus.feed_path(user))
@ -94,7 +97,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
end
def object(conn, %{"uuid" => uuid}) do
if get_format(conn) == "activity+json" do
if get_format(conn) in ["activity+json", "json"] do
ActivityPubController.call(conn, :object)
else
with id <- o_status_url(conn, :object, uuid),
@ -119,7 +122,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
end
def activity(conn, %{"uuid" => uuid}) do
if get_format(conn) == "activity+json" do
if get_format(conn) in ["activity+json", "json"] do
ActivityPubController.call(conn, :activity)
else
with id <- o_status_url(conn, :activity, uuid),

8
lib/pleroma/web/router.ex
View File

@ -488,11 +488,11 @@ defmodule Pleroma.Web.Router do
end
pipeline :ap_relay do
plug(:accepts, ["activity+json"])
plug(:accepts, ["activity+json", "json"])
end
pipeline :ostatus do
plug(:accepts, ["html", "xml", "atom", "activity+json"])
plug(:accepts, ["html", "xml", "atom", "activity+json", "json"])
end
pipeline :oembed do
@ -521,7 +521,7 @@ defmodule Pleroma.Web.Router do
end
pipeline :activitypub do
plug(:accepts, ["activity+json"])
plug(:accepts, ["activity+json", "json"])
plug(Pleroma.Web.Plugs.HTTPSignaturePlug)
end
@ -536,7 +536,7 @@ defmodule Pleroma.Web.Router do
end
pipeline :activitypub_client do
plug(:accepts, ["activity+json"])
plug(:accepts, ["activity+json", "json"])
plug(:fetch_session)
plug(Pleroma.Plugs.OAuthPlug)
plug(Pleroma.Plugs.BasicAuthDecoderPlug)