diff options
| -rw-r--r-- | app/controllers/api_controller.rb | 2 | ||||
| -rw-r--r-- | 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 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? |