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

Fix bugs in manual un/bridging

Browse Source
This commit is contained in:
Tulir Asokan
2023-03-10 18:41:28 +02:00
parent 0deec8b853
commit ef7e77515a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
commands.go
View File

@@ -708,7 +708,7 @@ func fnBridge(ce *WrappedCommandEvent) {
return return
} }
portal.roomCreateLock.Lock() portal.roomCreateLock.Lock()
defer portal.roomCreateLock.Lock() defer portal.roomCreateLock.Unlock()
if portal.MXID != "" { if portal.MXID != "" {
hasUnbridgePermission := ce.User.PermissionLevel >= bridgeconfig.PermissionLevelAdmin hasUnbridgePermission := ce.User.PermissionLevel >= bridgeconfig.PermissionLevelAdmin
if !hasUnbridgePermission { if !hasUnbridgePermission {
@@ -759,9 +759,10 @@ func fnBridge(ce *WrappedCommandEvent) {
state, err := portal.MainIntent().State(portal.MXID) state, err := portal.MainIntent().State(portal.MXID)
if err != nil { if err != nil {
ce.ZLog.Error().Err(err).Msg("Failed to update state cache for room") ce.ZLog.Error().Err(err).Msg("Failed to update state cache for room")
} else {
encryptionEvent, isEncrypted := state[event.StateEncryption][""]
portal.Encrypted = isEncrypted && encryptionEvent.Content.AsEncryption().Algorithm == id.AlgorithmMegolmV1
} }
encryptionEvent, isEncrypted := state[event.StateEncryption][""]
portal.Encrypted = isEncrypted && encryptionEvent.Content.AsEncryption().Algorithm == id.AlgorithmMegolmV1
portal.Update() portal.Update()
ce.Reply("Room successfully bridged") ce.Reply("Room successfully bridged")
ce.ZLog.Info(). ce.ZLog.Info().
@@ -794,9 +795,9 @@ var cmdDeletePortal = &commands.FullHandler{
func fnUnbridge(ce *WrappedCommandEvent) { func fnUnbridge(ce *WrappedCommandEvent) {
ce.Portal.roomCreateLock.Lock() ce.Portal.roomCreateLock.Lock()
defer ce.Portal.roomCreateLock.Lock() defer ce.Portal.roomCreateLock.Unlock()
ce.Portal.removeFromSpace() ce.Portal.removeFromSpace()
ce.Portal.cleanup(ce.Command == "delete-portal") ce.Portal.cleanup(ce.Command == "unbridge")
ce.Portal.RemoveMXID() ce.Portal.RemoveMXID()
} }
@@ -845,7 +846,7 @@ func fnDeleteAllPortals(ce *WrappedCommandEvent) {
guild.Delete() guild.Delete()
leave(guild.MXID, ce.Bot) leave(guild.MXID, ce.Bot)
} }
ce.Reply("Finished deleting portal info. Now cleaning up rooms in background.") ce.Reply("Finished deleting portal info. Now cleaning up rooms in background. You'll have to restart the bridge or relogin before rooms can be bridged again.")
go func() { go func() {
for _, portal := range portals { for _, portal := range portals {