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

Fix order of cleanup and removing mxid

Browse Source
This commit is contained in:
Tulir Asokan
2023-03-04 14:32:30 +02:00
parent 4e9e50dbed
commit 9b63defbe8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands.go
View File

@@ -737,8 +737,8 @@ func fnBridge(ce *WrappedCommandEvent) {
Bool("delete", deleteOld). Bool("delete", deleteOld).
Msg("Unbridging old room") Msg("Unbridging old room")
portal.removeFromSpace() portal.removeFromSpace()
portal.cleanup(!deleteOld)
portal.RemoveMXID() portal.RemoveMXID()
portal.cleanup(deleteOld)
ce.ZLog.Info(). ce.ZLog.Info().
Str("old_room_id", portal.MXID.String()). Str("old_room_id", portal.MXID.String()).
Bool("delete", deleteOld). Bool("delete", deleteOld).
@@ -787,8 +787,8 @@ func fnUnbridge(ce *WrappedCommandEvent) {
ce.Portal.roomCreateLock.Lock() ce.Portal.roomCreateLock.Lock()
defer ce.Portal.roomCreateLock.Lock() defer ce.Portal.roomCreateLock.Lock()
ce.Portal.removeFromSpace() ce.Portal.removeFromSpace()
ce.Portal.RemoveMXID()
ce.Portal.cleanup(ce.Command == "delete-portal") ce.Portal.cleanup(ce.Command == "delete-portal")
ce.Portal.RemoveMXID()
} }
var cmdDeleteAllPortals = &commands.FullHandler{ var cmdDeleteAllPortals = &commands.FullHandler{