MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-12-14 09:23:51 +01:00
Code Issues Projects Releases Wiki Activity

Fix concurrency issues creating/getting the space

Browse source
This commit is contained in:
Helder Ferreira 2021-12-29 12:19:16 +00:00
parent 0a8bd7794b
commit dfa845efb4
No known key found for this signature in database
GPG key ID: 3848724EAD604B85
2 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.go
View file

@ -180,8 +180,9 @@ type Bridge struct {
usersByUsername map[string]*User
usersLock sync.Mutex
spaceRooms map[id.RoomID]*User
managementRoomsLock sync.Mutex
spaceRoomsLock sync.Mutex
managementRooms map[id.RoomID]*User
managementRoomsLock sync.Mutex
portalsByMXID map[id.RoomID]*Portal
portalsByJID map[database.PortalKey]*Portal
portalsLock sync.Mutex
@ -480,6 +481,7 @@ func main() {
(&Bridge{
usersByMXID: make(map[id.UserID]*User),
usersByUsername: make(map[string]*User),
spaceRooms: make(map[id.RoomID]*User),
managementRooms: make(map[id.RoomID]*User),
portalsByMXID: make(map[id.RoomID]*Portal),
portalsByJID: make(map[database.PortalKey]*Portal),

60
user.go
View file

@ -57,8 +57,9 @@ type User struct {
Whitelisted bool
RelayWhitelisted bool
mgmtCreateLock sync.Mutex
connLock sync.Mutex
mgmtCreateLock sync.Mutex
spaceCreateLock sync.Mutex
connLock sync.Mutex
historySyncs chan *events.HistorySync
prevBridgeStatus *BridgeState
@ -182,45 +183,50 @@ func (bridge *Bridge) NewUser(dbUser *database.User) *User {
func (user *User) getSpaceRoom() id.RoomID {
var roomID id.RoomID
user.log.Debugln("getSpaceRoom called")
if len(user.SpaceRoom) == 0 {
//TODO check if Spaces creation is enabled by config
creationContent := make(map[string]interface{})
creationContent["type"] = "m.space"
user.log.Debugln("Creating a new space for the user")
//Create Space
user.log.Debugln("Locking to create space.")
user.spaceCreateLock.Lock()
defer user.spaceCreateLock.Unlock()
user.log.Debugln("Inviting user " + user.MXID)
var invite []id.UserID
invite = append(invite, user.MXID)
resp, err := user.bridge.Bot.CreateRoom(&mautrix.ReqCreateRoom{
Visibility: "private",
Name: "WhatsApp",
Topic: "WhatsApp bridge Space",
Invite: invite,
CreationContent: creationContent,
})
if err != nil {
user.log.Errorln("Failed to auto-create space room:", err)
if len(user.SpaceRoom) != 0 {
roomID = user.SpaceRoom
user.log.Debugln("Returning space after lock" + user.SpaceRoom)
} else {
user.setSpaceRoom(resp.RoomID)
creationContent := make(map[string]interface{})
creationContent["type"] = "m.space"
user.log.Debugln("Creating a new space for the user")
user.log.Debugln("Inviting user " + user.MXID)
var invite []id.UserID
invite = append(invite, user.MXID)
resp, err := user.bridge.Bot.CreateRoom(&mautrix.ReqCreateRoom{
Visibility: "private",
Name: "WhatsApp",
Topic: "WhatsApp bridge Space",
Invite: invite,
CreationContent: creationContent,
})
if err != nil {
user.log.Errorln("Failed to auto-create space room:", err)
} else {
user.setSpaceRoom(resp.RoomID)
roomID = resp.RoomID
}
}
} else {
user.log.Debugln("Space found" + user.SpaceRoom)
roomID = user.SpaceRoom
}
return roomID
}
func (user *User) setSpaceRoom(spaceID id.RoomID) {
existingUser, ok := user.bridge.spaceRooms[spaceID]
if ok {
existingUser.SpaceRoom = ""
existingUser.Update()
}
user.SpaceRoom = spaceID
user.bridge.spaceRooms[user.SpaceRoom] = user
user.Update()