deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bridgev2/userlogin: add blocking cleanup delete option
Some checks failed
Go / Lint (latest) (push) Has been cancelled
Details
Go / Build (old, libolm) (push) Has been cancelled
Details
Go / Build (latest, libolm) (push) Has been cancelled
Details
Go / Build (old, goolm) (push) Has been cancelled
Details
Go / Build (latest, goolm) (push) Has been cancelled
Details

Browse source 
This allows the caller to block until the cleanup actions are complete.
This commit is contained in:
Nick Mills-Barrett 2024-11-27 15:07:47 +00:00
commit b32def2b14
No known key found for this signature in database
GPG key ID: 31F23F2CF354937B
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bridgev2/userlogin.go
View file

@ -255,6 +255,7 @@ func (ul *UserLogin) Logout(ctx context.Context) {
type DeleteOpts struct {
LogoutRemote bool
DontCleanupRooms bool
BlockingCleanup bool
unlocked bool
}
@ -295,9 +296,17 @@ func (ul *UserLogin) Delete(ctx context.Context, state status.BridgeState, opts
ul.Bridge.cacheLock.Unlock()
}
backgroundCtx := context.WithoutCancel(ctx)
go ul.deleteSpace(backgroundCtx)
if !opts.BlockingCleanup {
go ul.deleteSpace(backgroundCtx)
} else {
ul.deleteSpace(backgroundCtx)
}
if portals != nil {
go ul.kickUserFromPortals(backgroundCtx, portals, state.StateEvent == status.StateBadCredentials, false)
if !opts.BlockingCleanup {
go ul.kickUserFromPortals(backgroundCtx, portals, state.StateEvent == status.StateBadCredentials, false)
} else {
ul.kickUserFromPortals(backgroundCtx, portals, state.StateEvent == status.StateBadCredentials, false)
}
}
if state.StateEvent != "" {
ul.BridgeState.Send(state)