Case-insensitive search by usernames

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index f4073d09360ec943178f14d27b3eea6756a0d589..162e85dec0df84fb4da242747b5103baa3def04e 100644 (file)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -29,7 +29,7 @@ class AccountsController < ApplicationController
   private
 
   def set_account
-    @account = Account.find_by!(username: params[:username], domain: nil)
+    @account = Account.find_local!(params[:username])
   end
 
   def set_webfinger_header

diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index cbf7bfdff5bdb5212b678b247514a10d16849a60..1e50d3b60ae58def3485f310546da091e6c7f5d1 100644 (file)
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -16,7 +16,7 @@ class StreamEntriesController < ApplicationController
   private
 
   def set_account
-    @account = Account.find_by!(username: params[:account_username], domain: nil)
+    @account = Account.find_local!(params[:account_username])
   end
 
   def set_stream_entry

diff --git a/app/models/account.rb b/app/models/account.rb
index af8b6cc3d44ae2b253248a7b51e5df8f60d91d08..bcd6c1eba656220f82e7bd7f85adba46053aea90 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -96,8 +96,12 @@ class Account < ApplicationRecord
   end
 
   def self.find_local!(username)
+    self.find_remote!(username, nil)
+  end
+
+  def self.find_remote!(username, domain)
     table = self.arel_table
-    self.where(table[:username].matches(username)).where(domain: nil).take!
+    self.where(table[:username].matches(username)).where(domain: domain).take!
   end
 
   def self.find_local(username)
@@ -106,6 +110,12 @@ class Account < ApplicationRecord
     nil
   end
 
+  def self.find_remote(username, domain)
+    self.find_remote!(username, domain)
+  rescue ActiveRecord::RecordNotFound
+    nil
+  end
+
   before_create do
     if local?
       keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 1024 : 2048)

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index aec150a9481aeda0835b839b282b9106ea175778..288f56be40592aae62b6bc4b4d37f459f00a0361 100644 (file)
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -8,7 +8,7 @@ class ProcessMentionsService < BaseService
 
     status.text.scan(Account::MENTION_RE).each do |match|
       username, domain  = match.first.split('@')
-      mentioned_account = Account.find_by(username: username, domain: domain)
+      mentioned_account = Account.find_remote(username, domain)
 
       if mentioned_account.nil? && !domain.nil?
         mentioned_account = follow_remote_account_service.("#{match.first}")