fix: parse urls properly

Author: zerebos

cmd/info.go

@@ -6,7 +6,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/betterdiscord/cli/internal/betterdiscord"
-	"github.com/betterdiscord/cli/internal/output"
 )
 
 func init() {
@@ -24,8 +23,6 @@ var infoCmd = &cobra.Command{
 			return fmt.Errorf("BetterDiscord does not appear to be installed, try running 'bdcli install' first")
 		}
 
-		output.Printf("📦 BetterDiscord Information:\n\n")
-
 		bdinstall.LogBuildinfo()
 
 		return nil

cmd/plugins.go

@@ -63,20 +63,13 @@ var pluginsInfoCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		name := args[0]
-		items, err := betterdiscord.ListAddons(betterdiscord.AddonPlugin)
-		if err != nil {
-			return err
-		}
-
-		for _, item := range items {
-			// Match by filename or meta name
-			if item.BaseName == name || item.FullFilename == name || item.Meta.Name == name {
-				betterdiscord.LogLocalAddonInfo(&item)
-				return nil
-			}
-		}
+		existing := betterdiscord.FindAddon(betterdiscord.AddonPlugin, name)
+        if existing == nil {
+            output.Printf("❌ Plugin '%s' not found.\n", name)
+            return nil
+        }
 
-		output.Printf("❌ Plugin '%s' not found.\n", name)
+        betterdiscord.LogLocalAddonInfo(existing)
 		return nil
 	},
 }
@@ -103,7 +96,7 @@ var pluginsInstallCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		output.Printf("✅ Plugin installed at %s\n", resolved.URL)
+		output.Printf("✅ Plugin installed at %s\n", resolved.Path)
 		return nil
 	},
 }
@@ -203,7 +196,7 @@ var pluginsUpdateCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		output.Printf("✅ Plugin updated at %s\n", resolved.URL)
+		output.Printf("✅ Plugin updated at %s\n", resolved.Path)
 		return nil
 	},
 }

cmd/themes.go

@@ -51,20 +51,13 @@ var themesInfoCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		name := args[0]
-		items, err := betterdiscord.ListAddons(betterdiscord.AddonTheme)
-		if err != nil {
-			return err
-		}
-
-		for _, item := range items {
-			// Match by filename or meta name
-			if item.BaseName == name || item.FullFilename == name || item.Meta.Name == name {
-				betterdiscord.LogLocalAddonInfo(&item)
-				return nil
-			}
-		}
+		existing := betterdiscord.FindAddon(betterdiscord.AddonTheme, name)
+        if existing == nil {
+            output.Printf("❌ Theme '%s' not found.\n", name)
+            return nil
+        }
 
-		output.Printf("❌ Theme '%s' not found.\n", name)
+        betterdiscord.LogLocalAddonInfo(existing)
 		return nil
 	},
 }
@@ -91,7 +84,7 @@ var themesInstallCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		output.Printf("✅ Theme installed at %s\n", resolved.URL)
+		output.Printf("✅ Theme installed at %s\n", resolved.Path)
 		return nil
 	},
 }
@@ -191,7 +184,7 @@ var themesUpdateCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		output.Printf("✅ Theme updated at %s\n", resolved.URL)
+		output.Printf("✅ Theme updated at %s\n", resolved.Path)
 		return nil
 	},
 }

internal/betterdiscord/addons.go

@@ -35,7 +35,7 @@ type AddonEntry struct {
 // ResolvedAddon holds both local and store metadata for an addon.
 type ResolvedAddon struct {
 	Store *models.StoreAddon // Metadata from store (nil if not found)
-	URL   string             // Download URL
+	Path   string            // Local install path
 }
 
 // ListAddons returns the locally installed addons for the given kind.
@@ -124,7 +124,7 @@ func InstallAddon(kind AddonKind, identifier string) (*ResolvedAddon, error) {
 		if err != nil {
 			return nil, err
 		}
-		resolved.URL = dest
+		resolved.Path = dest
 		return resolved, nil
 	}
 
@@ -152,7 +152,7 @@ func InstallAddon(kind AddonKind, identifier string) (*ResolvedAddon, error) {
 		return nil, err
 	}
 
-	resolved.URL = dest
+	resolved.Path = dest
 	LogAddonInfo(addon)
 	return resolved, nil
 }
@@ -177,7 +177,10 @@ func RemoveAddon(kind AddonKind, identifier string) error {
 
 // UpdateAddon removes then installs again, returning resolved metadata.
 func UpdateAddon(kind AddonKind, identifier string) (*ResolvedAddon, error) {
-	_ = RemoveAddon(kind, identifier)
+	err := RemoveAddon(kind, identifier)
+	if err != nil {
+		return nil, err
+	}
 	return InstallAddon(kind, identifier)
 }
 

internal/betterdiscord/buildinfo.go

@@ -2,6 +2,7 @@ package betterdiscord
 
 import (
 	"bufio"
+	"io"
 	"os"
 	"regexp"
 
@@ -65,7 +66,7 @@ func (i *BDInstall) ReadBuildinfo() (bi Buildinfo, err error) {
 	var tail []byte
 
 	for {
-		n, err := reader.Read(buf)
+		n, readErr := reader.Read(buf)
 		if n > 0 {
 			// Combine tail + new chunk
 			window := append(tail, buf[:n]...)
@@ -97,8 +98,11 @@ func (i *BDInstall) ReadBuildinfo() (bi Buildinfo, err error) {
 			}
 		}
 
-		if err != nil {
-			break
+		if readErr != nil {
+			if readErr == io.EOF {
+				break
+			}
+			return NewBuildinfo(), readErr
 		}
 	}
 

internal/betterdiscord/store.go

@@ -3,8 +3,10 @@ package betterdiscord
 import (
 	"fmt"
 	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/betterdiscord/cli/internal/models"
 	"github.com/betterdiscord/cli/internal/output"
@@ -14,7 +16,7 @@ import (
 // FetchAddonFromStore queries the BetterDiscord Store API by name or ID.
 // Returns addon metadata including download URL.
 func FetchAddonFromStore(identifier string) (*models.StoreAddon, error) {
-	apiURL := fmt.Sprintf("https://api.betterdiscord.app/v3/store/%s", identifier)
+	apiURL := fmt.Sprintf("https://api.betterdiscord.app/v3/store/%s", url.PathEscape(identifier))
 
 	addon, err := utils.DownloadJSON[models.StoreAddon](apiURL)
 	if err != nil {
@@ -37,6 +39,7 @@ func GetAddonDownloadURL(id int) (s string, err error) {
 
 	// Create client that follows redirects and returns the final URL
 	client := &http.Client{
+		Timeout: 10 * time.Second,
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {
 			// Allow up to 10 redirects
 			if len(via) >= 10 {
@@ -126,10 +129,19 @@ func ResolveAddonIdentifier(identifier string) (int, string, bool) {
 // FetchAddonsOfType fetches all addons of a specific type from the store.
 // Kind can be "plugin", "theme", or "addon" for all types.
 func FetchAddonsOfType(kind string) ([]models.StoreAddon, error) {
-	endpoint := kind
-	if kind == "" {
-		endpoint = "addons"
-	}
+	k := strings.ToLower(kind)
+
+    var endpoint string
+    switch k {
+    case "", "addon", "addons":
+        endpoint = "addons"
+    case "plugin", "plugins":
+        endpoint = "plugins"
+    case "theme", "themes":
+        endpoint = "themes"
+    default:
+        return nil, fmt.Errorf("invalid addon kind %q (expected plugin[s], theme[s], or addon[s])", kind)
+    }
 	apiURL := fmt.Sprintf("https://api.betterdiscord.app/v3/store/%s", endpoint)
 
 	addons, err := utils.DownloadJSON[[]models.StoreAddon](apiURL)

internal/output/output.go

@@ -17,12 +17,12 @@ var (
 )
 
 // SetWriters overrides the output writers (useful for tests).
-func SetWriters(out, err io.Writer) {
-	if out != nil {
-		stdOut = out
+func SetWriters(stdout, stderr io.Writer) {
+	if stdout != nil {
+		stdOut = stdout
 	}
-	if err != nil {
-		stdErr = err
+	if stderr != nil {
+		stdErr = stderr
 	}
 }