summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJeong Arm <kjwonmail@gmail.com>2022-02-14 08:17:09 +0900
committerGitHub <noreply@github.com>2022-02-14 00:17:09 +0100
commit9a015e43ef173a3afc93cc1d06fd7f76adb8876a (patch)
tree699fb29126eb265245d99dd6938c9f3f977640ac /app
parent901bbf2e5fd83a4aadbb6e28f305e30a952e1939 (diff)
Add `from:` query operator to search syntax (#16526)
* Add 'by:userhandle' parameter to search api * Use search syntax for "by" prefix * Codeclimate * Use 'from' instead of 'by'
Diffstat (limited to 'app')
-rw-r--r--app/lib/search_query_transformer.rb37
1 files changed, 35 insertions, 2 deletions
diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index e07ebfffed7..c685d7b6fd7 100644
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -2,19 +2,21 @@
class SearchQueryTransformer < Parslet::Transform
class Query
- attr_reader :should_clauses, :must_not_clauses, :must_clauses
+ attr_reader :should_clauses, :must_not_clauses, :must_clauses, :filter_clauses
def initialize(clauses)
grouped = clauses.chunk(&:operator).to_h
@should_clauses = grouped.fetch(:should, [])
@must_not_clauses = grouped.fetch(:must_not, [])
@must_clauses = grouped.fetch(:must, [])
+ @filter_clauses = grouped.fetch(:filter, [])
end
def apply(search)
should_clauses.each { |clause| search = search.query.should(clause_to_query(clause)) }
must_clauses.each { |clause| search = search.query.must(clause_to_query(clause)) }
must_not_clauses.each { |clause| search = search.query.must_not(clause_to_query(clause)) }
+ filter_clauses.each { |clause| search = search.filter(**clause_to_filter(clause)) }
search.query.minimum_should_match(1)
end
@@ -30,6 +32,15 @@ class SearchQueryTransformer < Parslet::Transform
raise "Unexpected clause type: #{clause}"
end
end
+
+ def clause_to_filter(clause)
+ case clause
+ when PrefixClause
+ { term: { clause.filter => clause.term } }
+ else
+ raise "Unexpected clause type: #{clause}"
+ end
+ end
end
class Operator
@@ -69,11 +80,33 @@ class SearchQueryTransformer < Parslet::Transform
end
end
+ class PrefixClause
+ attr_reader :filter, :operator, :term
+
+ def initialize(prefix, term)
+ @operator = :filter
+ case prefix
+ when 'from'
+ @filter = :account_id
+ username, domain = term.split('@')
+ account = Account.find_remote(username, domain)
+
+ raise "Account not found: #{term}" unless account
+
+ @term = account.id
+ else
+ raise "Unknown prefix: #{prefix}"
+ end
+ end
+ end
+
rule(clause: subtree(:clause)) do
prefix = clause[:prefix][:term].to_s if clause[:prefix]
operator = clause[:operator]&.to_s
- if clause[:term]
+ if clause[:prefix]
+ PrefixClause.new(prefix, clause[:term].to_s)
+ elsif clause[:term]
TermClause.new(prefix, operator, clause[:term].to_s)
elsif clause[:shortcode]
TermClause.new(prefix, operator, ":#{clause[:term]}:")