refactor: invert -> inverte

filter/ruletree/rule/contenttype.go

@@ -6,12 +6,12 @@ import (
 
 type contentTypeModifier struct {
 	contentType string
-	invert      bool
+	inverted    bool
 }
 
 func (m *contentTypeModifier) Parse(modifier string) error {
 	if modifier[0] == '~' {
-		m.invert = true
+		m.inverted = true
 		modifier = modifier[1:]
 	}
 	m.contentType = modifier
@@ -45,12 +45,12 @@ func (m *contentTypeModifier) ShouldMatch(req *http.Request) bool {
 	}
 	contentType, ok := secFetchDestMap[secFetchDest]
 	if m.contentType == "other" {
-		if m.invert {
+		if m.inverted {
 			return ok
 		}
 		return !ok
 	}
-	if m.invert {
+	if m.inverted {
 		return contentType != m.contentType
 	}
 	return contentType == m.contentType

filter/ruletree/rule/domain.go

@@ -42,15 +42,15 @@ func (m *domainModifier) ShouldMatch(req *http.Request) bool {
 }
 
 type domainModifierEntry struct {
-	invert  bool
-	regular string
-	tld     string
-	regex   *regexp.Regexp
+	inverted bool
+	regular  string
+	tld      string
+	regex    *regexp.Regexp
 }
 
 func (m *domainModifierEntry) Parse(entry string) error {
 	if entry[0] == '~' {
-		m.invert = true
+		m.inverted = true
 		entry = entry[1:]
 	}
 	if entry[0] == '/' && entry[len(entry)-1] == '/' {
@@ -76,7 +76,7 @@ func (m *domainModifierEntry) MatchDomain(domain string) bool {
 	} else if m.regex != nil {
 		matches = m.regex.MatchString(domain)
 	}
-	if m.invert {
+	if m.inverted {
 		return !matches
 	}
 	return matches

filter/ruletree/rule/method.go

@@ -37,13 +37,13 @@ func (m *methodModifier) ShouldMatch(req *http.Request) bool {
 }
 
 type methodModifierEntry struct {
-	method string
-	invert bool
+	method   string
+	inverted bool
 }
 
 func (m *methodModifierEntry) Parse(modifier string) error {
 	if modifier[0] == '~' {
-		m.invert = true
+		m.inverted = true
 		modifier = modifier[1:]
 	}
 	m.method = modifier
@@ -52,7 +52,7 @@ func (m *methodModifierEntry) Parse(modifier string) error {
 
 func (m *methodModifierEntry) MatchMethod(method string) bool {
 	if strings.ToLower(method) == m.method {
-		return !m.invert
+		return !m.inverted
 	}
-	return m.invert
+	return m.inverted
 }

filter/ruletree/rule/thirdparty.go

@@ -7,19 +7,19 @@ import (
 
 // https://adguard.com/kb/general/ad-filtering/create-own-filters/#third-party-modifier
 type thirdPartyModifier struct {
-	invert bool
+	inverted bool
 }
 
 func (m *thirdPartyModifier) Parse(modifier string) error {
 	if modifier[0] == '~' {
-		m.invert = true
+		m.inverted = true
 	}
 	return nil
 }
 
 func (m *thirdPartyModifier) ShouldMatch(req *http.Request) bool {
 	if req.Header.Get("Sec-Fetch-Site") == "cross-site" {
-		return !m.invert
+		return !m.inverted
 	}
 	if referer := req.Header.Get("Referer"); referer != "" {
 		host := req.Host
@@ -32,9 +32,9 @@ func (m *thirdPartyModifier) ShouldMatch(req *http.Request) bool {
 		}
 		refererHost := refererURL.Hostname()
 		if strings.HasSuffix(refererHost, host) {
-			return m.invert
+			return m.inverted
 		}
-		return !m.invert
+		return !m.inverted
 	}
 	return false
 }