Merge remote-tracking branch 'beeper/main'

2022-05-21 00:13:32 +03:00
parent bd03e80b52 1a660806cb
commit cf5384d908
26 changed files with 978 additions and 102 deletions
--- a/bridge/puppet.go
+++ b/bridge/puppet.go
@@ -164,7 +164,10 @@ func (p *Puppet) CustomIntent() *appservice.IntentAPI {

 func (p *Puppet) updatePortalMeta(meta func(portal *Portal)) {
 	for _, portal := range p.bridge.GetAllPortalsByID(p.ID) {
+		// Get room create lock to prevent races between receiving contact info and room creation.
+		portal.roomCreateLock.Lock()
 		meta(portal)
+		portal.roomCreateLock.Unlock()
 	}
 }