cmdroute: Fix OverwriteCommands being broken

0-examples/commands-hybrid/main.go

@@ -53,6 +53,10 @@ func main() {
 	if webhookAddr != "" {
 		state := state.NewAPIOnlyState(token, nil)
 
+		if err := cmdroute.OverwriteCommands(state, commands); err != nil {
+			log.Fatalln("cannot update commands:", err)
+		}
+
 		h := newHandler(state)
 
 		if err := overwriteCommands(state); err != nil {
@@ -74,13 +78,13 @@ func main() {
 			log.Println("connected to the gateway as", me.Tag())
 		})
 
-		h := newHandler(state)
-		state.AddInteractionHandler(h)
-
-		if err := overwriteCommands(state); err != nil {
+		if err := cmdroute.OverwriteCommands(state, commands); err != nil {
 			log.Fatalln("cannot update commands:", err)
 		}
 
+		h := newHandler(state)
+		state.AddInteractionHandler(h)
+
 		if err := h.s.Connect(context.Background()); err != nil {
 			log.Fatalln("cannot connect:", err)
 		}

0-examples/commands/main.go

@@ -54,7 +54,7 @@ func main() {
 		log.Println("connected to the gateway as", me.Tag())
 	})
 
-	if err := overwriteCommands(h.s); err != nil {
+	if err := cmdroute.OverwriteCommands(h.s, commands); err != nil {
 		log.Fatalln("cannot update commands:", err)
 	}
 
@@ -66,10 +66,6 @@ func main() {
 	}
 }
 
-func overwriteCommands(s *state.State) error {
-	return cmdroute.OverwriteCommands(s, commands)
-}
-
 type handler struct {
 	*cmdroute.Router
 	s *state.State

api/cmdroute/application.go

@@ -24,6 +24,9 @@ func OverwriteCommands(client BulkCommandsOverwriter, cmds []api.CreateCommandDa
 		return fmt.Errorf("cannot get current app ID: %w", err)
 	}
 
-	_, err = client.BulkOverwriteCommands(app.ID, cmds)
-	return fmt.Errorf("cannot overwrite commands: %w", err)
+	if _, err = client.BulkOverwriteCommands(app.ID, cmds); err != nil {
+		return fmt.Errorf("cannot overwrite commands: %w", err)
+	}
+
+	return nil
 }