Skip to content

fix: make undo message non-blocking #1455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrinoff merged 1 commit into from
Jun 7, 2026
Merged

fix: make undo message non-blocking #1455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (

tea "charm.land/bubbletea/v2"
"charm.land/lipgloss/v2"
overlay "github.com/floatpane/bubble-overlay"
calendar "github.com/floatpane/go-icalendar"
"github.com/floatpane/matcha/backend"
_ "github.com/floatpane/matcha/backend/imap"
Expand Down Expand Up @@ -124,6 +125,7 @@ type mainModel struct {
logCh <-chan logging.Entry
logPanel *tui.LogPanel
pendingJobID string
sendNotice string
}

type logEntryMsg struct {
Expand Down Expand Up @@ -1730,11 +1732,13 @@ func (m *mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:gocyclo
m.service = daemonclient.NewService(m.config)
}

statusText := "Sending email..."
noticeText := "Sending email..."
if msg.SignPGP && account != nil && account.PGPKeySource == "yubikey" {
statusText = "Touch your YubiKey to sign..."
noticeText = "Touch your YubiKey to sign..."
}
m.current = tui.NewStatus(statusText)
m.sendNotice = noticeText
m.current = tui.NewChoice()
m.current, _ = m.current.Update(m.currentWindowSize())

// Save contact and delete draft in background
go func() {
Expand Down Expand Up @@ -1764,18 +1768,16 @@ func (m *mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:gocyclo

case tui.EmailQueuedMsg:
m.pendingJobID = msg.JobID
m.current = tui.NewStatus(fmt.Sprintf("Message sent (%s to undo)", config.Keybinds.Composer.UndoSend))
return m, tea.Batch(
m.current.Init(),
tea.Tick(
time.Duration(msg.DelaySeconds)*time.Second, func(t time.Time) tea.Msg {
return tui.EmailDelayExpiredMsg{JobID: msg.JobID}
}),
)
m.sendNotice = fmt.Sprintf("Message sent (%s to undo)", config.Keybinds.Composer.UndoSend)
return m, tea.Tick(
time.Duration(msg.DelaySeconds)*time.Second, func(t time.Time) tea.Msg {
return tui.EmailDelayExpiredMsg{JobID: msg.JobID}
})

case tui.EmailDelayExpiredMsg:
if m.pendingJobID == msg.JobID {
m.pendingJobID = ""
m.sendNotice = ""
m.previousModel = nil

if m.plugins != nil {
Expand All @@ -1790,14 +1792,15 @@ func (m *mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:gocyclo
return m, nil

case tui.UndoSendMsg:
m.sendNotice = ""
if m.previousModel != nil {
m.current = m.previousModel
m.previousModel = nil
m.current, _ = m.current.Update(m.currentWindowSize())
return m, m.current.Init()
}

m.previousModel = tui.NewChoice()
m.current = tui.NewChoice()
m.current, _ = m.current.Update(m.currentWindowSize())
return m, m.current.Init()

case tui.SendRSVPMsg:
Expand Down Expand Up @@ -1832,6 +1835,7 @@ func (m *mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:gocyclo
})

case tui.EmailResultMsg:
m.sendNotice = ""
if msg.Err != nil {
log.Printf("Failed to send email: %v", msg.Err)
m.previousModel = tui.NewChoice()
Expand Down Expand Up @@ -2120,10 +2124,25 @@ func (m *mainModel) View() tea.View {
if m.showLogPanel {
v.Content = m.renderWithLogPanel(v.Content)
}
if m.sendNotice != "" {
v.Content = m.renderSendNoticeOverlay(v.Content)
}
v.AltScreen = true
return v
}

func (m *mainModel) renderSendNoticeOverlay(content string) string {
box := lipgloss.NewStyle().
Border(lipgloss.RoundedBorder()).
BorderForeground(theme.ActiveTheme.Accent).
Padding(0, 1).
Render(m.sendNotice)
lines := strings.Split(box, "\n")
boxWidth := lipgloss.Width(lines[0])
col := max(0, m.width-boxWidth)
return overlay.Block(content, lines, 0, col)
}

func (m *mainModel) currentWindowSize() tea.WindowSizeMsg {
return tea.WindowSizeMsg{
Width: m.width,
Expand Down
Loading