Skip to content

fix(cli): switch to SimpleWaiter to unblock cross-DC downloads #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vtxyer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): switch to SimpleWaiter to unblock cross-DC downloads #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions cmd/tg/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type app struct {

cfg Config
log *zap.Logger
waiter *floodwait.Waiter
waiter *floodwait.SimpleWaiter
printer *output.Printer

// active is the account currently being operated on (set per run iteration).
Expand All @@ -80,7 +80,7 @@ func newApp() *app {
}

return &app{
waiter: floodwait.NewWaiter(),
waiter: floodwait.NewSimpleWaiter(),
log: defaultLog,
printer: output.New(output.Text, nil),
}
Expand Down Expand Up @@ -225,10 +225,8 @@ func (a *app) connectWith(
}
client := telegram.NewClient(appID, appHash, a.optionsFor(st, rp, d))

if err := a.waiter.Run(ctx, func(ctx context.Context) error {
return client.Run(ctx, func(ctx context.Context) error {
return f(ctx, client, d)
})
if err := client.Run(ctx, func(ctx context.Context) error {
return f(ctx, client, d)
}); err != nil && !errors.Is(err, context.Canceled) {
return err
}
Expand Down