From 8f5e923fe166891bdb57ac1d1262b48d0a944f23 Mon Sep 17 00:00:00 2001 From: ayn2op Date: Mon, 10 Aug 2026 21:00:29 -0400 Subject: [PATCH] refactor(ui): simplify login error handling --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/ui/login/model.go | 4 +--- internal/ui/login/msg.go | 2 -- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index be2d889..f8a771e 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/andybalholm/brotli v1.2.2 github.com/ayn2op/arikawa/v3 v3.0.0-20260708075022-9cc760fe507e github.com/ayn2op/ningen/v3 v3.0.1-0.20260708075321-0ba1ffc70bd6 - github.com/ayn2op/tview v0.0.0-20260810031733-e2c6c70cbb87 + github.com/ayn2op/tview v0.0.0-20260811010021-3f4c9e0a94b4 github.com/bogdanfinn/fhttp v0.6.8 github.com/bogdanfinn/tls-client v1.15.1 github.com/gdamore/tcell/v3 v3.4.1 @@ -54,7 +54,7 @@ require ( go4.org v0.0.0-20260112195520-a5071408f32f // indirect golang.design/x/x11 v0.2.0 // indirect golang.org/x/crypto v0.54.0 // indirect - golang.org/x/exp/shiny v0.0.0-20260727155853-b88d891fe743 // indirect + golang.org/x/exp/shiny v0.0.0-20260810151157-a8b543ca52da // indirect golang.org/x/image v0.44.0 // indirect golang.org/x/mobile v0.0.0-20260803200217-62cee1672c8e // indirect golang.org/x/net v0.57.0 // indirect diff --git a/go.sum b/go.sum index 3af449e..fee38d7 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/ayn2op/arikawa/v3 v3.0.0-20260708075022-9cc760fe507e h1:rsMifRXwxkbha github.com/ayn2op/arikawa/v3 v3.0.0-20260708075022-9cc760fe507e/go.mod h1:gqklpHK7WHYTzpd1ZY6Ho/p9GURBghzBCzRiBYpaUP8= github.com/ayn2op/ningen/v3 v3.0.1-0.20260708075321-0ba1ffc70bd6 h1:/khHm6G+GWwXpmwA8bJoaXoUhubqMEUG6spjZsnklIw= github.com/ayn2op/ningen/v3 v3.0.1-0.20260708075321-0ba1ffc70bd6/go.mod h1:vqLIvETLkjc2vIgQzVEBqpGNCrgNe7YJqS9TUAJsXRI= -github.com/ayn2op/tview v0.0.0-20260810031733-e2c6c70cbb87 h1:GsOC8upE5wja+ncj6M3M0oIIvoRVkRyd3LztSa/YchE= -github.com/ayn2op/tview v0.0.0-20260810031733-e2c6c70cbb87/go.mod h1:GQq8n9VWVgRcEGjVaPBu53kXhPeNC13LCIcq0btKLqQ= +github.com/ayn2op/tview v0.0.0-20260811010021-3f4c9e0a94b4 h1:TWQg15O2A6HhUu67lr306XWGNSko6Zpei6K3kWEMqHo= +github.com/ayn2op/tview v0.0.0-20260811010021-3f4c9e0a94b4/go.mod h1:GQq8n9VWVgRcEGjVaPBu53kXhPeNC13LCIcq0btKLqQ= github.com/bdandy/go-errors v1.2.2 h1:WdFv/oukjTJCLa79UfkGmwX7ZxONAihKu4V0mLIs11Q= github.com/bdandy/go-errors v1.2.2/go.mod h1:NkYHl4Fey9oRRdbB1CoC6e84tuqQHiqrOcZpqFEkBxM= github.com/bdandy/go-socks4 v1.2.3 h1:Q6Y2heY1GRjCtHbmlKfnwrKVU/k81LS8mRGLRlmDlic= @@ -115,8 +115,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= -golang.org/x/exp/shiny v0.0.0-20260727155853-b88d891fe743 h1:rQLtGtwpYzQUyxCqrT3i4lGgvC1Q4G72JTHYncg6AvY= -golang.org/x/exp/shiny v0.0.0-20260727155853-b88d891fe743/go.mod h1:JRiBNgSZB8uVKtHGrvbGDQ8p9Ghn3+lkFSk1KqRIiPc= +golang.org/x/exp/shiny v0.0.0-20260810151157-a8b543ca52da h1:bo0dOpCtbdnUN6DToKnnFMCjj3vU63SAUIABTtxZ+ik= +golang.org/x/exp/shiny v0.0.0-20260810151157-a8b543ca52da/go.mod h1:JRiBNgSZB8uVKtHGrvbGDQ8p9Ghn3+lkFSk1KqRIiPc= golang.org/x/image v0.44.0 h1:+tDekMZED9+LrtB3G5xzRggpVh9CARjZqROla3R3R+I= golang.org/x/image v0.44.0/go.mod h1:V8K3KE9KKKE+pLpQDOeN18w9oacNSvy1tDOirTu4xtY= golang.org/x/mobile v0.0.0-20260803200217-62cee1672c8e h1:hi1b7Lmv+xvnrjeEv8BoDmU7H/FAOuH7hEHSvjMl2VM= diff --git a/internal/ui/login/model.go b/internal/ui/login/model.go index 421e2d1..f4f66bb 100644 --- a/internal/ui/login/model.go +++ b/internal/ui/login/model.go @@ -38,9 +38,7 @@ func NewModel(cfg *config.Config) *Model { func (m *Model) Update(msg tview.Msg) tview.Cmd { switch msg := msg.(type) { - case errMsg: - return showErrorDialog(msg) - case password.ErrMsg: + case error: return showErrorDialog(msg) case copyErrorMsg: return setClipboard(string(msg)) diff --git a/internal/ui/login/msg.go b/internal/ui/login/msg.go index 16d04d5..22e643a 100644 --- a/internal/ui/login/msg.go +++ b/internal/ui/login/msg.go @@ -5,8 +5,6 @@ import ( "golang.design/x/clipboard" ) -type errMsg error - type copyErrorMsg string func setClipboard(content string) tview.Cmd {