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/portal: add event for waiting for room creation
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 commit is contained in:
Tulir Asokan 2025-10-24 15:14:31 +03:00
commit 02a0aad583
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bridgev2/portal.go
View file

@ -87,6 +87,7 @@ type Portal struct {
lastCapUpdate time.Time
roomCreateLock sync.Mutex
RoomCreated *exsync.Event
functionalMembersLock sync.Mutex
functionalMembersCache *event.ElementFunctionalMembersContent
@ -124,6 +125,11 @@ func (br *Bridge) loadPortal(ctx context.Context, dbPortal *database.Portal, que
currentlyTypingLogins: make(map[id.UserID]*UserLogin),
currentlyTypingGhosts: exsync.NewSet[id.UserID](),
outgoingMessages: make(map[networkid.TransactionID]*outgoingMessage),
RoomCreated: exsync.NewEvent(),
}
if portal.MXID != "" {
portal.RoomCreated.Set()
}
// Putting the portal in the cache before it's fully initialized is mildly dangerous,
// but loading the relay user login may depend on it.
@ -2043,6 +2049,7 @@ func (portal *Portal) UpdateMatrixRoomID(
} else if alreadyExists {
log.Debug().Msg("Replacement room is already a portal, overwriting")
existingPortal.MXID = ""
existingPortal.RoomCreated.Clear()
err := existingPortal.Save(ctx)
if err != nil {
return fmt.Errorf("failed to clear mxid of existing portal: %w", err)
@ -2050,6 +2057,7 @@ func (portal *Portal) UpdateMatrixRoomID(
delete(portal.Bridge.portalsByMXID, portal.MXID)
}
portal.MXID = newRoomID
portal.RoomCreated.Set()
portal.Bridge.portalsByMXID[portal.MXID] = portal
portal.NameSet = false
portal.AvatarSet = false
@ -4832,6 +4840,7 @@ func (portal *Portal) createMatrixRoomInLoop(ctx context.Context, source *UserLo
portal.TopicSet = true
portal.NameSet = true
portal.MXID = roomID
portal.RoomCreated.Set()
portal.Bridge.cacheLock.Lock()
portal.Bridge.portalsByMXID[roomID] = portal
portal.Bridge.cacheLock.Unlock()
@ -4935,6 +4944,7 @@ func (portal *Portal) RemoveMXID(ctx context.Context) error {
return nil
}
portal.MXID = ""
portal.RoomCreated.Clear()
err := portal.Save(ctx)
if err != nil {
return err