From 16040adc53321aa80b7b6724d6253cd030e4870c Mon Sep 17 00:00:00 2001 From: Nick Mills-Barrett Date: Mon, 2 Dec 2024 20:08:42 +0000 Subject: [PATCH] dependencies: update mautrix-go --- go.mod | 2 +- go.sum | 4 ++-- pkg/connector/client.go | 7 +++---- pkg/connector/login.go | 5 +---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 40166c34..ba238b6e 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f golang.org/x/net v0.31.0 - maunium.net/go/mautrix v0.22.1-0.20241119140028-4bc4bc00465a + maunium.net/go/mautrix v0.22.1-0.20241202131110-166ba04aae02 ) require ( diff --git a/go.sum b/go.sum index a10d6aee..7010e927 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ 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.22.1-0.20241119140028-4bc4bc00465a h1:mClMaxDq8iiBEvoHgi2chKZiRMzhU7idN9ihhqaLpWI= -maunium.net/go/mautrix v0.22.1-0.20241119140028-4bc4bc00465a/go.mod h1:oqwf9WYC/brqucM+heYk4gX11O59nP+ljvyxVhndFIM= +maunium.net/go/mautrix v0.22.1-0.20241202131110-166ba04aae02 h1:g8L4GpOhyg5EuXtASDKyU9Cg79ZjATlUnh+giFumQgc= +maunium.net/go/mautrix v0.22.1-0.20241202131110-166ba04aae02/go.mod h1:oqwf9WYC/brqucM+heYk4gX11O59nP+ljvyxVhndFIM= nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y= nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= diff --git a/pkg/connector/client.go b/pkg/connector/client.go index e7c4a2fa..4d8c678a 100644 --- a/pkg/connector/client.go +++ b/pkg/connector/client.go @@ -450,17 +450,17 @@ func (t *TelegramClient) onAuthError(ctx context.Context, err error) { } } -func (t *TelegramClient) Connect(ctx context.Context) error { +func (t *TelegramClient) Connect(ctx context.Context) { if !t.userLogin.Metadata.(*UserLoginMetadata).Session.HasAuthKey() { t.sendBadCredentials("User does not have an auth key") - return nil + return } var err error ctx, t.clientCancel, err = connectTelegramClient(ctx, t.client) if err != nil { t.sendUnknownError(err) - return nil + return } go func() { err = t.updatesManager.Run(ctx, t.client.API(), t.telegramUserID, updates.AuthOptions{}) @@ -489,7 +489,6 @@ func (t *TelegramClient) Connect(ctx context.Context) error { CreatePortal: false, // Do not create the portal if it doesn't already exist }, }) - return nil } func (t *TelegramClient) Disconnect() { diff --git a/pkg/connector/login.go b/pkg/connector/login.go index 5fe8d4e6..c16b992b 100644 --- a/pkg/connector/login.go +++ b/pkg/connector/login.go @@ -74,10 +74,7 @@ func finalizeLogin(ctx context.Context, user *bridgev2.User, authorization *tg.A if err != nil { return nil, fmt.Errorf("failed to save new login: %w", err) } - err = ul.Client.Connect(ul.Log.WithContext(context.Background())) - if err != nil { - return nil, fmt.Errorf("failed to connect after login: %w", err) - } + ul.Client.Connect(ul.Log.WithContext(context.Background())) client := ul.Client.(*TelegramClient) me, err := client.client.Self(ctx) if err != nil {