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/matrixinvite: fix setting service members when creating DM via invite
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-01-04 12:42:16 +02:00
commit 012c246061
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
bridgev2/matrixinvite.go
View file

@ -182,6 +182,14 @@ func (br *Bridge) handleGhostDMInvite(ctx context.Context, evt *event.Event, sen
portal.UpdateInfo(ctx, resp.PortalInfo, sourceLogin, nil, time.Time{})
}
if didSetPortal {
message := "Private chat portal created"
err = br.givePowerToBot(ctx, evt.RoomID, invitedGhost.Intent)
hasWarning := false
if err != nil {
log.Warn().Err(err).Msg("Failed to give power to bot in new DM")
message += "\n\nWarning: failed to promote bot"
hasWarning = true
}
// TODO this might become unnecessary if UpdateInfo starts taking care of it
_, err = br.Bot.SendState(ctx, portal.MXID, event.StateElementFunctionalMembers, "", &event.Content{
Parsed: &event.ElementFunctionalMembersContent{
@ -190,14 +198,10 @@ func (br *Bridge) handleGhostDMInvite(ctx context.Context, evt *event.Event, sen
}, time.Time{})
if err != nil {
log.Warn().Err(err).Msg("Failed to set service members in room")
}
message := "Private chat portal created"
err = br.givePowerToBot(ctx, evt.RoomID, invitedGhost.Intent)
hasWarning := false
if err != nil {
log.Warn().Err(err).Msg("Failed to give power to bot in new DM")
message += "\n\nWarning: failed to promote bot"
hasWarning = true
if !hasWarning {
message += "\n\nWarning: failed to set service members"
hasWarning = true
}
}
mx, ok := br.Matrix.(MatrixConnectorWithPostRoomBridgeHandling)
if ok {
@ -225,6 +229,9 @@ func (br *Bridge) givePowerToBot(ctx context.Context, roomID id.RoomID, userWith
}
userLevel := powers.GetUserLevel(userWithPower.GetMXID())
if powers.EnsureUserLevelAs(userWithPower.GetMXID(), br.Bot.GetMXID(), userLevel) {
if userLevel > powers.UsersDefault {
powers.SetUserLevel(userWithPower.GetMXID(), userLevel-1)
}
_, err = userWithPower.SendState(ctx, roomID, event.StatePowerLevels, "", &event.Content{
Parsed: powers,
}, time.Time{})