Avoid dynamic methods due to processing speed (#2080)

2017-04-18 22:57:46 +09:00
parent 880590ad0d
commit e2a1b574ab
2 changed files with 2 additions and 2 deletions
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@ -73,7 +73,7 @@ class ApiController < ApplicationController
  end

  def current_user
-    super || current_resource_owner
+    current_resource_owner || super
  rescue ActiveRecord::RecordNotFound
    nil
  end
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -42,7 +42,7 @@ class Status < ApplicationRecord
  cache_associated :account, :application, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :application, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account

  def reply?
-    super || !in_reply_to_id.nil?
+    !in_reply_to_id.nil? || super
  end

  def local?