Make outbound transmogrifier aware of edit history

2 files changed, 60 insertions, 32 deletions

diff --git a/test/pleroma/web/activity_pub/transmogrifier_test.exs b/test/pleroma/web/activity_pub/transmogrifier_test.exs
index dae07cf21..6520eabc9 100644
--- a/test/pleroma/web/activity_pub/transmogrifier_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier_test.exs
@@ -312,6 +312,28 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
 
       assert url == "http://localhost:4001/emoji/dino%20walking.gif"
     end
+
+    test "Updates of Notes are handled" do
+      user = insert(:user)
+
+      {:ok, activity} = CommonAPI.post(user, %{status: "everybody do the dinosaur :dinosaur:"})
+      {:ok, update} = CommonAPI.update(user, activity, %{status: "mew mew :blank:"})
+
+      {:ok, prepared} = Transmogrifier.prepare_outgoing(update.data)
+
+      assert %{
+               "content" => "mew mew :blank:",
+               "tag" => [%{"name" => ":blank:", "type" => "Emoji"}],
+               "formerRepresentations" => %{
+                 "orderedItems" => [
+                   %{
+                     "content" => "everybody do the dinosaur :dinosaur:",
+                     "tag" => [%{"name" => ":dinosaur:", "type" => "Emoji"}]
+                   }
+                 ]
+               }
+             } = prepared["object"]
+    end
   end
 
   describe "user upgrade" do
@@ -576,57 +598,42 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
     end
   end
 
-  describe "strip_internal_fields/1" do
-    test "it strips internal fields in formerRepresentations" do
+  describe "prepare_object/1" do
+    test "it processes history" do
       original = %{
         "formerRepresentations" => %{
           "orderedItems" => [
-            %{"generator" => %{}}
+            %{
+              "generator" => %{},
+              "emoji" => %{"blobcat" => "http://localhost:4001/emoji/blobcat.png"}
+            }
           ]
         }
       }
 
-      stripped = Transmogrifier.strip_internal_fields(original)
-
-      refute Map.has_key?(
-               Enum.at(stripped["formerRepresentations"]["orderedItems"], 0),
-               "generator"
-             )
-    end
+      processed = Transmogrifier.prepare_object(original)
 
-    test "it strips internal fields in maybe badly-formed formerRepresentations" do
-      original = %{
-        "formerRepresentations" => %{
-          "orderedItems" => [
-            %{"generator" => %{}},
-            "https://example.com/1"
-          ]
-        }
-      }
+      history_item = Enum.at(processed["formerRepresentations"]["orderedItems"], 0)
 
-      stripped = Transmogrifier.strip_internal_fields(original)
+      refute Map.has_key?(history_item, "generator")
 
-      refute Map.has_key?(
-               Enum.at(stripped["formerRepresentations"]["orderedItems"], 0),
-               "generator"
-             )
-
-      assert Enum.at(stripped["formerRepresentations"]["orderedItems"], 1) ==
-               "https://example.com/1"
+      assert [%{"name" => ":blobcat:"}] = history_item["tag"]
     end
 
-    test "it ignores if formerRepresentations does not look like an OrderedCollection" do
+    test "it works when there is no or bad history" do
       original = %{
         "formerRepresentations" => %{
           "items" => [
-            %{"generator" => %{}}
+            %{
+              "generator" => %{},
+              "emoji" => %{"blobcat" => "http://localhost:4001/emoji/blobcat.png"}
+            }
           ]
         }
       }
 
-      stripped = Transmogrifier.strip_internal_fields(original)
-
-      assert Map.has_key?(Enum.at(stripped["formerRepresentations"]["items"], 0), "generator")
+      processed = Transmogrifier.prepare_object(original)
+      assert processed["formerRepresentations"] == original["formerRepresentations"]
     end
   end
 end
diff --git a/test/pleroma/web/common_api_test.exs b/test/pleroma/web/common_api_test.exs
index 32d6562d7..842c75e21 100644
--- a/test/pleroma/web/common_api_test.exs
+++ b/test/pleroma/web/common_api_test.exs
@@ -1584,5 +1584,26 @@ defmodule Pleroma.Web.CommonAPITest do
       assert updated_object.data["content"] == "updated 2 :#{emoji2}:"
       assert %{^emoji2 => _} = updated_object.data["emoji"]
     end
+
+    test "updates a post with emoji and federate properly" do
+      [{emoji1, _}, {emoji2, _} | _] = Pleroma.Emoji.get_all()
+
+      user = insert(:user)
+
+      {:ok, activity} =
+        CommonAPI.post(user, %{status: "foo1", spoiler_text: "title 1 :#{emoji1}:"})
+
+      clear_config([:instance, :federating], true)
+
+      with_mock Pleroma.Web.Federator,
+        publish: fn p -> nil end do
+        {:ok, updated} = CommonAPI.update(user, activity, %{status: "updated 2 :#{emoji2}:"})
+
+        assert updated.data["object"]["content"] == "updated 2 :#{emoji2}:"
+        assert %{^emoji2 => _} = updated.data["object"]["emoji"]
+
+        assert called(Pleroma.Web.Federator.publish(updated))
+      end
+    end
   end
 end