mastofe

commit: e2a1b574ab4ec5dd07dbc5c317bcc3718f13c19b
parent: 880590ad0d5ea8553af288bc6ed261d34e712f31
Author: 839 <8398a7@gmail.com>
Date:   Tue, 18 Apr 2017 22:57:46 +0900

Avoid dynamic methods due to processing speed (#2080)


Diffstat:
M
app/controllers/api_controller.rb
2
+-
M
app/models/status.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
diff --git 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?