Don't mix receiver type

maxmind · Nov 11, 2024 · d9ff683 · d9ff683
1 parent c10b1ab
commit d9ff683
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/client/client.go b/client/client.go
@@ -10,6 +10,8 @@ import (
 // Client downloads GeoIP2 and GeoLite2 MMDB databases.
 //
 // After creation, it is valid for concurrent use.
+//
+//nolint:recvcheck // changing this would be a breaking change.
 type Client struct {
 	accountID  int
 	endpoint   string

diff --git a/internal/geoipupdate/database/reader.go b/internal/geoipupdate/database/reader.go
@@ -23,14 +23,18 @@ type ReadResult struct {
 }
 
 // MarshalJSON is a custom json marshaler that strips out zero time fields.
-func (r ReadResult) MarshalJSON() ([]byte, error) {
+func (r *ReadResult) MarshalJSON() ([]byte, error) {
+	if r == nil {
+		return []byte("null"), nil
+	}
+
 	type partialResult ReadResult
 	s := &struct {
 		partialResult
 		ModifiedAt int64 `json:"modified_at,omitempty"`
 		CheckedAt  int64 `json:"checked_at,omitempty"`
 	}{
-		partialResult: partialResult(r),
+		partialResult: partialResult(*r),
 		ModifiedAt:    0,
 		CheckedAt:     0,
 	}

diff --git a/internal/geoipupdate/geoip_updater_test.go b/internal/geoipupdate/geoip_updater_test.go
@@ -283,7 +283,7 @@ func (w *mockWriter) Write(
 	return nil
 }
 
-func (w mockWriter) GetHash(editionID string) (string, error) {
+func (w *mockWriter) GetHash(editionID string) (string, error) {
 	return w.md5s[editionID], nil
 }