From ca8aff05345966700ebcf5c8bf422c1d4fbcae53 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 4 Nov 2024 08:47:31 -0700 Subject: [PATCH] connector/login: fix crash on login Signed-off-by: Sumner Evans --- pkg/connector/login.go | 5 ++++- pkg/connector/sync.go | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/connector/login.go b/pkg/connector/login.go index 4a7e8345..5fe8d4e6 100644 --- a/pkg/connector/login.go +++ b/pkg/connector/login.go @@ -68,7 +68,9 @@ func finalizeLogin(ctx context.Context, user *bridgev2.User, authorization *tg.A ul, err := user.NewLogin(ctx, &database.UserLogin{ ID: userLoginID, Metadata: &metadata, - }, nil) + }, &bridgev2.NewLoginParams{ + DeleteOnConflict: true, + }) if err != nil { return nil, fmt.Errorf("failed to save new login: %w", err) } @@ -118,6 +120,7 @@ func finalizeLogin(ctx context.Context, user *bridgev2.User, authorization *tg.A Instructions: fmt.Sprintf("Successfully logged in as %d / +%s (%s)", me.ID, me.Phone, remoteName), CompleteParams: &bridgev2.LoginCompleteParams{ UserLoginID: ul.ID, + UserLogin: ul, }, }, nil } diff --git a/pkg/connector/sync.go b/pkg/connector/sync.go index 95db1cc8..0ba6ff8d 100644 --- a/pkg/connector/sync.go +++ b/pkg/connector/sync.go @@ -23,6 +23,10 @@ func (t *TelegramClient) SyncChats(ctx context.Context) error { if limit <= 0 { limit = math.MaxInt32 } + zerolog.Ctx(ctx).Info(). + Int("update_limit", limit). + Int("create_limit", t.main.Config.Sync.CreateLimit). + Msg("syncing chats") dialogs, err := APICallWithUpdates(ctx, t, func() (tg.ModifiedMessagesDialogs, error) { d, err := t.client.API().MessagesGetDialogs(ctx, &tg.MessagesGetDialogsRequest{