Skip to content

Commit 452eecc

Browse files
Gargronhiyuki2578
authored andcommitted
Fix unnecessary SQL query performed on unauthenticated requests (mastodon#11179)
1 parent 5a3909a commit 452eecc

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

app/controllers/application_controller.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,15 @@ def use_seamless_external_login?
9191
end
9292

9393
def current_account
94-
@current_account ||= current_user.try(:account)
94+
return @current_account if defined?(@current_account)
95+
96+
@current_account = current_user&.account
9597
end
9698

9799
def current_session
98-
@current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id'])
100+
return @current_session if defined?(@current_session)
101+
102+
@current_session = SessionActivation.find_by(session_id: cookies.signed['_session_id']) if cookies.signed['_session_id'].present?
99103
end
100104

101105
def current_theme

0 commit comments

Comments
 (0)