rms/mirrors-mautrix-telegram
1
0
Fork 0
mirror of https://github.com/mautrix/telegram.git synced 2026-05-16 23:15:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

login: always set update handler

Browse Source
This commit is contained in:
Tulir Asokan
2026-04-14 17:26:33 +03:00
parent b761f04621
commit 3f155672a7
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -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
)

4
go.sum
View File

@@ -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=

16
pkg/connector/login.go
View File

@@ -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)