Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Optimized n+1 queries in accounts Atom and HTML views

Browse source 
Added stack trace for SQL queries in development
Removed badly thought out accounts/lookup API
This commit is contained in:
Eugen Rochko 2016-09-08 20:36:01 +02:00
parent a4cc966476
commit 85d89b472d
13 changed files with 44 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/helpers/application_helper.rb
View file

@ -22,23 +22,26 @@ module ApplicationHelper
def account_from_mentions(search_string, mentions)
mentions.each { |x| return x.account if x.account.acct.eql?(search_string) }
nil
# If that was unsuccessful, try fetching user from db separately
# But this shouldn't ever happen if the mentions were created correctly!
username, domain = search_string.split('@')
# username, domain = search_string.split('@')
if domain == Rails.configuration.x.local_domain
account = Account.find_local(username)
else
account = Account.find_remote(username, domain)
end
# if domain == Rails.configuration.x.local_domain
# account = Account.find_local(username)
# else
# account = Account.find_remote(username, domain)
# end
account
# account
end
def linkify(status)
auto_link(HTMLEntities.new.encode(status.text), link: :urls, html: { rel: 'nofollow noopener' }).gsub(Account::MENTION_RE) do |m|
if account = account_from_mentions(Account::MENTION_RE.match(m)[1], status.mentions)
account = account_from_mentions(Account::MENTION_RE.match(m)[1], status.mentions)
unless account.nil?
"#{m.split('@').first}<a href=\"#{url_for_target(account)}\" class=\"mention\">@<span>#{account.acct}</span></a>"
else
m