From 9b63defbe8c0cff685e425136d352e6045e344f3 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 4 Mar 2023 14:32:30 +0200 Subject: [PATCH] Fix order of cleanup and removing mxid --- commands.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands.go b/commands.go index 660edff..753d2cb 100644 --- a/commands.go +++ b/commands.go @@ -737,8 +737,8 @@ func fnBridge(ce *WrappedCommandEvent) { Bool("delete", deleteOld). Msg("Unbridging old room") portal.removeFromSpace() + portal.cleanup(!deleteOld) portal.RemoveMXID() - portal.cleanup(deleteOld) ce.ZLog.Info(). Str("old_room_id", portal.MXID.String()). Bool("delete", deleteOld). @@ -787,8 +787,8 @@ func fnUnbridge(ce *WrappedCommandEvent) { ce.Portal.roomCreateLock.Lock() defer ce.Portal.roomCreateLock.Lock() ce.Portal.removeFromSpace() - ce.Portal.RemoveMXID() ce.Portal.cleanup(ce.Command == "delete-portal") + ce.Portal.RemoveMXID() } var cmdDeleteAllPortals = &commands.FullHandler{