Commit 16afea39 authored by lain's avatar lain
Browse files

Just give out the entry, not the whole feed.

parent 9c42453e
......@@ -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 @@ def salmon_incoming(conn, params) 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
......
......@@ -17,7 +17,6 @@ test "gets an object", %{conn: conn} 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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment