sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 16:05:40 +01:00
Code Issues Releases Wiki Activity

Just give out the entry, not the whole feed.

Browse Source
This commit is contained in:
Roger Braun 2017-05-03 10:01:26 +02:00
parent 9c42453e06
commit 16afea399d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Pleroma.{User, Activity} alias Pleroma.{User, Activity}
alias Pleroma.Web.OStatus.FeedRepresenter alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.Web.OStatus alias Pleroma.Web.OStatus
import Ecto.Query import Ecto.Query
@ -43,12 +43,12 @@ defmodule Pleroma.Web.OStatus.OStatusController do
end end
def object(conn, %{"uuid" => uuid}) do def object(conn, %{"uuid" => uuid}) do
IO.inspect(uuid)
id = o_status_url(conn, :object, uuid) id = o_status_url(conn, :object, uuid)
activity = Activity.get_create_activity_by_object_ap_id(id) activity = Activity.get_create_activity_by_object_ap_id(id)
user = User.get_cached_by_ap_id(activity.data["actor"]) 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) |> :xmerl.export_simple(:xmerl_xml)
|> to_string |> to_string

1
test/web/ostatus/ostatus_controller_test.exs
View File

@ -17,7 +17,6 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
note_activity = insert(:note_activity) note_activity = insert(:note_activity)
[_, uuid] = hd Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"]) [_, uuid] = hd Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"])
url = "/objects/#{uuid}" url = "/objects/#{uuid}"
|> IO.inspect
conn = conn conn = conn
|> get(url) |> get(url)