Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature...

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc test/web/activity_pub/activity_pub_test.exs
index d9f00613ad378ef106a278f53932938b6b89dc4c,208cc42d2a094edfa749769ccb055b954d296b57..7735e1bf8334f263f1c49c1cac4155b4daf27697
--- 1/test/web/activity_pub/activity_pub_test.exs
--- 2/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@@ -295,9 -293,8 +295,9 @@@ defmodule Pleroma.Web.ActivityPub.Activ
                 User.ap_followers(user),
                 announce_activity.data["actor"]
               ]
- 
++      
        assert unannounce_activity.data["type"] == "Undo"
-       assert unannounce_activity.data["object"] == announce_activity.data["id"]
+       assert unannounce_activity.data["object"] == announce_activity.data
        assert unannounce_activity.data["actor"] == user.ap_id
        assert unannounce_activity.data["context"] == announce_activity.data["context"]