From 0899588e4dfba7b7e65ee606378a1c1c710e4a82 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 12 Jul 2018 17:13:20 +0000
Subject: [PATCH 1/2] ostatus: return AS2 objects on /notice and /activities
 URLs like with /objects.

---
 lib/pleroma/web/ostatus/ostatus_controller.ex | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 00bffbd5d..09d1b1110 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   alias Pleroma.Repo
   alias Pleroma.Web.{OStatus, Federator}
   alias Pleroma.Web.XML
+  alias Pleroma.Web.ActivityPub.ObjectView
   alias Pleroma.Web.ActivityPub.ActivityPubController
   alias Pleroma.Web.ActivityPub.ActivityPub
 
@@ -90,7 +91,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
            %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
         case get_format(conn) do
           "html" -> redirect(conn, to: "/notice/#{activity.id}")
-          _ -> represent_activity(conn, activity, user)
+          _ -> represent_activity(conn, nil, activity, user)
         end
       else
         {:public?, false} ->
@@ -110,9 +111,9 @@ defmodule Pleroma.Web.OStatus.OStatusController do
          {_, %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 get_format(conn) do
+      case format = get_format(conn) do
         "html" -> redirect(conn, to: "/notice/#{activity.id}")
-        _ -> represent_activity(conn, activity, user)
+        _ -> represent_activity(conn, format, activity, user)
       end
     else
       {:public?, false} ->
@@ -130,14 +131,14 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     with {_, %Activity{} = activity} <- {:activity, Repo.get(Activity, id)},
          {_, true} <- {:public?, ActivityPub.is_public?(activity)},
          %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      case get_format(conn) do
+      case format = get_format(conn) do
         "html" ->
           conn
           |> put_resp_content_type("text/html")
           |> send_file(200, "priv/static/index.html")
 
         _ ->
-          represent_activity(conn, activity, user)
+          represent_activity(conn, format, activity, user)
       end
     else
       {:public?, false} ->
@@ -151,7 +152,13 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
-  defp represent_activity(conn, activity, user) do
+  defp represent_activity(conn, "activity+json", activity, user) do
+    conn
+    |> put_resp_header("content-type", "application/activity+json")
+    |> json(ObjectView.render("object.json", %{object: activity}))
+  end
+
+  defp represent_activity(conn, _, activity, user) do
     response =
       activity
       |> ActivityRepresenter.to_simple_form(user, true)

From f1a29fc43c2ef47786ff932b7afb42825159a067 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 12 Jul 2018 20:32:05 +0000
Subject: [PATCH 2/2] test: ostatus controller: add AS2 fetching tests

---
 test/web/ostatus/ostatus_controller_test.exs | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index d5adf3bf3..c23b175e8 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -155,6 +155,31 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
     assert response(conn, 200)
   end
 
+  test "gets a notice in AS2 format", %{conn: conn} do
+    note_activity = insert(:note_activity)
+    url = "/notice/#{note_activity.id}"
+
+    conn =
+      conn
+      |> put_req_header("accept", "application/activity+json")
+      |> get(url)
+
+    assert json_response(conn, 200)
+  end
+
+  test "gets an activity in AS2 format", %{conn: conn} do
+    note_activity = insert(:note_activity)
+    [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"]))
+    url = "/activities/#{uuid}"
+
+    conn =
+      conn
+      |> put_req_header("accept", "application/activity+json")
+      |> get(url)
+
+    assert json_response(conn, 200)
+  end
+
   test "404s a private notice", %{conn: conn} do
     note_activity = insert(:direct_note_activity)
     url = "/notice/#{note_activity.id}"