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

Add some additional checks for a portal creation

Browse Source 
Refs #15
This commit is contained in:
Gary Kramlich
2022-02-28 04:52:51 -06:00
parent 2db80efad5
commit 91a08dfd15
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bridge/portal.go
View File

@@ -171,14 +171,17 @@ 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 p.MXID != "" {
return nil
}
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
} }
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

4
bridge/user.go
View File

@@ -374,6 +374,10 @@ func (u *User) channelCreateHandler(s *discordgo.Session, c *discordgo.ChannelCr
key := database.NewPortalKey(c.ID, u.User.ID) key := database.NewPortalKey(c.ID, u.User.ID)
portal := u.bridge.GetPortalByID(key) portal := u.bridge.GetPortalByID(key)
if portal.MXID != "" {
return
}
portal.Name = c.Name portal.Name = c.Name
portal.Topic = c.Topic portal.Topic = c.Topic
portal.Type = c.Type portal.Type = c.Type