From d3f0a7394f4ddd63d4e3a9e5e4181f97d4b2b284 Mon Sep 17 00:00:00 2001 From: xmdhs Date: Mon, 4 Dec 2023 19:21:55 +0800 Subject: [PATCH] fix struct --- adguardsdnsfilter.go | 13 +++++++------ ruleset.go | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/adguardsdnsfilter.go b/adguardsdnsfilter.go index 645496c..dfaec83 100644 --- a/adguardsdnsfilter.go +++ b/adguardsdnsfilter.go @@ -73,13 +73,14 @@ func adguard(ctx context.Context, c *http.Client) (*Ruleset, error) { r := Ruleset{} r.Version = 1 - r.Rules = map[string][]string{ - "domain": lo.Keys(domain), - "domain_suffix": lo.Keys(domainSuffix), - "domain_regex": lo.Keys(domainRegex), - "domain_keyword": lo.Keys(domainKeyword), + r.Rules = []map[string][]any{ + { + "domain": lo.Map[string, any](lo.Keys(domain), func(item string, index int) any { return item }), + "domain_suffix": lo.Map[string, any](lo.Keys(domainSuffix), func(item string, index int) any { return item }), + "domain_regex": lo.Map[string, any](lo.Keys(domainRegex), func(item string, index int) any { return item }), + "domain_keyword": lo.Map[string, any](lo.Keys(domainKeyword), func(item string, index int) any { return item }), + }, } - return &r, nil } diff --git a/ruleset.go b/ruleset.go index 786c2f0..fb55b32 100644 --- a/ruleset.go +++ b/ruleset.go @@ -1,6 +1,6 @@ package main type Ruleset struct { - Rules map[string][]string `json:"rules"` - Version int `json:"version"` + Rules []map[string][]any `json:"rules"` + Version int `json:"version"` }