Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't send typing stop event if not necessary

Browse Source
This commit is contained in:
Tulir Asokan 2020-03-03 21:15:25 +02:00
parent 27ecb48e23
commit fbe387f912
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
matrix/matrix.go
View File

@ -778,7 +778,8 @@ func (c *Container) Redact(roomID, eventID, reason string) error {
func (c *Container) SendEvent(event *event.Event) (string, error) { func (c *Container) SendEvent(event *event.Event) (string, error) {
defer debug.Recover() defer debug.Recover()
c.SendTyping(event.RoomID, false) c.client.UserTyping(event.RoomID, false, 0)
c.typing = 0
resp, err := c.client.SendMessageEvent(event.RoomID, event.Type, event.Content, mautrix.ReqSendEvent{TransactionID: event.Unsigned.TransactionID}) resp, err := c.client.SendMessageEvent(event.RoomID, event.Type, event.Content, mautrix.ReqSendEvent{TransactionID: event.Unsigned.TransactionID})
if err != nil { if err != nil {
return "", err return "", err
@ -786,19 +787,23 @@ func (c *Container) SendEvent(event *event.Event) (string, error) {
return resp.EventID, nil return resp.EventID, nil
} }
func (c *Container) sendTypingAsync(roomID string, typing bool, timeout int64) {
defer debug.Recover()
_, _ = c.client.UserTyping(roomID, typing, timeout)
}
// SendTyping sets whether or not the user is typing in the given room. // SendTyping sets whether or not the user is typing in the given room.
func (c *Container) SendTyping(roomID string, typing bool) { func (c *Container) SendTyping(roomID string, typing bool) {
defer debug.Recover()
ts := time.Now().Unix() ts := time.Now().Unix()
if c.typing > ts && typing { if (c.typing > ts && typing) || (c.typing == 0 && !typing) {
return return
} }
if typing { if typing {
_, _ = c.client.UserTyping(roomID, true, 20000) go c.sendTypingAsync(roomID, true, 20000)
c.typing = ts + 15 c.typing = ts + 15
} else { } else {
_, _ = c.client.UserTyping(roomID, false, 0) go c.sendTypingAsync(roomID, false, 0)
c.typing = 0 c.typing = 0
} }
} }

6
ui/view-main.go
View File

@ -134,11 +134,7 @@ func (view *MainView) MarkRead(roomView *RoomView) {
func (view *MainView) InputChanged(roomView *RoomView, text string) { func (view *MainView) InputChanged(roomView *RoomView, text string) {
if !roomView.config.Preferences.DisableTypingNotifs { if !roomView.config.Preferences.DisableTypingNotifs {
if len(text) == 0 { view.matrix.SendTyping(roomView.Room.ID, len(text) > 0 && text[0] != '/')
go view.matrix.SendTyping(roomView.Room.ID, false)
} else if text[0] != '/' {
go view.matrix.SendTyping(roomView.Room.ID, true)
}
} }
} }