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/networkinterface: allow deleting children in chat delete event

Browse source
This commit is contained in:
Tulir Asokan 2025-10-22 18:56:41 +03:00
commit 9fd1e0f87c
3 changed files with 60 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bridgev2/networkinterface.go
View file

@ -1135,6 +1135,11 @@ type RemoteChatDelete interface {
RemoteDeleteOnlyForMe
}
type RemoteChatDeleteWithChildren interface {
RemoteChatDelete
DeleteChildren() bool
}
type RemoteEventThatMayCreatePortal interface {
RemoteEvent
ShouldCreatePortal() bool

49
bridgev2/portal.go
View file

@ -284,6 +284,16 @@ func (br *Bridge) GetDMPortalsWith(ctx context.Context, otherUserID networkid.Us
return br.loadManyPortals(ctx, rows)
}
func (br *Bridge) GetChildPortals(ctx context.Context, parent networkid.PortalKey) ([]*Portal, error) {
br.cacheLock.Lock()
defer br.cacheLock.Unlock()
rows, err := br.DB.Portal.GetChildren(ctx, parent)
if err != nil {
return nil, err
}
return br.loadManyPortals(ctx, rows)
}
func (br *Bridge) GetDMPortal(ctx context.Context, receiver networkid.UserLoginID, otherUserID networkid.UserID) (*Portal, error) {
br.cacheLock.Lock()
defer br.cacheLock.Unlock()
@ -3514,6 +3524,20 @@ func (portal *Portal) findOtherLogins(ctx context.Context, source *UserLogin) (o
return
}
type childDeleteProxy struct {
RemoteChatDeleteWithChildren
child networkid.PortalKey
done func()
}
func (cdp *childDeleteProxy) AddLogContext(c zerolog.Context) zerolog.Context {
return cdp.RemoteChatDeleteWithChildren.AddLogContext(c).Str("subaction", "delete children")
}
func (cdp *childDeleteProxy) GetPortalKey() networkid.PortalKey { return cdp.child }
func (cdp *childDeleteProxy) ShouldCreatePortal() bool { return false }
func (cdp *childDeleteProxy) PreHandle(ctx context.Context, portal *Portal) {}
func (cdp *childDeleteProxy) PostHandle(ctx context.Context, portal *Portal) { cdp.done() }
func (portal *Portal) handleRemoteChatDelete(ctx context.Context, source *UserLogin, evt RemoteChatDelete) EventHandlingResult {
log := zerolog.Ctx(ctx)
if portal.Receiver == "" && evt.DeleteOnlyForMe() {
@ -3549,6 +3573,31 @@ func (portal *Portal) handleRemoteChatDelete(ctx context.Context, source *UserLo
}
}
}
if childDeleter, ok := evt.(RemoteChatDeleteWithChildren); ok && childDeleter.DeleteChildren() && portal.RoomType == database.RoomTypeSpace {
children, err := portal.Bridge.GetChildPortals(ctx, portal.PortalKey)
if err != nil {
log.Err(err).Msg("Failed to fetch children to delete")
return EventHandlingResultFailed.WithError(err)
}
log.Debug().
Int("portal_count", len(children)).
Msg("Deleting child portals before remote chat delete")
var wg sync.WaitGroup
wg.Add(len(children))
for _, child := range children {
child.queueEvent(ctx, &portalRemoteEvent{
evt: &childDeleteProxy{
RemoteChatDeleteWithChildren: childDeleter,
child: child.PortalKey,
done: wg.Done,
},
source: source,
evtType: RemoteEventChatDelete,
})
}
wg.Wait()
log.Debug().Msg("Finished deleting child portals")
}
err := portal.Delete(ctx)
if err != nil {
log.Err(err).Msg("Failed to delete portal from database")

7
bridgev2/simplevent/chat.go
View file

@ -65,14 +65,19 @@ func (evt *ChatResync) GetChatInfo(ctx context.Context, portal *bridgev2.Portal)
type ChatDelete struct {
EventMeta
OnlyForMe bool
Children bool
}
var _ bridgev2.RemoteChatDelete = (*ChatDelete)(nil)
var _ bridgev2.RemoteChatDeleteWithChildren = (*ChatDelete)(nil)
func (evt *ChatDelete) DeleteOnlyForMe() bool {
return evt.OnlyForMe
}
func (evt *ChatDelete) DeleteChildren() bool {
return evt.Children
}
// ChatInfoChange is a simple implementation of [bridgev2.RemoteChatInfoChange].
type ChatInfoChange struct {
EventMeta