diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 19:56:38 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 19:56:38 +0100 |
| commit | 08faeedff7838e339488cfcddf02d95241557ffb (patch) | |
| tree | f7f2fd55bf288b5380732b03460750e2ba519ec1 /app/models/account.rb | |
| parent | 22e06a4077bef6317e72385a05052105f3804d68 (diff) | |
| parent | d6ed2eb512f09600d7cd8150bb9b547442a9d68b (diff) | |
Merge branch 'feature-omnisearch'
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index c0cd2ff64..6968607a2 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -222,8 +222,9 @@ SQL end def search_for(terms, limit = 10) + terms = Arel.sql(connection.quote(terms.gsub(/['?\\:]/, ' '))) 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\', \'\'\' \' || ? || \' \'\'\' || \':*\')' + query = 'to_tsquery(\'simple\', \'\'\' \' || ' + terms + ' || \' \'\'\' || \':*\')' sql = <<SQL SELECT @@ -235,12 +236,13 @@ SQL LIMIT ? SQL - Account.find_by_sql([sql, terms, terms, limit]) + Account.find_by_sql([sql, limit]) end def advanced_search_for(terms, account, limit = 10) + terms = Arel.sql(connection.quote(terms.gsub(/['?\\:]/, ' '))) 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\', \'\'\' \' || ? || \' \'\'\' || \':*\')' + query = 'to_tsquery(\'simple\', \'\'\' \' || ' + terms + ' || \' \'\'\' || \':*\')' sql = <<SQL SELECT @@ -254,7 +256,7 @@ SQL LIMIT ? SQL - Account.find_by_sql([sql, terms, account.id, account.id, terms, limit]) + Account.find_by_sql([sql, account.id, account.id, limit]) end def following_map(target_account_ids, account_id) |