From 93151f0c51a0418cd51e270a0834c92a771910ab Mon Sep 17 00:00:00 2001
From: "Holly \"Frinkeldoodle\" Lotor" <admin@frinkel.tech>
Date: Fri, 17 Jan 2020 07:07:03 +0000
Subject: Port render_with_cache, CacheConcern from upstream

---
 app/controllers/activitypub/collections_controller.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'app/controllers/activitypub/collections_controller.rb')

diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index e2274ee1a..cd23506f3 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -9,14 +9,8 @@ class ActivityPub::CollectionsController < Api::BaseController
   before_action :set_cache_headers
 
   def show
-    render_cached_json(['activitypub', 'collection', @account, params[:id]], content_type: 'application/activity+json') do
-      ActiveModelSerializers::SerializableResource.new(
-        collection_presenter,
-        serializer: ActivityPub::CollectionSerializer,
-        adapter: ActivityPub::Adapter,
-        skip_activities: true
-      )
-    end
+    expires_in 3.minutes
+    render_with_cache json: collection_presenter, content_type: 'application/activity+json', serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, skip_activities: true
   end
 
   private
-- 
cgit