From a72f6068332693d9e8b64b65130fa53b82943c6e Mon Sep 17 00:00:00 2001 From: ayn2op Date: Thu, 19 Jun 2025 13:29:43 -0400 Subject: [PATCH] refactor(cmd): fix common lint issues --- cmd/application.go | 24 +++++++++++++----------- cmd/state.go | 9 +++------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/cmd/application.go b/cmd/application.go index 2038cf9..c47203b 100644 --- a/cmd/application.go +++ b/cmd/application.go @@ -40,9 +40,10 @@ func newApplication(cfg *config.Config) *application { messageInput: newMessageInput(cfg), } - app.EnableMouse(cfg.Mouse) - app.SetInputCapture(app.onInputCapture) app.flex.SetInputCapture(app.onFlexInputCapture) + app. + EnableMouse(cfg.Mouse). + SetInputCapture(app.onInputCapture) return app } @@ -50,20 +51,19 @@ func (a *application) run(token string) error { if token == "" { loginForm := login.NewForm(a.cfg, func(token string) { if err := a.run(token); err != nil { - slog.Error("failed to show app", "err", err) - return + slog.Error("failed to run application", "err", err) } }) return a.SetRoot(loginForm, true).Run() - } else { - if err := openState(token); err != nil { - return err - } - - a.init() - return a.SetRoot(a.pages, true).Run() } + + if err := openState(token); err != nil { + return err + } + + a.init() + return a.SetRoot(a.pages, true).Run() } func (a *application) quit() { @@ -84,10 +84,12 @@ func (a *application) init() { SetDirection(tview.FlexRow). AddItem(a.messagesText, 0, 1, false). AddItem(a.messageInput, 3, 1, false) + // The guilds tree is always focused first at start-up. a.flex. AddItem(a.guildsTree, 0, 1, true). AddItem(right, 0, 4, false) + a.pages.AddAndSwitchToPage(flexPageName, a.flex, true) } diff --git a/cmd/state.go b/cmd/state.go index e995696..c44ad79 100644 --- a/cmd/state.go +++ b/cmd/state.go @@ -48,12 +48,9 @@ func openState(token string) error { discordState.AddHandler(func(event *ws.RawEvent) { slog.Debug( "new raw event", - "code", - event.OriginalCode, - "type", - event.OriginalType, - "data", - event.Raw, + "code", event.OriginalCode, + "type", event.OriginalType, + "data", event.Raw, ) })