From a0fa68845188c426c58f8d35d8c42ea814b7cfef Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Thu, 16 Oct 2025 23:12:27 +0200
Subject: [PATCH] ip/resolver: move decoders into sub package

---
 ip/resolver/{ => decoder}/jsonip.go | 4 ++--
 ip/resolver/{ => decoder}/myip.go   | 4 ++--
 ip/resolver/manager.go              | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename ip/resolver/{ => decoder}/jsonip.go (75%)
 rename ip/resolver/{ => decoder}/myip.go (80%)

diff --git a/ip/resolver/jsonip.go b/ip/resolver/decoder/jsonip.go
similarity index 75%
rename from ip/resolver/jsonip.go
rename to ip/resolver/decoder/jsonip.go
index 4e1f87e..3b5b850 100644
--- a/ip/resolver/jsonip.go
+++ b/ip/resolver/decoder/jsonip.go
@@ -1,11 +1,11 @@
-package resolver
+package decoder
 
 import (
 	"encoding/json"
 	"io"
 )
 
-func JsonipDecoder(r io.Reader) ([]byte, error) {
+func Jsonip(r io.Reader) ([]byte, error) {
 	var v struct {
 		Ip       string `json:"ip"`
 		Location string `json:"geo-ip"`
diff --git a/ip/resolver/myip.go b/ip/resolver/decoder/myip.go
similarity index 80%
rename from ip/resolver/myip.go
rename to ip/resolver/decoder/myip.go
index b7b912d..d820a48 100644
--- a/ip/resolver/myip.go
+++ b/ip/resolver/decoder/myip.go
@@ -1,11 +1,11 @@
-package resolver
+package decoder
 
 import (
 	"encoding/json"
 	"io"
 )
 
-func MyIPDecoder(r io.Reader) ([]byte, error) {
+func MyIP(r io.Reader) ([]byte, error) {
 	var v struct {
 		Ip      string `json:"ip"`
 		Country string `json:"country"`
diff --git a/ip/resolver/manager.go b/ip/resolver/manager.go
index 347f143..2190617 100644
--- a/ip/resolver/manager.go
+++ b/ip/resolver/manager.go
@@ -3,6 +3,7 @@ package resolver
 import (
 	"net/http"
 
+	"dnsupdater/ip/resolver/decoder"
 	httpres "dnsupdater/ip/resolver/http"
 )
 
@@ -25,7 +26,7 @@ func init() {
 	Provide(&httpres.Service{
 		ServiceName: "jsonip",
 		Url:         "https://jsonip.com",
-		Decoder:     JsonipDecoder,
+		Decoder:     decoder.Jsonip,
 	})
 
 	Provide(&httpres.Service{
@@ -59,6 +60,6 @@ func init() {
 	Provide(&httpres.Service{
 		ServiceName: "myip",
 		Url:         "https://api.myip.com",
-		Decoder:     MyIPDecoder,
+		Decoder:     decoder.MyIP,
 	})
 }