mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-15 01:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix linter error

Browse source
This commit is contained in:
Devon Hudson 2023-05-23 15:20:25 -06:00
parent e678912a80
commit 8b5a211431
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roomserver/internal/perform/perform_invite.go
View file

@ -158,10 +158,10 @@ func (r *Inviter) PerformInvite(
StateKey: "", StateKey: "",
}) })
} }
if is, err := r.GenerateInviteStrippedState(ctx, *validRoomID, stateWanted, req.Event); err == nil { if is, generateErr := r.GenerateInviteStrippedState(ctx, *validRoomID, stateWanted, req.Event); generateErr == nil {
inviteState = is inviteState = is
} else { } else {
util.GetLogger(ctx).WithError(err).Error("failed querying known room") util.GetLogger(ctx).WithError(generateErr).Error("failed querying known room")
return nil, spec.InternalServerError{} return nil, spec.InternalServerError{}
} }
} }
@ -241,6 +241,7 @@ func (r *Inviter) PerformInvite(
) )
return nil, api.ErrNotAllowed{Err: err} return nil, api.ErrNotAllowed{Err: err}
} }
// TODO: Move everything above here to gmsl (including fed call?)
// If the invite originated from us and the target isn't local then we // If the invite originated from us and the target isn't local then we
// should try and send the invite over federation first. It might be // should try and send the invite over federation first. It might be