From b8521f050aae48de301ed2344afa420df419c1d9 Mon Sep 17 00:00:00 2001
From: Paul <paul@paulbsd.com>
Date: Wed, 17 Jul 2024 23:12:44 +0200
Subject: [PATCH] updated ipbl

* added version in user agent
* lint code
* removed compat with config v2
---
 src/database/main.go | 5 +++--
 src/models/ip.go     | 6 +++---
 src/routers/funcs.go | 6 +-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/database/main.go b/src/database/main.go
index ae0ba68..ce2c863 100644
--- a/src/database/main.go
+++ b/src/database/main.go
@@ -65,8 +65,9 @@ func migrate(cfg *config.Config) (err error) {
 		for _, v := range rs {
 			if v != "" {
 				n := models.CfgExpr{
-					Expr: v,
-					Set:  &cfgset,
+					Expr:    v,
+					Set:     &cfgset,
+					Enabled: true,
 				}
 				cfg.Db.Insert(&n)
 			}
diff --git a/src/models/ip.go b/src/models/ip.go
index 1c8a920..d401aa8 100644
--- a/src/models/ip.go
+++ b/src/models/ip.go
@@ -157,7 +157,7 @@ func ScanOrphan(wg *sync.WaitGroup, orphans chan IP, thr int, cfg *config.Config
 				log.Println(err)
 			}
 			var query QueryIP
-			query, err := QueryInfo(&queryclient, orphan.IP)
+			query, err := QueryInfo(cfg, &queryclient, orphan.IP)
 			if err != nil {
 				log.Println(err)
 				time.Sleep(1 * time.Minute)
@@ -200,14 +200,14 @@ func ScanOrphan(wg *sync.WaitGroup, orphans chan IP, thr int, cfg *config.Config
 	return nil
 }
 
-func QueryInfo(client *http.Client, ip string) (query QueryIP, err error) {
+func QueryInfo(cfg *config.Config, client *http.Client, ip string) (query QueryIP, err error) {
 	var url = fmt.Sprintf("%s/%s", IPINFO_WS, ip)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		log.Println(err)
 	}
 	req.Header.Add("Accept", "*/*")
-	req.Header.Add("User-Agent", "ipbl")
+	req.Header.Add("User-Agent", fmt.Sprintf("ipbl %s", cfg.Options.Version))
 	res, err := client.Do(req)
 	if err != nil {
 		log.Println(err)
diff --git a/src/routers/funcs.go b/src/routers/funcs.go
index b0c3f4d..342623c 100644
--- a/src/routers/funcs.go
+++ b/src/routers/funcs.go
@@ -117,11 +117,7 @@ func RegisterRoutes(e *echo.Echo, ctx *context.Context, cfg *config.Config) {
 		return Result(c, err, "")
 	})
 	e.GET("/config", func(c echo.Context) (err error) {
-		if c.QueryParam("v") == "2" {
-			globalconfig, err := models.GetAllConfigv2(cfg)
-			return Result(c, err, globalconfig)
-		}
-		globalconfig, err := models.GetGlobalConfig(cfg)
+		globalconfig, err := models.GetAllConfigv2(cfg)
 		return Result(c, err, globalconfig)
 	})
 	e.GET("/config/trustlist", func(c echo.Context) (err error) {