mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 22:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Post merge problems.

Browse source
This commit is contained in:
Daniel Aloni 2023-01-09 10:11:21 +02:00
parent 3b1d3b75ea
commit 931df9237f
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clientapi/routing/register.go
View file

@ -965,9 +965,10 @@ func completeRegistration(
// TODO-entry refuse register if threepid is already bound to account. // TODO-entry refuse register if threepid is already bound to account.
if threePid != nil { if threePid != nil {
err = userAPI.PerformSaveThreePIDAssociation(ctx, &userapi.PerformSaveThreePIDAssociationRequest{ err = userAPI.PerformSaveThreePIDAssociation(ctx, &userapi.PerformSaveThreePIDAssociationRequest{
Medium: threePid.Medium, Medium: threePid.Medium,
ThreePID: threePid.Address, ThreePID: threePid.Address,
Localpart: accRes.Account.Localpart, Localpart: accRes.Account.Localpart,
ServerName: accRes.Account.ServerName,
}, &struct{}{}) }, &struct{}{})
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{

2
syncapi/sync/request.go
View file

@ -80,8 +80,6 @@ func newSyncRequest(req *http.Request, device userapi.Device, syncDB storage.Dat
filter.AccountData.Limit = math.MaxInt32 filter.AccountData.Limit = math.MaxInt32
filter.Room.AccountData.Limit = math.MaxInt32 filter.Room.AccountData.Limit = math.MaxInt32
} }
// Ignore state limit filter so that e.g. correct room name appears on clients.
filter.Room.State.Limit = math.MaxInt32
logger := util.GetLogger(req.Context()).WithFields(logrus.Fields{ logger := util.GetLogger(req.Context()).WithFields(logrus.Fields{
"user_id": device.UserID, "user_id": device.UserID,

2
userapi/internal/api.go
View file

@ -625,7 +625,7 @@ func (a *UserInternalAPI) PerformAccountDeactivation(ctx context.Context, req *a
return err return err
} }
threepids, err := a.DB.GetThreePIDsForLocalpart(ctx, req.Localpart) threepids, err := a.DB.GetThreePIDsForLocalpart(ctx, req.Localpart, serverName)
if err != nil { if err != nil {
return err return err
} }