From 2f3f141cd949e330c0231bb6c2f73689cbe9786c Mon Sep 17 00:00:00 2001 From: Simon Thoby Date: Sat, 11 Mar 2023 21:42:28 +0100 Subject: [PATCH] matrix: process ephemeral typing events when appservice is in use --- bridge/matrix/appservice.go | 2 +- bridge/matrix/matrix.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bridge/matrix/appservice.go b/bridge/matrix/appservice.go index 10fc0c76..7b292494 100644 --- a/bridge/matrix/appservice.go +++ b/bridge/matrix/appservice.go @@ -128,7 +128,7 @@ func (b *Bmatrix) startAppService() error { b.Log.Debug("appservice launched") processor := appservice.NewEventProcessor(wrapper.appService) - for _, eventType := range []event.Type{event.EventRedaction, event.EventMessage, event.EventSticker} { + for _, eventType := range []event.Type{event.EventRedaction, event.EventMessage, event.EventSticker, event.EphemeralEventTyping} { processor.On(eventType, func(ev *event.Event) { b.handleEvent(originAppService, ev) }) diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index 2de0ebfe..0011c45f 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -5,6 +5,7 @@ import ( "fmt" "regexp" "sync" + "time" matrix "maunium.net/go/mautrix" "maunium.net/go/mautrix/event" @@ -205,7 +206,7 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) { } if msg.Event == config.EventUserTyping && b.GetBool("ShowUserTyping") { - _, err := b.mc.UserTyping(channel, true, 15000) + _, err := b.mc.UserTyping(channel, true, 5*time.Second) return "", err } @@ -282,7 +283,7 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) { rmsg.FormattedBody = "* " + msg.Text } else { rmsg.Format = event.FormatHTML - rmsg.FormattedBody = "* " + helper.ParseMarkdown(msg.Text) + rmsg.FormattedBody = helper.ParseMarkdown(msg.Text) rmsg.NewContent.Format = rmsg.Format rmsg.NewContent.FormattedBody = rmsg.FormattedBody }