Skip to content

Commit 57d82ee

Browse files
committed
Fix GetUserInfo
My last changes made this function loop forever. This patch fixes it. Signed-off-by: Andrea Barberio <insomniac@slackware.it>
1 parent f5d1aad commit 57d82ee

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

irc_context.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,12 @@ func (ic *IrcContext) GetUsers(refresh bool) []slack.User {
7171
err error
7272
ctx = context.Background()
7373
users []slack.User
74-
p slack.UserPagination
7574
)
7675
for err == nil {
77-
p, err = up.Next(ctx)
76+
up, err = up.Next(ctx)
7877
if err == nil {
79-
users = append(users, p.Users...)
80-
log.Debugf("Retrieved %d users (current total is %d)", len(p.Users), len(users))
78+
users = append(users, up.Users...)
79+
log.Debugf("Retrieved %d users (current total is %d)", len(up.Users), len(users))
8180
} else if rateLimitedError, ok := err.(*slack.RateLimitedError); ok {
8281
select {
8382
case <-ctx.Done():
@@ -87,6 +86,7 @@ func (ic *IrcContext) GetUsers(refresh bool) []slack.User {
8786
}
8887
}
8988
}
89+
err = up.Failure(err)
9090
if err != nil {
9191
log.Warningf("Failed to get users: %v", err)
9292
return nil

0 commit comments

Comments
 (0)