mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 00:15:05 +00:00
012537452a
* Fix error responses in `from` search prefix (addresses mastodon/mastodon#17941) Using unsupported prefixes now reports a 422; searching for posts from an account the instance is not aware of reports a 404. TODO: The UI for this on the front end is abysmal. Searching `from:username@domain` now succeeds when `domain` is the local domain; searching `from:@username(@domain)?` now works as expected. * Remove unused methods on new Error classes as they are not being used Currently when `raise`d there are error messages being supplied, but this is not actually being used. The associated `raise`s have been edited accordingly. * Remove needless comments * Satisfy rubocop * Try fixing tests being unable to find AccountFindingConcern methods * Satisfy rubocop * Simplify `from` prefix logic This incorporates @ClearlyClaire's suggestion (see https://github.com/mastodon/mastodon/pull/17963#pullrequestreview-933986737). Accepctable account strings in `from:` clauses are more lenient than before this commit; for example, `from:@user@example.org@asnteo +cat` will not error, and return posts by @user@example.org containing the word "cat". This is more consistent with how Mastodon matches mentions in statuses. In addition, `from` clauses will not be checked for syntatically invalid usernames or domain names, simply 404ing when `Account.find_remote!` raises ActiveRecord::NotFound. New code for this PR that is no longer used has been removed.
122 lines
3.3 KiB
Ruby
122 lines
3.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class SearchQueryTransformer < Parslet::Transform
|
|
class Query
|
|
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
|
|
|
|
private
|
|
|
|
def clause_to_query(clause)
|
|
case clause
|
|
when TermClause
|
|
{ multi_match: { type: 'most_fields', query: clause.term, fields: ['text', 'text.stemmed'] } }
|
|
when PhraseClause
|
|
{ match_phrase: { text: { query: clause.phrase } } }
|
|
else
|
|
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
|
|
class << self
|
|
def symbol(str)
|
|
case str
|
|
when '+'
|
|
:must
|
|
when '-'
|
|
:must_not
|
|
when nil
|
|
:should
|
|
else
|
|
raise "Unknown operator: #{str}"
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
class TermClause
|
|
attr_reader :prefix, :operator, :term
|
|
|
|
def initialize(prefix, operator, term)
|
|
@prefix = prefix
|
|
@operator = Operator.symbol(operator)
|
|
@term = term
|
|
end
|
|
end
|
|
|
|
class PhraseClause
|
|
attr_reader :prefix, :operator, :phrase
|
|
|
|
def initialize(prefix, operator, phrase)
|
|
@prefix = prefix
|
|
@operator = Operator.symbol(operator)
|
|
@phrase = phrase
|
|
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.gsub(/\A@/, '').split('@')
|
|
domain = nil if TagManager.instance.local_domain?(domain)
|
|
account = Account.find_remote!(username, domain)
|
|
|
|
@term = account.id
|
|
else
|
|
raise Mastodon::SyntaxError
|
|
end
|
|
end
|
|
end
|
|
|
|
rule(clause: subtree(:clause)) do
|
|
prefix = clause[:prefix][:term].to_s if clause[:prefix]
|
|
operator = clause[:operator]&.to_s
|
|
|
|
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]}:")
|
|
elsif clause[:phrase]
|
|
PhraseClause.new(prefix, operator, clause[:phrase].is_a?(Array) ? clause[:phrase].map { |p| p[:term].to_s }.join(' ') : clause[:phrase].to_s)
|
|
else
|
|
raise "Unexpected clause type: #{clause}"
|
|
end
|
|
end
|
|
|
|
rule(query: sequence(:clauses)) { Query.new(clauses) }
|
|
end
|