discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 11:19:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Use \A and \z instead of ^ and $ in TopicsFilter (#21316)

Browse Source 
`^` and `$` matches per line which is technically not what we want.
This commit is contained in:
Alan Guo Xiang Tan 2023-05-01 07:09:08 +07:00 committed by GitHub
parent 3e50a81d96
commit b06a154bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/topics_filter.rb
View File

@ -114,7 +114,7 @@ class TopicsFilter
private private
YYYY_MM_DD_REGEXP = YYYY_MM_DD_REGEXP =
/^(?<year>[12][0-9]{3})-(?<month>0?[1-9]|1[0-2])-(?<day>0?[1-9]|[12]\d|3[01])$/ /\A(?<year>[12][0-9]{3})-(?<month>0?[1-9]|1[0-2])-(?<day>0?[1-9]|[12]\d|3[01])\z/
private_constant :YYYY_MM_DD_REGEXP private_constant :YYYY_MM_DD_REGEXP
def extract_and_validate_value_for(filter, values) def extract_and_validate_value_for(filter, values)
@ -190,7 +190,7 @@ class TopicsFilter
value value
.scan( .scan(
/^(?<category_slugs>([a-zA-Z0-9\-:]+)(?<delimiter>[,])?([a-zA-Z0-9\-:]+)?(\k<delimiter>[a-zA-Z0-9\-:]+)*)$/, /\A(?<category_slugs>([a-zA-Z0-9\-:]+)(?<delimiter>[,])?([a-zA-Z0-9\-:]+)?(\k<delimiter>[a-zA-Z0-9\-:]+)*)\z/,
) )
.each do |category_slugs, delimiter| .each do |category_slugs, delimiter|
( (
@ -329,7 +329,7 @@ class TopicsFilter
break if key_prefix && key_prefix != "-" break if key_prefix && key_prefix != "-"
value.scan( value.scan(
/^(?<tag_names>([a-zA-Z0-9\-]+)(?<delimiter>[,+])?([a-zA-Z0-9\-]+)?(\k<delimiter>[a-zA-Z0-9\-]+)*)$/, /\A(?<tag_names>([a-zA-Z0-9\-]+)(?<delimiter>[,+])?([a-zA-Z0-9\-]+)?(\k<delimiter>[a-zA-Z0-9\-]+)*)\z/,
) do |tag_names, delimiter| ) do |tag_names, delimiter|
match_all = match_all =
if delimiter == "," if delimiter == ","
@ -456,7 +456,7 @@ class TopicsFilter
} }
private_constant :ORDER_BY_MAPPINGS private_constant :ORDER_BY_MAPPINGS
ORDER_BY_REGEXP = /^(?<order_by>#{ORDER_BY_MAPPINGS.keys.join("|")})(?<asc>-asc)?$/ ORDER_BY_REGEXP = /\A(?<order_by>#{ORDER_BY_MAPPINGS.keys.join("|")})(?<asc>-asc)?\z/
private_constant :ORDER_BY_REGEXP private_constant :ORDER_BY_REGEXP
def order_by(values:) def order_by(values:)