Merge branch 'main' into glitch-soc/merge-upstream

2022-02-11 21:53:20 +01:00
parent 776e337b8d d0fcf07436
commit 51cad4f7fb
246 changed files with 10476 additions and 5605 deletions
--- a/app/serializers/activitypub/undo_announce_serializer.rb
+++ b/app/serializers/activitypub/undo_announce_serializer.rb
@ -22,6 +22,6 @@ class ActivityPub::UndoAnnounceSerializer < ActivityPub::Serializer
  end

  def virtual_object
-    ActivityPub::ActivityPresenter.from_status(object)
+    ActivityPub::ActivityPresenter.from_status(object, allow_inlining: false)
  end
 end