tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Fix updating puppetsByCustomMXID map

Browse source
This commit is contained in:
Tulir Asokan 2023-08-22 19:00:58 +03:00
parent bd01c661ef
commit 5fc1e0cebc
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
custompuppet.go
View file

@ -35,6 +35,11 @@ func (puppet *Puppet) SwitchCustomMXID(accessToken string, mxid id.UserID) error
func (puppet *Puppet) ClearCustomMXID() { func (puppet *Puppet) ClearCustomMXID() {
save := puppet.CustomMXID != "" || puppet.AccessToken != "" save := puppet.CustomMXID != "" || puppet.AccessToken != ""
puppet.bridge.puppetsLock.Lock()
if puppet.CustomMXID != "" && puppet.bridge.puppetsByCustomMXID[puppet.CustomMXID] == puppet {
delete(puppet.bridge.puppetsByCustomMXID, puppet.CustomMXID)
}
puppet.bridge.puppetsLock.Unlock()
puppet.CustomMXID = "" puppet.CustomMXID = ""
puppet.AccessToken = "" puppet.AccessToken = ""
puppet.customIntent = nil puppet.customIntent = nil
@ -50,6 +55,9 @@ func (puppet *Puppet) StartCustomMXID(reloginOnFail bool) error {
puppet.ClearCustomMXID() puppet.ClearCustomMXID()
return err return err
} }
puppet.bridge.puppetsLock.Lock()
puppet.bridge.puppetsByCustomMXID[puppet.CustomMXID] = puppet
puppet.bridge.puppetsLock.Unlock()
if puppet.AccessToken != newAccessToken { if puppet.AccessToken != newAccessToken {
puppet.AccessToken = newAccessToken puppet.AccessToken = newAccessToken
puppet.Update() puppet.Update()