Fix activity being rendered within activity due to caching (#11271)

Fix #11270

diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb
index fdedbc9d1f12c34967b61642fc4008ca54c312af..d0edad78682ba3383cd2c252c6a5d4055e4f6e0b 100644 (file)
--- a/app/serializers/activitypub/activity_serializer.rb
+++ b/app/serializers/activitypub/activity_serializer.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::ActivitySerializer < ActivityPub::Serializer
-  cache key: 'activity', expires_in: 3.minutes
-
   attributes :id, :type, :actor, :published, :to, :cc
 
   has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, if: :serialize_object?

diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index ab7be27f6e2f739f6019656efdf68b78bfe54d5d..0644219fb69bf5babc78e725150f70cfa480dc51 100644 (file)
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -3,8 +3,6 @@
 class ActivityPub::ActorSerializer < ActivityPub::Serializer
   include RoutingHelper
 
-  cache key: 'actor', expires_in: 3.minutes
-
   context :security
 
   context_extensions :manually_approves_followers, :featured, :also_known_as,

diff --git a/app/serializers/activitypub/collection_serializer.rb b/app/serializers/activitypub/collection_serializer.rb
index 9dd8134d3ee06735b9244ee598a8b77d19e1c497..da1ba735fc25063c69c83e4aedb88796ce7ed55d 100644 (file)
--- a/app/serializers/activitypub/collection_serializer.rb
+++ b/app/serializers/activitypub/collection_serializer.rb
@@ -7,8 +7,6 @@ class ActivityPub::CollectionSerializer < ActivityPub::Serializer
     super
   end
 
-  cache key: 'collection', expires_in: 3.minutes
-
   attribute :id, if: -> { object.id.present? }
   attribute :type
   attribute :total_items, if: -> { object.size.present? }

diff --git a/app/serializers/activitypub/emoji_serializer.rb b/app/serializers/activitypub/emoji_serializer.rb
index 08df25d7d42740ef9444a8a75f504f74751622a9..4dc38f3ea6e571d6c0d1a362a9f88fb392cf5b90 100644 (file)
--- a/app/serializers/activitypub/emoji_serializer.rb
+++ b/app/serializers/activitypub/emoji_serializer.rb
@@ -3,8 +3,6 @@
 class ActivityPub::EmojiSerializer < ActivityPub::Serializer
   include RoutingHelper
 
-  cache key: 'emoji', expires_in: 3.minutes
-
   context_extensions :emoji
 
   attributes :id, :type, :name, :updated

diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 87acc54292c5bd1c63796abb10db3d67c2a61af0..67f596e78a65042a85821ae7693047dbfefc9e4e 100644 (file)
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::NoteSerializer < ActivityPub::Serializer
-  cache key: 'note', expires_in: 3.minutes
-
   context_extensions :atom_uri, :conversation, :sensitive,
                      :hashtag, :emoji, :focal_point, :blurhash