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

bridgev2: don't use double puppet of other user in DMs

Browse source
This commit is contained in:
Tulir Asokan 2024-06-29 23:29:51 +03:00
commit f2585f7bcc
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bridgev2/portal.go
View file

@ -999,7 +999,7 @@ func (portal *Portal) getIntentAndUserMXIDFor(ctx context.Context, sender EventS
return
}
extraUserID = source.UserMXID
} else if sender.SenderLogin != "" {
} else if sender.SenderLogin != "" && portal.Receiver == "" {
senderLogin := portal.Bridge.GetCachedUserLoginByID(sender.SenderLogin)
if senderLogin != nil {
intent = senderLogin.User.DoublePuppet(ctx)
@ -1010,13 +1010,15 @@ func (portal *Portal) getIntentAndUserMXIDFor(ctx context.Context, sender EventS
}
}
if sender.Sender != "" {
for _, login := range otherLogins {
if login.Client.IsThisUser(ctx, sender.Sender) {
intent = login.User.DoublePuppet(ctx)
if intent != nil {
return
if portal.Receiver == "" {
for _, login := range otherLogins {
if login.Client.IsThisUser(ctx, sender.Sender) {
intent = login.User.DoublePuppet(ctx)
if intent != nil {
return
}
extraUserID = login.UserMXID
}
extraUserID = login.UserMXID
}
}
ghost, err := portal.Bridge.GetGhostByID(ctx, sender.Sender)