oiupoyt/discordo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(chat): route typing indicator through command

Browse source
This commit is contained in:
ayn2op 2026-05-11 23:17:16 -04:00
parent c4779f537f
commit 308ce749ed
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
internal/ui/chat/message_input.go
View file

@ -156,17 +156,7 @@ func (mi *messageInput) Update(msg tview.Msg) tview.Cmd {
return handler(tcell.NewEventKey(tcell.KeyCtrlZ, "", tcell.ModNone))
}
if mi.cfg.TypingIndicator.Send && mi.typingTimer == nil {
mi.typingTimer = time.AfterFunc(typingDuration, func() {
mi.typingTimerMu.Lock()
mi.typingTimer = nil
mi.typingTimerMu.Unlock()
})
if selectedChannel := mi.chat.SelectedChannel(); selectedChannel != nil {
go mi.chat.state.Typing(selectedChannel.ID)
}
}
typingCmd := mi.sendTyping()
if mi.cfg.AutocompleteLimit > 0 {
if mi.chat.GetVisible(mentionsListLayerName) {
@ -175,13 +165,14 @@ func (mi *messageInput) Update(msg tview.Msg) tview.Cmd {
keybind.Matches(msg, keybinds.Down.Keybind) ||
keybind.Matches(msg, keybinds.Top.Keybind) ||
keybind.Matches(msg, keybinds.Bottom.Keybind) {
return mi.mentionsList.Update(msg)
return tview.Batch(typingCmd, mi.mentionsList.Update(msg))
}
}
// Apply key edits first, then recompute autocomplete through Msg/Cmd.
return tview.Sequence(handler(msg), mi.tabSuggest())
return tview.Batch(typingCmd, tview.Sequence(handler(msg), mi.tabSuggest()))
}
return tview.Batch(typingCmd, handler(msg))
}
return handler(msg)
}
@ -245,6 +236,28 @@ func closeFiles(files []sendpart.File) tview.Cmd {
}
}
func (mi *messageInput) sendTyping() tview.Cmd {
if !mi.cfg.TypingIndicator.Send || mi.typingTimer != nil {
return nil
}
mi.typingTimer = time.AfterFunc(typingDuration, func() {
mi.typingTimerMu.Lock()
mi.typingTimer = nil
mi.typingTimerMu.Unlock()
})
selectedChannel := mi.chat.SelectedChannel()
if selectedChannel == nil {
return nil
}
channelID := selectedChannel.ID
return func() tview.Msg {
mi.chat.state.Typing(channelID)
return nil
}
}
func (mi *messageInput) send() tview.Cmd {
selected := mi.chat.SelectedChannel()
if selected == nil {