From 85d89b472dff2c3d06801dbd42f91c325d21a434 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 8 Sep 2016 20:36:01 +0200 Subject: Optimized n+1 queries in accounts Atom and HTML views Added stack trace for SQL queries in development Removed badly thought out accounts/lookup API --- app/helpers/application_helper.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'app/helpers/application_helper.rb') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e0105ee54..e43875544 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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}@#{account.acct}" else m -- cgit