optimize double puppeting logic

This commit is contained in:
zhaoYangguang 2021-01-12 17:14:29 +08:00
parent 443d8ca9d1
commit 2b5abc74d2
1 changed files with 4 additions and 2 deletions

View File

@ -342,7 +342,7 @@ func (portal *Portal) getMessageIntentSkype(user *User, info skype.Resource) *ap
}
func (portal *Portal) handlePrivateChatFromMe(fromMe bool) func() {
if portal.IsPrivateChat() && fromMe {
if portal.IsPrivateChat() && fromMe && len(portal.bridge.Config.Bridge.LoginSharedSecret) == 0 {
var privateChatPuppet *Puppet
var privateChatPuppetInvited bool
privateChatPuppet = portal.bridge.GetPuppetByJID(portal.Key.Receiver)
@ -924,7 +924,9 @@ func (portal *Portal) beginBackfill() func() {
portal.privateChatBackfillInvitePuppet = nil
portal.backfillLock.Unlock()
if privateChatPuppet != nil && privateChatPuppetInvited {
//_, _ = privateChatPuppet.DefaultIntent().LeaveRoom(portal.MXID)
if len(portal.bridge.Config.Bridge.LoginSharedSecret) > 0 {
_, _ = privateChatPuppet.DefaultIntent().LeaveRoom(portal.MXID)
}
}
}
}