Commit 98795172 authored by kaniini's avatar kaniini
Browse files

ostatus controller: respond with AS2 objects instead of activities to notice URIs

parent d73c7cc0
Pipeline #4552 passed with stages
in 7 minutes and 38 seconds
defmodule Pleroma.Web.OStatus.OStatusController do defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Pleroma.{User, Activity} alias Pleroma.{User, Activity, Object}
alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter} alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.Web.{OStatus, Federator} alias Pleroma.Web.{OStatus, Federator}
...@@ -153,10 +153,21 @@ def notice(conn, %{"id" => id}) do ...@@ -153,10 +153,21 @@ def notice(conn, %{"id" => id}) do
end end
end end
defp represent_activity(conn, "activity+json", activity, user) do defp represent_activity(
%Activity{data: %{"type" => "Create"}} = activity,
) do
object = Object.normalize(["object"])
conn conn
|> put_resp_header("content-type", "application/activity+json") |> put_resp_header("content-type", "application/activity+json")
|> json(ObjectView.render("object.json", %{object: activity})) |> json(ObjectView.render("object.json", %{object: object}))
defp represent_activity(conn, "activity+json", _, _) do
{:error, :not_found}
end end
defp represent_activity(conn, _, activity, user) do defp represent_activity(conn, _, activity, user) do
...@@ -2,6 +2,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do ...@@ -2,6 +2,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
use Pleroma.Web.ConnCase use Pleroma.Web.ConnCase
import Pleroma.Factory import Pleroma.Factory
alias Pleroma.{User, Repo} alias Pleroma.{User, Repo}
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus.ActivityRepresenter alias Pleroma.Web.OStatus.ActivityRepresenter
test "decodes a salmon", %{conn: conn} do test "decodes a salmon", %{conn: conn} do
...@@ -167,6 +168,32 @@ test "gets a notice in AS2 format", %{conn: conn} do ...@@ -167,6 +168,32 @@ test "gets a notice in AS2 format", %{conn: conn} do
assert json_response(conn, 200) assert json_response(conn, 200)
end end
test "only gets a notice in AS2 format for Create messages", %{conn: conn} do
note_activity = insert(:note_activity)
url = "/notice/#{}"
conn =
|> put_req_header("accept", "application/activity+json")
|> get(url)
assert json_response(conn, 200)
user = insert(:user)
{:ok, like_activity, _} = CommonAPI.favorite(, user)
url = "/notice/#{}"
assert["type"] == "Like"
conn =
|> put_req_header("accept", "application/activity+json")
|> get(url)
assert response(conn, 404)
test "gets an activity in AS2 format", %{conn: conn} do test "gets an activity in AS2 format", %{conn: conn} do
note_activity = insert(:note_activity) note_activity = insert(:note_activity)
[_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/,["id"])) [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/,["id"]))
Markdown is supported
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