Diff
1diff --git a/cmd/soft/browse/browse.go b/cmd/soft/browse/browse.go
2index c430630cf1de1a958b9871dca27e5f32ad2cbde2..ba8ad2caa885e74ce0f9eac0978f7fcb8a8b3f89 100644
3--- a/cmd/soft/browse/browse.go
4+++ b/cmd/soft/browse/browse.go
5@@ -167,8 +167,11 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
6 return m, tea.Quit
7 }
8 case tea.MouseMsg:
9- switch msg.Type {
10- case tea.MouseLeft:
11+ if msg.Action != tea.MouseActionPress {
12+ break
13+ }
14+ switch msg.Button {
15+ case tea.MouseButtonLeft:
16 switch {
17 case m.common.Zone.Get("footer").InBounds(msg):
18 cmds = append(cmds, footer.ToggleFooterCmd)
19diff --git a/pkg/db/migrate/0003_migrate_lfs_objects.go b/pkg/db/migrate/0003_migrate_lfs_objects.go
20index 70aaa79e8ce2b339dbedd207d0b996ef0f257a14..d7acd7be715be008c6ad8d261de0af622a6a4496 100644
21--- a/pkg/db/migrate/0003_migrate_lfs_objects.go
22+++ b/pkg/db/migrate/0003_migrate_lfs_objects.go
23@@ -27,11 +27,11 @@ var migrateLfsObjects = Migration{
24 cfg := config.FromContext(ctx)
25 logger := log.FromContext(ctx).WithPrefix("migrate_lfs_objects")
26
27- var repoIds []int64
28- if err := tx.Select(&repoIds, "SELECT id FROM repos"); err != nil {
29+ var repoIDs []int64
30+ if err := tx.Select(&repoIDs, "SELECT id FROM repos"); err != nil {
31 return err
32 }
33- for _, r := range repoIds {
34+ for _, r := range repoIDs {
35 var objs []models.LFSObject
36 if err := tx.Select(&objs, "SELECT * FROM lfs_objects WHERE repo_id = ?", r); err != nil {
37 return err
38@@ -50,7 +50,7 @@ var migrateLfsObjects = Migration{
39 }
40 return nil
41 },
42- Rollback: func(ctx context.Context, tx *db.Tx) error {
43+ Rollback: func(context.Context, *db.Tx) error {
44 return nil
45 },
46 }
47diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go
48index 4cfde71c2bb712631198f50038c6a18db8c8f27c..54d30dcaece82df2409895cead5a85e32e9294f3 100644
49--- a/pkg/ssh/ssh.go
50+++ b/pkg/ssh/ssh.go
51@@ -104,7 +104,7 @@ func NewSSHServer(ctx context.Context) (*SSHServer, error) {
52 }
53
54 if config.IsDebug() {
55- s.srv.ServerConfigCallback = func(ctx ssh.Context) *gossh.ServerConfig {
56+ s.srv.ServerConfigCallback = func(_ ssh.Context) *gossh.ServerConfig {
57 return &gossh.ServerConfig{
58 AuthLogCallback: func(conn gossh.ConnMetadata, method string, err error) {
59 logger.Debug("authentication", "user", conn.User(), "method", method, "err", err)
60diff --git a/pkg/ssh/ui.go b/pkg/ssh/ui.go
61index 4b84542c47e77147b13be1808880a17729ca715c..7394937c7ac6d7125c95f153546d15c871814c4e 100644
62--- a/pkg/ssh/ui.go
63+++ b/pkg/ssh/ui.go
64@@ -204,8 +204,11 @@ func (ui *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
65 ui.showFooter = true
66 }
67 case tea.MouseMsg:
68- switch msg.Type {
69- case tea.MouseLeft:
70+ if msg.Action != tea.MouseActionPress {
71+ break
72+ }
73+ switch msg.Button {
74+ case tea.MouseButtonLeft:
75 switch {
76 case ui.common.Zone.Get("footer").InBounds(msg):
77 cmds = append(cmds, footer.ToggleFooterCmd)
78diff --git a/pkg/ui/components/selector/selector.go b/pkg/ui/components/selector/selector.go
79index 7454cc3e7d955dd4e0b3fe8300558bf1824c6e9a..72239d4083847a2ccd72c7d0e10ea9bfa90e10ba 100644
80--- a/pkg/ui/components/selector/selector.go
81+++ b/pkg/ui/components/selector/selector.go
82@@ -231,12 +231,15 @@ func (s *Selector) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
83 cmds := make([]tea.Cmd, 0)
84 switch msg := msg.(type) {
85 case tea.MouseMsg:
86- switch msg.Type {
87- case tea.MouseWheelUp:
88+ if msg.Action != tea.MouseActionPress {
89+ break
90+ }
91+ switch msg.Button {
92+ case tea.MouseButtonWheelUp:
93 s.CursorUp()
94- case tea.MouseWheelDown:
95+ case tea.MouseButtonWheelDown:
96 s.CursorDown()
97- case tea.MouseLeft:
98+ case tea.MouseButtonLeft:
99 curIdx := s.Index()
100 for i, item := range s.Items() {
101 item, _ := item.(IdentifiableItem)
102diff --git a/pkg/ui/components/tabs/tabs.go b/pkg/ui/components/tabs/tabs.go
103index ac3a780725b4031fa084a73e69a826784c7493f6..81dbf87091b5a332ae222b70ff22df36d0746406 100644
104--- a/pkg/ui/components/tabs/tabs.go
105+++ b/pkg/ui/components/tabs/tabs.go
106@@ -64,7 +64,11 @@ func (t *Tabs) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
107 cmds = append(cmds, t.activeTabCmd)
108 }
109 case tea.MouseMsg:
110- if msg.Type == tea.MouseLeft {
111+ if msg.Action != tea.MouseActionPress {
112+ break
113+ }
114+ switch msg.Button {
115+ case tea.MouseButtonLeft:
116 for i, tab := range t.tabs {
117 if t.common.Zone.Get(tab).InBounds(msg) {
118 t.activeTab = i
119diff --git a/pkg/ui/pages/repo/repo.go b/pkg/ui/pages/repo/repo.go
120index 5d4105bf65172e4d4467096efa0bccb44c7bfa8e..8ae3b3e1a2d49f5e26c96dab85e2a6665f9784a1 100644
121--- a/pkg/ui/pages/repo/repo.go
122+++ b/pkg/ui/pages/repo/repo.go
123@@ -186,13 +186,16 @@ func (r *Repo) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
124 }
125 switch msg := msg.(type) {
126 case tea.MouseMsg:
127- switch msg.Type {
128- case tea.MouseLeft:
129+ if msg.Action != tea.MouseActionPress {
130+ break
131+ }
132+ switch msg.Button {
133+ case tea.MouseButtonLeft:
134 switch {
135 case r.common.Zone.Get("repo-help").InBounds(msg):
136 cmds = append(cmds, footer.ToggleFooterCmd)
137 }
138- case tea.MouseRight:
139+ case tea.MouseButtonRight:
140 switch {
141 case r.common.Zone.Get("repo-main").InBounds(msg):
142 cmds = append(cmds, goBackCmd)