diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-08 12:03:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 12:03:45 +0200 |
| commit | 63c7fe8e4892b22e80c015bf0ecb04496318623b (patch) | |
| tree | c724cb6e1006dbd1d5cccd3719d096ff62124644 /app/controllers/emojis_controller.rb | |
| parent | f14776475d285bb7d2831a20192c1611c733f410 (diff) | |
Refactor controllers for statuses, accounts, and more (#11249)
Diffstat (limited to 'app/controllers/emojis_controller.rb')
| -rw-r--r-- | app/controllers/emojis_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb index 3feb08132..fe4c19cad 100644 --- a/app/controllers/emojis_controller.rb +++ b/app/controllers/emojis_controller.rb @@ -7,9 +7,8 @@ class EmojisController < ApplicationController def show respond_to do |format| format.json do - render_cached_json(['activitypub', 'emoji', @emoji], content_type: 'application/activity+json') do - ActiveModelSerializers::SerializableResource.new(@emoji, serializer: ActivityPub::EmojiSerializer, adapter: ActivityPub::Adapter) - end + expires_in 3.minutes, public: true + render json: @emoji, content_type: 'application/activity+json', serializer: ActivityPub::EmojiSerializer, adapter: ActivityPub::Adapter end end end |