summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/ostatus/ostatus_controller.ex
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web/ostatus/ostatus_controller.ex')
-rw-r--r--lib/pleroma/web/ostatus/ostatus_controller.ex7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 0490a32d3..df723f638 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -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),