diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 03:34:58 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 03:34:58 +0100 |
| commit | acfee0945cb2b552be71e7c33b437ca6e8e8d988 (patch) | |
| tree | 3231f9e1a226ecaaa1de531cfae4f91ca320c0b7 /app | |
| parent | 05cf086766396745219582951f9b792ac5ed2bfb (diff) | |
| parent | 8aae42f3d8033d4a71774127a3e1a60013a54196 (diff) | |
Merge branch 'master' into feature-omnisearch
this merge is necessary,
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/components/locales/de.jsx | 2 | ||||
| -rw-r--r-- | app/models/account.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/components/locales/de.jsx b/app/assets/javascripts/components/locales/de.jsx index 7d32824f1..882c31fa7 100644 --- a/app/assets/javascripts/components/locales/de.jsx +++ b/app/assets/javascripts/components/locales/de.jsx @@ -39,7 +39,7 @@ const en = { "tabs_bar.public": "Gesamtes Netz", "tabs_bar.notifications": "Mitteilungen", "compose_form.placeholder": "Worüber möchstest du schreiben?", - "compose_form.publish": "Veröffentlichen", + "compose_form.publish": "Tröt", "compose_form.sensitive": "Medien als sensitiv markieren", "compose_form.unlisted": "Öffentlich nicht auflisten", "compose_form.private": "Als privat markieren", diff --git a/app/models/account.rb b/app/models/account.rb index c35620812..c0cd2ff64 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -187,7 +187,7 @@ class Account < ApplicationRecord def find_remote!(username, domain) return if username.blank? - where(arel_table[:username].matches(username.gsub(/[%_]/, '\\\\\0'))).where(domain.nil? ? { domain: nil } : arel_table[:domain].matches(domain.gsub(/[%_]/, '\\\\\0'))).take! + where('lower(accounts.username) = ?', username.downcase).where(domain.nil? ? { domain: nil } : 'lower(accounts.domain) = ?', domain&.downcase).take! end def find_local(username) @@ -239,8 +239,8 @@ SQL end def advanced_search_for(terms, account, limit = 10) - textsearch = '(setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\'))' - query = 'to_tsquery(\'simple\', \'\'\' \' || ? || \' \'\'\' || \':*\')' + textsearch = '(setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\'))' + query = 'to_tsquery(\'simple\', \'\'\' \' || ? || \' \'\'\' || \':*\')' sql = <<SQL SELECT |