legacyprovision: pass through timezone param

This commit is contained in:
Tulir Asokan 2024-10-03 12:26:06 +03:00
parent 2370f84817
commit fc986c712c
2 changed files with 3 additions and 10 deletions

View file

@ -116,16 +116,6 @@ func legacyProvLogin(w http.ResponseWriter, r *http.Request) {
return nil
})
//if userTimezone := r.URL.Query().Get("tz"); userTimezone != "" {
// log.Debug().Str("timezone", userTimezone).Msg("Updating user timezone")
// user.Timezone = userTimezone
// err = user.Update(r.Context())
// if err != nil {
// log.Err(err).Msg("Failed to save user after updating timezone")
// }
//} else {
// log.Debug().Msg("No timezone provided in request")
//}
user := m.Matrix.Provisioning.GetUser(r)
loginFlowID := connector.LoginFlowIDQR
phoneNum := r.URL.Query().Get("phone_number")
@ -151,6 +141,7 @@ func legacyProvLogin(w http.ResponseWriter, r *http.Request) {
return
}
waLogin := login.(*connector.WALogin)
waLogin.Timezone = r.URL.Query().Get("tz")
step, err := waLogin.Start(ctx)
if err != nil {
log.Err(err).Msg("Failed to start login")

View file

@ -86,6 +86,7 @@ type WALogin struct {
Client *whatsmeow.Client
Log zerolog.Logger
PhoneCode bool
Timezone string
QRs []string
StartTime time.Time
@ -305,6 +306,7 @@ func (wl *WALogin) Wait(ctx context.Context) (*bridgev2.LoginStep, error) {
},
Metadata: &waid.UserLoginMetadata{
WADeviceID: wl.LoginSuccess.ID.Device,
Timezone: wl.Timezone,
},
}, &bridgev2.NewLoginParams{
DeleteOnConflict: true,