From 1eb7318831e7239ec929457f6298fb05cb461b43 Mon Sep 17 00:00:00 2001
From: sxsdv1 <sxsdv1@gmail.com>
Date: Sat, 12 Jan 2019 17:52:30 +0100
Subject: [PATCH] Prepare all types objects before serialising

Activities returned from inbox can include other types of objects like
Article
---
 lib/pleroma/web/activity_pub/transmogrifier.ex |  2 +-
 test/support/factory.ex                        | 25 +++++++++++++++++++++++++
 test/web/activity_pub/transmogrifier_test.exs  | 15 +++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 87b7fc07f..b0f8c59cc 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -641,7 +641,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   #  internal -> Mastodon
   #  """
 
-  def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
+  def prepare_outgoing(%{"type" => "Create", "object" => object} = data) do
     object =
       object
       |> prepare_object
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 57fa4a79d..4ac77981a 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -57,6 +57,11 @@ defmodule Pleroma.Factory do
     %Pleroma.Object{data: Map.merge(data, %{"to" => [user2.ap_id]})}
   end
 
+  def article_factory do
+    note_factory()
+    |> Map.put("type", "Article")
+  end
+
   def tombstone_factory do
     data = %{
       "type" => "Tombstone",
@@ -110,6 +115,26 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def article_activity_factory do
+    article = insert(:article)
+
+    data = %{
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+      "type" => "Create",
+      "actor" => article.data["actor"],
+      "to" => article.data["to"],
+      "object" => article.data,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+      "context" => article.data["context"]
+    }
+
+    %Pleroma.Activity{
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"]
+    }
+  end
+
   def announce_activity_factory do
     note_activity = insert(:note_activity)
     user = insert(:user)
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index a5fd87ed4..65c8ec36d 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -835,6 +835,21 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
       assert is_nil(modified["object"]["announcement_count"])
       assert is_nil(modified["object"]["context_id"])
     end
+
+    test "it strips internal fields of article" do
+      activity = insert(:article_activity)
+
+      {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
+
+      assert length(modified["object"]["tag"]) == 2
+
+      assert is_nil(modified["object"]["emoji"])
+      assert is_nil(modified["object"]["likes"])
+      assert is_nil(modified["object"]["like_count"])
+      assert is_nil(modified["object"]["announcements"])
+      assert is_nil(modified["object"]["announcement_count"])
+      assert is_nil(modified["object"]["context_id"])
+    end
   end
 
   describe "user upgrade" do