diff --git a/go.mod b/go.mod index 117ca1d7..911aab1f 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( golang.org/x/sync v0.20.0 golang.org/x/tools v0.43.0 gopkg.in/yaml.v3 v3.0.1 - maunium.net/go/mautrix v0.26.5-0.20260413182302-f3fab8d38470 + maunium.net/go/mautrix v0.26.5-0.20260414141016-91b7a19ba6f2 rsc.io/qr v0.2.0 ) diff --git a/go.sum b/go.sum index 0fb26cc9..65ddf8af 100644 --- a/go.sum +++ b/go.sum @@ -236,7 +236,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= -maunium.net/go/mautrix v0.26.5-0.20260413182302-f3fab8d38470 h1:vehV8Ev2TzpV5DH9ToCxt43svkXRKcn/kJaZ4mNvRFQ= -maunium.net/go/mautrix v0.26.5-0.20260413182302-f3fab8d38470/go.mod h1:MX4DQLiBe0c7sI/wizruqdxHinSOWs42/DYsP9GH7Q4= +maunium.net/go/mautrix v0.26.5-0.20260414141016-91b7a19ba6f2 h1:8jlbrcc9yp/NyDXZPaiQJT5cUC5Qs6OGyfy3klvxfjw= +maunium.net/go/mautrix v0.26.5-0.20260414141016-91b7a19ba6f2/go.mod h1:MX4DQLiBe0c7sI/wizruqdxHinSOWs42/DYsP9GH7Q4= rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs= diff --git a/pkg/connector/login.go b/pkg/connector/login.go index 5502f341..7acba94d 100644 --- a/pkg/connector/login.go +++ b/pkg/connector/login.go @@ -26,6 +26,7 @@ import ( "time" "github.com/rs/zerolog" + "go.mau.fi/util/ptr" "go.mau.fi/zerozap" "go.uber.org/zap" "maunium.net/go/mautrix/bridgev2" @@ -121,19 +122,18 @@ func (bl *baseLogin) Cancel() { func (bl *baseLogin) makeClient(ctx context.Context, dispatcher *tg.UpdateDispatcher) error { log := zerolog.Ctx(ctx) zaplog := zap.New(zerozap.NewWithLevels(*log, zapLevelMap)) - var updateManager *updates.Manager - if dispatcher != nil { - updateManager = updates.New(updates.Config{ - Handler: dispatcher, - Logger: zaplog.Named("login_update_manager"), - }) + if dispatcher == nil { + dispatcher = ptr.Ptr(tg.NewUpdateDispatcher()) } bl.client = telegram.NewClient(bl.main.Config.APIID, bl.main.Config.APIHash, telegram.Options{ CustomSessionStorage: &bl.session, Logger: zaplog, Device: bl.main.deviceConfig(), - UpdateHandler: updateManager, - NoUpdates: true, + UpdateHandler: updates.New(updates.Config{ + Handler: dispatcher, + Logger: zaplog.Named("login_update_manager"), + }), + NoUpdates: true, }) bl.ctx, bl.cancel = context.WithTimeoutCause(log.WithContext(bl.main.Bridge.BackgroundCtx), LoginTimeout, ErrLoginTimeout)