diff options
| author | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
| commit | 266540080ef5659060faa7da502123f45bbc04f2 (patch) | |
| tree | 1c34751dd4e199737b7a2a4c511b756760941c52 /app/controllers/emojis_controller.rb | |
| parent | 40fd56351f0a466e0e3785cca4ee27f2a9060e8a (diff) | |
| parent | f1597e1ab90b1fb291f16977877c6ca79bf89676 (diff) | |
Merge branch 'glitch' into production
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 |