deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bridgev2/portal: send typing stop after message
Some checks are pending
Go / Lint (latest) (push) Waiting to run
Details
Go / Build (old, libolm) (push) Waiting to run
Details
Go / Build (latest, libolm) (push) Waiting to run
Details
Go / Build (old, goolm) (push) Waiting to run
Details
Go / Build (latest, goolm) (push) Waiting to run
Details

Browse source
This commit is contained in:
Tulir Asokan 2025-04-02 12:03:07 +03:00
commit 93b9509135
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bridgev2/portal.go
View file

@ -20,6 +20,7 @@ import (
"github.com/rs/zerolog"
"go.mau.fi/util/exfmt"
"go.mau.fi/util/exslices"
"go.mau.fi/util/exsync"
"go.mau.fi/util/ptr"
"go.mau.fi/util/variationselector"
"golang.org/x/exp/maps"
@ -77,6 +78,7 @@ type Portal struct {
currentlyTyping []id.UserID
currentlyTypingLogins map[id.UserID]*UserLogin
currentlyTypingLock sync.Mutex
currentlyTypingGhosts *exsync.Set[id.UserID]
outgoingMessages map[networkid.TransactionID]*outgoingMessage
outgoingMessagesLock sync.Mutex
@ -115,6 +117,7 @@ func (br *Bridge) loadPortal(ctx context.Context, dbPortal *database.Portal, que
Bridge: br,
currentlyTypingLogins: make(map[id.UserID]*UserLogin),
currentlyTypingGhosts: exsync.NewSet[id.UserID](),
outgoingMessages: make(map[networkid.TransactionID]*outgoingMessage),
}
br.portalsByKey[portal.PortalKey] = portal
@ -2099,6 +2102,9 @@ func (portal *Portal) handleRemoteMessage(ctx context.Context, source *UserLogin
return
}
portal.sendConvertedMessage(ctx, evt.GetID(), intent, evt.GetSender().Sender, converted, ts, getStreamOrder(evt), nil)
if portal.currentlyTypingGhosts.Pop(intent.GetMXID()) {
intent.MarkTyping(ctx, portal.MXID, TypingTypeText, 0)
}
}
func (portal *Portal) sendRemoteErrorNotice(ctx context.Context, intent MatrixAPI, err error, ts time.Time, evtTypeName string) {
@ -2161,6 +2167,9 @@ func (portal *Portal) handleRemoteEdit(ctx context.Context, source *UserLogin, e
return
}
portal.sendConvertedEdit(ctx, existing[0].ID, evt.GetSender().Sender, converted, intent, ts, getStreamOrder(evt))
if portal.currentlyTypingGhosts.Pop(intent.GetMXID()) {
intent.MarkTyping(ctx, portal.MXID, TypingTypeText, 0)
}
}
func (portal *Portal) sendConvertedEdit(
@ -2709,10 +2718,16 @@ func (portal *Portal) handleRemoteTyping(ctx context.Context, source *UserLogin,
typingType = typedEvt.GetTypingType()
}
intent := portal.GetIntentFor(ctx, evt.GetSender(), source, RemoteEventTyping)
err := intent.MarkTyping(ctx, portal.MXID, typingType, evt.GetTimeout())
timeout := evt.GetTimeout()
err := intent.MarkTyping(ctx, portal.MXID, typingType, timeout)
if err != nil {
zerolog.Ctx(ctx).Err(err).Msg("Failed to bridge typing event")
}
if timeout == 0 {
portal.currentlyTypingGhosts.Remove(intent.GetMXID())
} else {
portal.currentlyTypingGhosts.Add(intent.GetMXID())
}
}
func (portal *Portal) handleRemoteChatInfoChange(ctx context.Context, source *UserLogin, evt RemoteChatInfoChange) {