From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 3 May 2017 08:01:26 +0000 (+0200)
Subject: Just give out the entry, not the whole feed.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=16afea399d330c28de05c77649fe0540598ee8ec;p=akkoma

Just give out the entry, not the whole feed.
---

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 6a4199846..c6700ae78 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -2,7 +2,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   use Pleroma.Web, :controller
 
   alias Pleroma.{User, Activity}
-  alias Pleroma.Web.OStatus.FeedRepresenter
+  alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
   alias Pleroma.Repo
   alias Pleroma.Web.OStatus
   import Ecto.Query
@@ -43,12 +43,12 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   end
 
   def object(conn, %{"uuid" => uuid}) do
-    IO.inspect(uuid)
     id = o_status_url(conn, :object, uuid)
     activity = Activity.get_create_activity_by_object_ap_id(id)
     user = User.get_cached_by_ap_id(activity.data["actor"])
 
-    response = FeedRepresenter.to_simple_form(user, [activity], [user])
+    response = ActivityRepresenter.to_simple_form(activity, user, true)
+    |> ActivityRepresenter.wrap_with_entry
     |> :xmerl.export_simple(:xmerl_xml)
     |> to_string
 
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index f07698747..8b7ca4d89 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -17,7 +17,6 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
     note_activity = insert(:note_activity)
     [_, uuid] = hd Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"])
     url = "/objects/#{uuid}"
-    |> IO.inspect
 
     conn = conn
     |> get(url)