From 9c42453e068b683517f6a72602c08527222f8fea Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 3 May 2017 09:54:17 +0200
Subject: [PATCH] Return note objects as ostatus post activities.
---
lib/pleroma/web/activity_pub/activity_pub.ex | 2 +-
lib/pleroma/web/ostatus/ostatus_controller.ex | 15 +++++++++++++++
lib/pleroma/web/router.ex | 4 +++-
test/web/ostatus/ostatus_controller_test.exs | 12 ++++++++++++
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 12d6912df..194a5ec3d 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -126,7 +126,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
def generate_object_id do
- generate_id("objects")
+ Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :object, Ecto.UUID.generate)
end
def generate_id(type) do
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 1c609f6f2..6a4199846 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -41,4 +41,19 @@ defmodule Pleroma.Web.OStatus.OStatusController do
conn
|> send_resp(200, "")
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])
+ |> :xmerl.export_simple(:xmerl_xml)
+ |> to_string
+
+ conn
+ |> put_resp_content_type("application/atom+xml")
+ |> send_resp(200, response)
+ end
end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index b0c1dcd91..ac9d97e0f 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -73,6 +73,8 @@ defmodule Pleroma.Web.Router do
scope "/", Pleroma.Web do
pipe_through :ostatus
+ get "/objects/:uuid", OStatus.OStatusController, :object
+
get "/users/:nickname/feed", OStatus.OStatusController, :feed
get "/users/:nickname", OStatus.OStatusController, :feed_redirect
post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming
@@ -96,5 +98,5 @@ end
defmodule Fallback.RedirectController do
use Pleroma.Web, :controller
- def redirector(conn, _params), do: send_file(conn, 200, "priv/static/index.html")
+ def redirector(conn, _params), do: (if Mix.env != :test, do: send_file(conn, 200, "priv/static/index.html"))
end
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index 229cd9b1e..f07698747 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -12,4 +12,16 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
assert response(conn, 200)
end
+
+ 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)
+
+ assert response(conn, 200)
+ end
end
--
2.49.0