about summary refs log tree commit diff
path: root/app/controllers/api/v1/custom_emojis_controller.rb
diff options
context:
space:
mode:
authorpluralcafe-docker <git@plural.cafe>2019-01-12 04:24:01 +0000
committerpluralcafe-docker <git@plural.cafe>2019-01-12 04:24:01 +0000
commita6e0ff72f552dc172c18f5a10bbca071b067ab51 (patch)
treef845d5a7e328c3babfde43066325262c1dbdbed0 /app/controllers/api/v1/custom_emojis_controller.rb
parent74134e490c49d8a7d88cc69720e22cd88cee9233 (diff)
parent2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/api/v1/custom_emojis_controller.rb')
-rw-r--r--app/controllers/api/v1/custom_emojis_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index f8cd64455..7bac27da4 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -4,6 +4,8 @@ class Api::V1::CustomEmojisController < Api::BaseController
   respond_to :json
 
   def index
-    render json: CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer
+    render_cached_json('api:v1:custom_emojis', expires_in: 1.minute) do
+      ActiveModelSerializers::SerializableResource.new(CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer)
+    end
   end
 end