diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-10 00:43:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-10 00:43:30 +0200 |
| commit | 6172263a63de2e4b2a2aeb9cb30b387622fdd3d6 (patch) | |
| tree | 442452ce27137554bfc01f47e2b78e5a7f10753c /app | |
| parent | 4e921832272425352d28cad550bfc4dffd6d0e78 (diff) | |
Fix activity being rendered within activity due to caching (#11271)
Fix #11270
Diffstat (limited to 'app')
5 files changed, 0 insertions, 10 deletions
diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb index fdedbc9d1..d0edad786 100644 --- 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 ab7be27f6..0644219fb 100644 --- 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 9dd8134d3..da1ba735f 100644 --- 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 08df25d7d..4dc38f3ea 100644 --- 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 87acc5429..67f596e78 100644 --- 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 |