Merge branch 'main' of github.com:binwiederhier/ntfy

.github/ISSUE_TEMPLATE/1_bug_report.md

@@ -2,7 +2,7 @@
 name: 🐛 Bug Report
 about: Report any errors and problems
 title: ''
-labels: 'bug'
+labels: '🪲 bug'
 assignees: ''
 
 ---

cmd/publish.go

@@ -171,7 +171,7 @@ func execPublish(c *cli.Context) error {
 			fmt.Fprintf(c.App.ErrWriter, "\r%s\r", strings.Repeat(" ", 20))
 		}
 		options = append(options, client.WithBasicAuth(user, pass))
-	} else if conf.DefaultUser != "" && conf.DefaultPassword != nil {
+	} else if token == "" && conf.DefaultUser != "" && conf.DefaultPassword != nil {
 		options = append(options, client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword))
 	}
 	if pid > 0 {