mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-25 08:13:24 +00:00
Fix activity being rendered within activity due to caching (#11271)
Fix #11270
This commit is contained in:
parent
4e92183227
commit
6172263a63
|
@ -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?
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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? }
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue