diff --git a/internal/cli/ask_credentials.go b/internal/cli/ask_credentials.go index a4264a9b..0594cc44 100644 --- a/internal/cli/ask_credentials.go +++ b/internal/cli/ask_credentials.go @@ -5,6 +5,7 @@ package cli // import "miniflux.app/v2/internal/cli" import ( "bufio" + "errors" "fmt" "os" "strings" @@ -16,7 +17,7 @@ func askCredentials() (string, string) { fd := int(os.Stdin.Fd()) if !term.IsTerminal(fd) { - printErrorAndExit(fmt.Errorf("this is not an interactive terminal, exiting")) + printErrorAndExit(errors.New("this is not an interactive terminal, exiting")) } fmt.Print("Enter Username: ") @@ -30,6 +31,6 @@ func askCredentials() (string, string) { defer term.Restore(fd, state) bytePassword, _ := term.ReadPassword(fd) - fmt.Printf("\n") + fmt.Print("\n") return strings.TrimSpace(username), strings.TrimSpace(string(bytePassword)) } diff --git a/internal/cli/cli.go b/internal/cli/cli.go index d15beb19..14c38fda 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -263,6 +263,6 @@ func Parse() { } func printErrorAndExit(err error) { - fmt.Fprintf(os.Stderr, "%v\n", err) + fmt.Fprintln(os.Stderr, err) os.Exit(1) } diff --git a/internal/googlereader/handler.go b/internal/googlereader/handler.go index ce22c836..28090b5b 100644 --- a/internal/googlereader/handler.go +++ b/internal/googlereader/handler.go @@ -793,7 +793,7 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque Content: entry.Content, }, Origin: contentItemOrigin{ - StreamID: fmt.Sprintf("feed/%d", entry.FeedID), + StreamID: fmt.Sprintf(feedPrefix+"%d", entry.FeedID), Title: entry.Feed.Title, HTMLUrl: entry.Feed.SiteURL, }, diff --git a/internal/integration/karakeep/karakeep.go b/internal/integration/karakeep/karakeep.go index 32372c83..7410f374 100644 --- a/internal/integration/karakeep/karakeep.go +++ b/internal/integration/karakeep/karakeep.go @@ -50,7 +50,7 @@ func (c *Client) SaveURL(entryURL string) error { return fmt.Errorf("karakeep: unable to create request: %v", err) } - req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.apiToken)) + req.Header.Set("Authorization", "Bearer "+c.apiToken) req.Header.Set("Content-Type", "application/json") req.Header.Set("User-Agent", "Miniflux/"+version.Version) diff --git a/internal/integration/ntfy/ntfy.go b/internal/integration/ntfy/ntfy.go index 92f906f0..6b965412 100644 --- a/internal/integration/ntfy/ntfy.go +++ b/internal/integration/ntfy/ntfy.go @@ -90,7 +90,7 @@ func (c *Client) makeRequest(payload any) error { // See https://docs.ntfy.sh/publish/#access-tokens if c.ntfyApiToken != "" { - request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.ntfyApiToken)) + request.Header.Set("Authorization", "Bearer "+c.ntfyApiToken) } // See https://docs.ntfy.sh/publish/#username-password diff --git a/internal/ui/proxy.go b/internal/ui/proxy.go index 8e9ee787..23658a08 100644 --- a/internal/ui/proxy.go +++ b/internal/ui/proxy.go @@ -140,7 +140,7 @@ func (h *handler) mediaProxy(w http.ResponseWriter, r *http.Request) { b.WithHeader("Content-Type", resp.Header.Get("Content-Type")) if filename := path.Base(parsedMediaURL.Path); filename != "" { - b.WithHeader("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, filename)) + b.WithHeader("Content-Disposition", `inline; filename="`+filename+`"`) } forwardedResponseHeader := [...]string{"Content-Encoding", "Content-Type", "Content-Length", "Accept-Ranges", "Content-Range"}