From 2b5abc74d2f24cb8c0d624b8c12ac154a90ad89c Mon Sep 17 00:00:00 2001
From: zhaoYangguang <1163765691@qq.com>
Date: Tue, 12 Jan 2021 17:14:29 +0800
Subject: [PATCH] optimize double puppeting logic

---
 portal.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/portal.go b/portal.go
index a46c5f7..8fefab4 100644
--- a/portal.go
+++ b/portal.go
@@ -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)
+			}
 		}
 	}
 }