From a8c6443c461678982c39f5a3044c8390e99e83b3 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 5 Jul 2026 12:11:48 -0400 Subject: [PATCH] internal/routing/sanitizer: use strings.CutPrefix and SplitSeq --- internal/routing/sanitizer.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/routing/sanitizer.go b/internal/routing/sanitizer.go index 3d9b6f5..248c8fc 100644 --- a/internal/routing/sanitizer.go +++ b/internal/routing/sanitizer.go @@ -56,9 +56,9 @@ func parseRule(line string) (adGuardRule, bool) { } rule := adGuardRule{} - if strings.HasPrefix(line, "@@") { + if rest, ok := strings.CutPrefix(line, "@@"); ok { rule.isException = true - line = line[2:] + line = rest } parts := strings.Split(line, "$") @@ -75,10 +75,8 @@ func parseRule(line string) (adGuardRule, bool) { } if len(parts) > 1 { - options := strings.Split(parts[1], ",") - for _, opt := range options { - if strings.HasPrefix(opt, "removeparam=") { - paramValue := strings.TrimPrefix(opt, "removeparam=") + for opt := range strings.SplitSeq(parts[1], ",") { + if paramValue, ok := strings.CutPrefix(opt, "removeparam="); ok { if strings.HasPrefix(paramValue, "/") && strings.HasSuffix(paramValue, "/") { if re, err := regexp.Compile("(?i)" + paramValue[1:len(paramValue)-1]); err == nil { rule.parameterRegex = re -- 2.51.2