about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
author839 <8398a7@gmail.com>2017-04-18 22:57:46 +0900
committerEugen <eugen@zeonfederated.com>2017-04-18 15:57:46 +0200
commite2a1b574ab4ec5dd07dbc5c317bcc3718f13c19b (patch)
treea2e265cad28a2d239c6f88a6cf5d6f3cc81426fe /app
parent880590ad0d5ea8553af288bc6ed261d34e712f31 (diff)
Avoid dynamic methods due to processing speed (#2080)
Diffstat (limited to 'app')
-rw-r--r--app/controllers/api_controller.rb2
-rw-r--r--app/models/status.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 478d21bc7..957e3c315 100644
--- 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
index a9b7327c3..2d27a57d5 100644
--- 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?