was in master, but not in v3

rusq · Jan 14, 2024 · 0c08205 · 0c08205
1 parent efa5108
commit 0c08205
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/channels.go b/channels.go
@@ -63,7 +63,7 @@ func (s *Session) getChannels(ctx context.Context, chanTypes []string, cb func(t
 			nextcur string
 		)
 		reqStart := time.Now()
-		if err := withRetry(ctx, limiter, s.cfg.limits.Tier3.Retries, func() error {
+		if err := network.WithRetry(ctx, limiter, s.cfg.limits.Tier3.Retries, func() error {
 			var err error
 			trace.WithRegion(ctx, "GetConversationsContext", func() {
 				chans, nextcur, err = s.client.GetConversationsContext(ctx, params)

diff --git a/messages.go b/messages.go
@@ -108,7 +108,7 @@ func (s *Session) dumpChannel(ctx context.Context, channelID string, oldest, lat
 			resp *slack.GetConversationHistoryResponse
 		)
 		reqStart := time.Now()
-		if err := withRetry(ctx, convLimiter, s.cfg.limits.Tier3.Retries, func() error {
+		if err := network.WithRetry(ctx, convLimiter, s.cfg.limits.Tier3.Retries, func() error {
 			var err error
 			trace.WithRegion(ctx, "GetConversationHistoryContext", func() {
 				resp, err = s.client.GetConversationHistoryContext(ctx, &slack.GetConversationHistoryParameters{
@@ -168,7 +168,7 @@ func (s *Session) dumpChannel(ctx context.Context, channelID string, oldest, lat
 func (s *Session) getChannelName(ctx context.Context, l *rate.Limiter, channelID string) (string, error) {
 	// get channel name
 	var ci *slack.Channel
-	if err := withRetry(ctx, l, s.cfg.limits.Tier3.Retries, func() error {
+	if err := network.WithRetry(ctx, l, s.cfg.limits.Tier3.Retries, func() error {
 		var err error
 		ci, err = s.client.GetConversationInfoContext(ctx, &slack.GetConversationInfoInput{ChannelID: channelID})
 		return err

diff --git a/slackdump.go b/slackdump.go
@@ -181,19 +181,14 @@ func (s *Session) limiter(t network.Tier) *rate.Limiter {
 		tl = s.cfg.limits.Tier2
 	case network.Tier3:
 		tl = s.cfg.limits.Tier3
+	case network.Tier4:
+		tl = s.cfg.limits.Tier4
 	default:
 		tl = s.cfg.limits.Tier3
 	}
 	return network.NewLimiter(t, tl.Burst, int(tl.Boost)) // BUG: tier was always 3, should fix in master too.
 }
 
-// withRetry will run the callback function fn. If the function returns
-// slack.RateLimitedError, it will delay, and then call it again up to
-// maxAttempts times. It will return an error if it runs out of attempts.
-func withRetry(ctx context.Context, l *rate.Limiter, maxAttempts int, fn func() error) error {
-	return network.WithRetry(ctx, l, maxAttempts, fn)
-}
-
 // Info returns a workspace information.  Slackdump retrieves workspace
 // information during the initialisation when performing authentication test,
 // so no API call is involved at this point.

diff --git a/thread.go b/thread.go
@@ -110,7 +110,7 @@ func (s *Session) dumpThread(
 			nextCursor string
 		)
 		reqStart := time.Now()
-		if err := withRetry(ctx, l, s.cfg.limits.Tier3.Retries, func() error {
+		if err := network.WithRetry(ctx, l, s.cfg.limits.Tier3.Retries, func() error {
 			var err error
 			trace.WithRegion(ctx, "GetConversationRepliesContext", func() {
 				msgs, hasmore, nextCursor, err = s.client.GetConversationRepliesContext(

diff --git a/users.go b/users.go
@@ -49,7 +49,7 @@ func (s *Session) fetchUsers(ctx context.Context) (types.Users, error) {
 	l := network.NewLimiter(
 		network.Tier2, s.cfg.limits.Tier2.Burst, int(s.cfg.limits.Tier2.Boost),
 	)
-	if err := withRetry(ctx, l, s.cfg.limits.Tier2.Retries, func() error {
+	if err := network.WithRetry(ctx, l, s.cfg.limits.Tier2.Retries, func() error {
 		var err error
 		users, err = s.client.GetUsersContext(ctx)
 		return err