Refactor controllers for statuses, accounts, and more (#11249)

2019-07-08 12:03:45 +02:00
parent f14776475d
commit 63c7fe8e48
41 changed files with 299 additions and 289 deletions
--- 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