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

Fix empty senderID

Browse source
This commit is contained in:
Till Faelligen 2023-06-15 14:05:56 +02:00
parent 07960a5efc
commit e6fd65b8fc
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
federationapi/consumers/roomserver.go
View file

@ -411,7 +411,7 @@ func JoinedHostsFromEvents(ctx context.Context, evs []gomatrixserverlib.PDU, rsA
if err != nil { if err != nil {
return nil, err return nil, err
} }
userID, err := rsAPI.QueryUserIDForSender(ctx, *validRoomID, ev.SenderID()) userID, err := rsAPI.QueryUserIDForSender(ctx, *validRoomID, spec.SenderID(*ev.StateKey()))
if err != nil { if err != nil {
return nil, err return nil, err
} }

3
roomserver/internal/perform/perform_join.go
View file

@ -204,7 +204,8 @@ func (r *Joiner) performJoinRoomByID(
senderID, err = r.Queryer.QuerySenderIDForUser(ctx, *roomID, *userID) senderID, err = r.Queryer.QuerySenderIDForUser(ctx, *roomID, *userID)
if err == nil { if err == nil {
checkInvitePending = true checkInvitePending = true
} else { }
if senderID == "" {
// create user room key if needed // create user room key if needed
key, keyErr := r.RSAPI.GetOrCreateUserRoomPrivateKey(ctx, *userID, *roomID) key, keyErr := r.RSAPI.GetOrCreateUserRoomPrivateKey(ctx, *userID, *roomID)
if keyErr != nil { if keyErr != nil {