1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-03-31 14:04:27 -05:00

Merge branch 'main' into crypto-ids

This commit is contained in:
Devon Hudson 2023-09-13 14:37:56 -06:00
commit 163e865e93
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628

View file

@ -295,7 +295,7 @@ func updateInviteEvent(userIDForSender spec.UserIDForSender, ev gomatrixserverli
userID, err := userIDForSender(*validRoomID, ev.SenderID())
if err != nil || userID == nil {
if err != nil {
logrus.WithError(err).Error("userID is invalid")
err = fmt.Errorf("invalid userID found when updating invite_room_state: %s", err)
}
return nil, err
}