From dbc135a7e466d34ccc88429c0fbf335ba90d5ebf Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Wed, 19 Aug 2026 22:56:46 -0700
Subject: [PATCH 1/2] Deal with new linters

---
 .golangci.yml              |  2 ++
 helpers.go                 |  6 ++++++
 lidarr/downloadclient.go   |  5 ++---
 lidarr/importlist.go       |  5 ++---
 lidarr/indexer.go          |  5 ++---
 prowlarr/app.go            |  4 ++--
 prowlarr/downloadclient.go |  5 ++---
 prowlarr/indexer.go        |  5 ++---
 prowlarr/indexerproxy.go   |  4 ++--
 radarr/downloadclient.go   |  5 ++---
 radarr/importlist.go       |  5 ++---
 radarr/indexer.go          |  5 ++---
 readarr/downloadclient.go  |  5 ++---
 readarr/importlist.go      |  5 ++---
 readarr/indexer.go         |  5 ++---
 sonarr/downloadclient.go   |  5 ++---
 sonarr/importlist.go       |  5 ++---
 sonarr/indexer.go          |  5 ++---
 sonarr/metadata.go         | 14 ++------------
 starrcmd/parser.go         |  2 +-
 20 files changed, 43 insertions(+), 59 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 5b9682b..0d83c74 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,6 +4,7 @@ linters:
   disable:
     - dupl
     - exhaustruct
+    - exhaustruct_v5
     - musttag
     - nlreturn
     - tagliatelle
@@ -40,6 +41,7 @@ linters:
           - funlen
           - gochecknoglobals
           - lll
+          - goconst
           - maintidx
         path: (.+)_test\.go
       - linters:
diff --git a/helpers.go b/helpers.go
index e88feeb..5d9c979 100644
--- a/helpers.go
+++ b/helpers.go
@@ -4,6 +4,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -65,6 +66,11 @@ func Itoa(v int64) string {
 	return Str(v)
 }
 
+// ForceSave returns the query values used by Starr apps to force-save a resource.
+func ForceSave(force bool) url.Values {
+	return url.Values{"forceSave": []string{Str(force)}}
+}
+
 // Str converts numbers and booleans to a string.
 func Str[I int | int64 | float64 | bool](val I) string {
 	const (
diff --git a/lidarr/downloadclient.go b/lidarr/downloadclient.go
index 2d15002..c3c1bc6 100644
--- a/lidarr/downloadclient.go
+++ b/lidarr/downloadclient.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -99,7 +98,7 @@ func (l *Lidarr) AddDownloadClientContext(ctx context.Context,
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpDownloadClient, err)
 	}
 
-	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: starr.ForceSave(true)}
 	if err := l.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -149,7 +148,7 @@ func (l *Lidarr) UpdateDownloadClientContext(ctx context.Context,
 	req := starr.Request{
 		URI:   path.Join(bpDownloadClient, starr.Str(client.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := l.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/lidarr/importlist.go b/lidarr/importlist.go
index 9858f4a..b72eb95 100644
--- a/lidarr/importlist.go
+++ b/lidarr/importlist.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -110,7 +109,7 @@ func (l *Lidarr) AddImportListContext(ctx context.Context, importList *ImportLis
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpImportList, err)
 	}
 
-	req := starr.Request{URI: bpImportList, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpImportList, Body: &body, Query: starr.ForceSave(true)}
 	if err := l.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -161,7 +160,7 @@ func (l *Lidarr) UpdateImportListContext(
 	req := starr.Request{
 		URI:   path.Join(bpImportList, starr.Str(importList.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := l.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/lidarr/indexer.go b/lidarr/indexer.go
index 0010e82..9258311 100644
--- a/lidarr/indexer.go
+++ b/lidarr/indexer.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -120,7 +119,7 @@ func (l *Lidarr) AddIndexerContext(ctx context.Context, indexer *IndexerInput) (
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpIndexer, err)
 	}
 
-	req := starr.Request{URI: bpIndexer, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpIndexer, Body: &body, Query: starr.ForceSave(true)}
 	if err := l.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -145,7 +144,7 @@ func (l *Lidarr) UpdateIndexerContext(ctx context.Context, indexer *IndexerInput
 	req := starr.Request{
 		URI:   path.Join(bpIndexer, starr.Str(indexer.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := l.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/prowlarr/app.go b/prowlarr/app.go
index 8c139fe..ebab155 100644
--- a/prowlarr/app.go
+++ b/prowlarr/app.go
@@ -93,7 +93,7 @@ func (p *Prowlarr) AddApplicationContext(
 	req := starr.Request{
 		URI:   bpApplication,
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(forceSave)}},
+		Query: starr.ForceSave(forceSave),
 	}
 	if err := p.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
@@ -123,7 +123,7 @@ func (p *Prowlarr) UpdateApplicationContext(
 	req := starr.Request{
 		URI:   path.Join(bpApplication, starr.Str(app.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(forceSave)}},
+		Query: starr.ForceSave(forceSave),
 	}
 	if err := p.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/prowlarr/downloadclient.go b/prowlarr/downloadclient.go
index 7450a2c..9dc5d2a 100644
--- a/prowlarr/downloadclient.go
+++ b/prowlarr/downloadclient.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -95,7 +94,7 @@ func (p *Prowlarr) AddDownloadClientContext(ctx context.Context,
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpDownloadClient, err)
 	}
 
-	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: starr.ForceSave(true)}
 	if err := p.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -145,7 +144,7 @@ func (p *Prowlarr) UpdateDownloadClientContext(ctx context.Context,
 	req := starr.Request{
 		URI:   path.Join(bpDownloadClient, starr.Str(client.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := p.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/prowlarr/indexer.go b/prowlarr/indexer.go
index f78131e..831327d 100644
--- a/prowlarr/indexer.go
+++ b/prowlarr/indexer.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 	"time"
 
@@ -160,7 +159,7 @@ func (p *Prowlarr) AddIndexerContext(ctx context.Context, indexer *IndexerInput)
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpIndexer, err)
 	}
 
-	req := starr.Request{URI: bpIndexer, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpIndexer, Body: &body, Query: starr.ForceSave(true)}
 	if err := p.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -189,7 +188,7 @@ func (p *Prowlarr) UpdateIndexerContext(
 	req := starr.Request{
 		URI:   path.Join(bpIndexer, starr.Str(indexer.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := p.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/prowlarr/indexerproxy.go b/prowlarr/indexerproxy.go
index efb5d51..03093a9 100644
--- a/prowlarr/indexerproxy.go
+++ b/prowlarr/indexerproxy.go
@@ -104,7 +104,7 @@ func (p *Prowlarr) AddIndexerProxyContext(
 	req := starr.Request{
 		URI:   bpIndexerProxy,
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(forceSave)}},
+		Query: starr.ForceSave(forceSave),
 	}
 	if err := p.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
@@ -134,7 +134,7 @@ func (p *Prowlarr) UpdateIndexerProxyContext(
 	req := starr.Request{
 		URI:   path.Join(bpIndexerProxy, starr.Str(proxy.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(forceSave)}},
+		Query: starr.ForceSave(forceSave),
 	}
 	if err := p.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/radarr/downloadclient.go b/radarr/downloadclient.go
index 834a686..ba0c66f 100644
--- a/radarr/downloadclient.go
+++ b/radarr/downloadclient.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -99,7 +98,7 @@ func (r *Radarr) AddDownloadClientContext(ctx context.Context,
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpDownloadClient, err)
 	}
 
-	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: starr.ForceSave(true)}
 	if err := r.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -149,7 +148,7 @@ func (r *Radarr) UpdateDownloadClientContext(ctx context.Context,
 	req := starr.Request{
 		URI:   path.Join(bpDownloadClient, starr.Str(client.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := r.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/radarr/importlist.go b/radarr/importlist.go
index 38dc455..b017a89 100644
--- a/radarr/importlist.go
+++ b/radarr/importlist.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 	"strings"
 
@@ -90,7 +89,7 @@ func (r *Radarr) AddImportListContext(ctx context.Context, list *ImportListInput
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpImportList, err)
 	}
 
-	req := starr.Request{URI: bpImportList, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpImportList, Body: &body, Query: starr.ForceSave(true)}
 	if err := r.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -164,7 +163,7 @@ func (r *Radarr) UpdateImportListContext(
 	req := starr.Request{
 		URI:   path.Join(bpImportList, starr.Str(importList.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := r.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/radarr/indexer.go b/radarr/indexer.go
index 5ba20ea..09f73f9 100644
--- a/radarr/indexer.go
+++ b/radarr/indexer.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -122,7 +121,7 @@ func (r *Radarr) AddIndexerContext(ctx context.Context, indexer *IndexerInput) (
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpIndexer, err)
 	}
 
-	req := starr.Request{URI: bpIndexer, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpIndexer, Body: &body, Query: starr.ForceSave(true)}
 	if err := r.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -147,7 +146,7 @@ func (r *Radarr) UpdateIndexerContext(ctx context.Context, indexer *IndexerInput
 	req := starr.Request{
 		URI:   path.Join(bpIndexer, starr.Str(indexer.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := r.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/readarr/downloadclient.go b/readarr/downloadclient.go
index f44783c..930e6a4 100644
--- a/readarr/downloadclient.go
+++ b/readarr/downloadclient.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -96,7 +95,7 @@ func (r *Readarr) AddDownloadClientContext(ctx context.Context,
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpDownloadClient, err)
 	}
 
-	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: starr.ForceSave(true)}
 	if err := r.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -146,7 +145,7 @@ func (r *Readarr) UpdateDownloadClientContext(ctx context.Context,
 	req := starr.Request{
 		URI:   path.Join(bpDownloadClient, starr.Str(client.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := r.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/readarr/importlist.go b/readarr/importlist.go
index 7e785c8..3e5eceb 100644
--- a/readarr/importlist.go
+++ b/readarr/importlist.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -106,7 +105,7 @@ func (r *Readarr) AddImportListContext(ctx context.Context, importList *ImportLi
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpImportList, err)
 	}
 
-	req := starr.Request{URI: bpImportList, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpImportList, Body: &body, Query: starr.ForceSave(true)}
 	if err := r.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -157,7 +156,7 @@ func (r *Readarr) UpdateImportListContext(
 	req := starr.Request{
 		URI:   path.Join(bpImportList, starr.Str(importList.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := r.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/readarr/indexer.go b/readarr/indexer.go
index 9982338..0f385dd 100644
--- a/readarr/indexer.go
+++ b/readarr/indexer.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -120,7 +119,7 @@ func (r *Readarr) AddIndexerContext(ctx context.Context, indexer *IndexerInput)
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpIndexer, err)
 	}
 
-	req := starr.Request{URI: bpIndexer, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpIndexer, Body: &body, Query: starr.ForceSave(true)}
 	if err := r.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -145,7 +144,7 @@ func (r *Readarr) UpdateIndexerContext(ctx context.Context, indexer *IndexerInpu
 	req := starr.Request{
 		URI:   path.Join(bpIndexer, starr.Str(indexer.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := r.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/sonarr/downloadclient.go b/sonarr/downloadclient.go
index 4c8d0cd..f578966 100644
--- a/sonarr/downloadclient.go
+++ b/sonarr/downloadclient.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -99,7 +98,7 @@ func (s *Sonarr) AddDownloadClientContext(ctx context.Context,
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpDownloadClient, err)
 	}
 
-	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpDownloadClient, Body: &body, Query: starr.ForceSave(true)}
 	if err := s.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -149,7 +148,7 @@ func (s *Sonarr) UpdateDownloadClientContext(ctx context.Context,
 	req := starr.Request{
 		URI:   path.Join(bpDownloadClient, starr.Str(client.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := s.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/sonarr/importlist.go b/sonarr/importlist.go
index 60a59d7..69a966a 100644
--- a/sonarr/importlist.go
+++ b/sonarr/importlist.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -106,7 +105,7 @@ func (s *Sonarr) AddImportListContext(ctx context.Context, importList *ImportLis
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpImportList, err)
 	}
 
-	req := starr.Request{URI: bpImportList, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpImportList, Body: &body, Query: starr.ForceSave(true)}
 	if err := s.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -157,7 +156,7 @@ func (s *Sonarr) UpdateImportListContext(
 	req := starr.Request{
 		URI:   path.Join(bpImportList, starr.Str(importList.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := s.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/sonarr/indexer.go b/sonarr/indexer.go
index 4b42da7..a929290 100644
--- a/sonarr/indexer.go
+++ b/sonarr/indexer.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"path"
 
 	"golift.io/starr"
@@ -122,7 +121,7 @@ func (s *Sonarr) AddIndexerContext(ctx context.Context, indexer *IndexerInput) (
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpIndexer, err)
 	}
 
-	req := starr.Request{URI: bpIndexer, Body: &body, Query: url.Values{"forceSave": []string{"true"}}}
+	req := starr.Request{URI: bpIndexer, Body: &body, Query: starr.ForceSave(true)}
 	if err := s.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -151,7 +150,7 @@ func (s *Sonarr) UpdateIndexerContext(
 	req := starr.Request{
 		URI:   path.Join(bpIndexer, starr.Str(indexer.ID)),
 		Body:  &body,
-		Query: url.Values{"forceSave": []string{starr.Str(force)}},
+		Query: starr.ForceSave(force),
 	}
 	if err := s.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
diff --git a/sonarr/metadata.go b/sonarr/metadata.go
index 2326678..6a2108f 100644
--- a/sonarr/metadata.go
+++ b/sonarr/metadata.go
@@ -112,12 +112,7 @@ func (s *Sonarr) AddMetadataContext(
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpMetadata, err)
 	}
 
-	q := url.Values{}
-	if forceSave {
-		q.Set("forceSave", "true")
-	}
-
-	req := starr.Request{URI: bpMetadata, Body: &body, Query: q}
+	req := starr.Request{URI: bpMetadata, Body: &body, Query: starr.ForceSave(forceSave)}
 	if err := s.PostInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Post(%s): %w", &req, err)
 	}
@@ -141,14 +136,9 @@ func (s *Sonarr) UpdateMetadataContext(
 		return nil, fmt.Errorf("json.Marshal(%s): %w", bpMetadata, err)
 	}
 
-	params := url.Values{}
-	if forceSave {
-		params.Set("forceSave", "true")
-	}
-
 	uri := path.Join(bpMetadata, starr.Str(input.ID))
 
-	req := starr.Request{URI: uri, Body: &body, Query: params}
+	req := starr.Request{URI: uri, Body: &body, Query: starr.ForceSave(forceSave)}
 	if err := s.PutInto(ctx, req, &output); err != nil {
 		return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
 	}
diff --git a/starrcmd/parser.go b/starrcmd/parser.go
index 758007d..e60091d 100644
--- a/starrcmd/parser.go
+++ b/starrcmd/parser.go
@@ -26,7 +26,7 @@ func (c *CmdEvent) get(wanted Event, output any) error {
 // This does not traverse structs and will only stay on normal members.
 func fillStructFromEnv(dataStruct any) error {
 	field := reflect.ValueOf(dataStruct)
-	if field.Kind() != reflect.Ptr || field.Elem().Kind() != reflect.Struct {
+	if field.Kind() != reflect.Pointer || field.Elem().Kind() != reflect.Struct {
 		panic("yuh dun ate in sumthin bahd! This is a bug in the starrcmd library.")
 	}
 

From 8a562cc6d920b792e8445e248a6246d5fd59e253 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Wed, 19 Aug 2026 22:58:19 -0700
Subject: [PATCH 2/2] go get -u ./... ; go mod tidy

---
 go.mod |  8 ++------
 go.sum | 14 ++------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index 3d3140f..b8b7bb0 100644
--- a/go.mod
+++ b/go.mod
@@ -4,14 +4,10 @@ go 1.25.7
 
 toolchain go1.27.0
 
-require golang.org/x/net v0.49.0 // publicsuffix, cookiejar.
+require golang.org/x/net v0.58.0 // publicsuffix, cookiejar.
 
 // All of this is for the tests.
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/testify v1.12.1 // assert!
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	go.yaml.in/yaml/v3 v3.0.5 // indirect
 )
-
-require go.yaml.in/yaml/v3 v3.0.5 // indirect
diff --git a/go.sum b/go.sum
index e31c4c5..05c7bb5 100644
--- a/go.sum
+++ b/go.sum
@@ -1,16 +1,6 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
 go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
-golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
-golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=
+golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=