From ea7f2cf7b28701310a64110eae7f8bd2cd880fca Mon Sep 17 00:00:00 2001 From: ayn2op Date: Sat, 22 Nov 2025 13:43:15 -0500 Subject: [PATCH] Reapply "fix(cmd): initialize clipboard in newApplication func (#625)" This reverts commit 97b2249608e34b78d9a00e691fbd554fe23d7486. --- cmd/application.go | 5 +++++ cmd/message_input.go | 18 +++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cmd/application.go b/cmd/application.go index 5c7f2dc..bbaf14f 100644 --- a/cmd/application.go +++ b/cmd/application.go @@ -9,6 +9,7 @@ import ( "github.com/ayn2op/discordo/internal/ui" "github.com/ayn2op/tview" "github.com/gdamore/tcell/v2" + "golang.design/x/clipboard" ) const ( @@ -41,6 +42,10 @@ func newApplication(cfg *config.Config) *application { messageInput: newMessageInput(cfg), } + if err := clipboard.Init(); err != nil { + slog.Error("failed to init clipboard", "err", err) + } + app.pages.SetInputCapture(app.onPagesInputCapture) app. EnableMouse(cfg.Mouse). diff --git a/cmd/message_input.go b/cmd/message_input.go index 5529eff..12b543c 100644 --- a/cmd/message_input.go +++ b/cmd/message_input.go @@ -59,17 +59,13 @@ func newMessageInput(cfg *config.Config) *messageInput { mentionsList: tview.NewList(), } - if err := clipboard.Init(); err != nil { - slog.Warn("failed to init clipboard", "err", err) - } else { - mi. - SetClipboard(func(s string) { - clipboard.Write(clipboard.FmtText, []byte(s)) - }, func() string { - data := clipboard.Read(clipboard.FmtText) - return string(data) - }) - } + mi. + SetClipboard(func(s string) { + clipboard.Write(clipboard.FmtText, []byte(s)) + }, func() string { + data := clipboard.Read(clipboard.FmtText) + return string(data) + }) mi.Box = ui.ConfigureBox(mi.Box, &cfg.Theme) mi.SetInputCapture(mi.onInputCapture)