IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

PERF: Avoid additional database query when viewing own user. (#14239)

Browse Source
This commit is contained in:
Alan Guo Xiang Tan 2021-09-06 10:38:07 +08:00 committed by GitHub
parent b09688a153
commit 1937474e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@ -534,11 +534,16 @@ class ApplicationController < ActionController::Base
opts ||= {} opts ||= {}
user = if params[:username] user = if params[:username]
username_lower = params[:username].downcase.chomp('.json') username_lower = params[:username].downcase.chomp('.json')
if current_user && current_user.username_lower == username_lower
current_user
else
find_opts = { username_lower: username_lower } find_opts = { username_lower: username_lower }
find_opts[:active] = true unless opts[:include_inactive] || current_user.try(:staff?) find_opts[:active] = true unless opts[:include_inactive] || current_user.try(:staff?)
result = User result = User
(result = result.includes(*eager_load)) if !eager_load.empty? (result = result.includes(*eager_load)) if !eager_load.empty?
result.find_by(find_opts) result.find_by(find_opts)
end
elsif params[:external_id] elsif params[:external_id]
external_id = params[:external_id].chomp('.json') external_id = params[:external_id].chomp('.json')
if provider_name = params[:external_provider] if provider_name = params[:external_provider]