3 files changed, 13 insertions, 12 deletions
diff --git a/app/helpers/api/accounts/lookup_helper.rb b/app/helpers/api/accounts/lookup_helper.rb
deleted file mode 100644
index 5caf0e28c..000000000
--- a/app/helpers/api/accounts/lookup_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Api::Accounts::LookupHelper
-end
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}<a href=\"#{url_for_target(account)}\" class=\"mention\">@<span>#{account.acct}</span></a>"
       else
         m
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index a29014d1b..ce77206ea 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -21,11 +21,11 @@ module StreamEntriesHelper
   end
 
   def reblogged_by_me_class(status)
-    user_signed_in? && current_user.account.reblogged?(status) ? 'reblogged' : ''
+    user_signed_in? && @reblogged.has_key?(status.id) ? 'reblogged' : ''
   end
 
   def favourited_by_me_class(status)
-    user_signed_in? && current_user.account.favourited?(status) ? 'favourited' : ''
+    user_signed_in? && @favourited.has_key?(status.id) ? 'favourited' : ''
   end
 
   def proper_status(status)