Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure we've acquired the room lock before checking the mxid

Browse Source
This commit is contained in:
Gary Kramlich
2022-05-02 09:29:38 -05:00
parent 59ea003f51
commit 3a1cb2fc78
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bridge/portal.go
View File

@@ -172,14 +172,14 @@ func (p *Portal) MainIntent() *appservice.IntentAPI {
} }
func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error { func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error {
p.roomCreateLock.Lock()
defer p.roomCreateLock.Unlock()
// If we have a matrix id the room should exist so we have nothing to do. // If we have a matrix id the room should exist so we have nothing to do.
if p.MXID != "" { if p.MXID != "" {
return nil return nil
} }
p.roomCreateLock.Lock()
defer p.roomCreateLock.Unlock()
p.Type = channel.Type p.Type = channel.Type
if p.Type == discordgo.ChannelTypeDM { if p.Type == discordgo.ChannelTypeDM {
p.DMUser = channel.Recipients[0].ID p.DMUser = channel.Recipients[0].ID