Fix calls to strings.HasSuffix and strings.HasPrefix

John Wregglesworth · John Wregglesworth · commit 348085bf17ac · 2024-06-13T12:34:10.000-07:00
diff --git a/internal/internal.go b/internal/internal.go
@@ -47,10 +47,10 @@ type AppConfiguration struct {
 }
 
 func (a *App) FixUsername(username string) string {
-	if !strings.HasSuffix(username, a.userSuffix) {
+	if !strings.HasSuffix(a.userSuffix, username) {
 		// Only add a @ if the configured user suffix doesn't already
 		// start with one.
-		if strings.HasPrefix("@", a.userSuffix) {
+		if strings.HasPrefix(a.userSuffix, "@") {
 			return fmt.Sprintf("%s%s", username, a.userSuffix)
 		}
 		return fmt.Sprintf("%s@%s", username, a.userSuffix)

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,10 @@ type AppConfiguration struct {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func (a *App) FixUsername(username string) string {`
`50`		`- if !strings.HasSuffix(username, a.userSuffix) {`
	`50`	`+ if !strings.HasSuffix(a.userSuffix, username) {`
`51`	`51`	`// Only add a @ if the configured user suffix doesn't already`
`52`	`52`	`// start with one.`
`53`		`- if strings.HasPrefix("@", a.userSuffix) {`
	`53`	`+ if strings.HasPrefix(a.userSuffix, "@") {`
`54`	`54`	`return fmt.Sprintf("%s%s", username, a.userSuffix)`
`55`	`55`	`}`
`56`	`56`	`return fmt.Sprintf("%s@%s", username, a.userSuffix)`