From 587dcbab97cb7f54170f42fa79b2d96db6994221 Mon Sep 17 00:00:00 2001
From: Robin Neatherway <robin.neatherway@gmail.com>
Date: Sat, 16 Mar 2024 11:34:38 +0000
Subject: [PATCH] Add paging when fetching users

---
 internal/slackclient/client.go | 41 ++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/internal/slackclient/client.go b/internal/slackclient/client.go
index 6babf0d..12c0429 100644
--- a/internal/slackclient/client.go
+++ b/internal/slackclient/client.go
@@ -104,6 +104,7 @@ type User struct {
 }
 
 type UsersResponse struct {
+	CursorResponseMetadata
 	Ok      bool
 	Members []User
 }
@@ -262,20 +263,32 @@ func (c *SlackClient) conversations() ([]Channel, error) {
 	return channels, nil
 }
 
-func (c *SlackClient) users(params map[string]string) (*UsersResponse, error) {
-	body, err := c.get("users.list", nil)
-	if err != nil {
-		return nil, err
-	}
+func (c *SlackClient) users() ([]User, error) {
+	users := make([]User, 0, 100)
+	resp := &UsersResponse{}
+	for {
+		body, err := c.get("users.list", map[string]string{
+			"cursor": resp.ResponseMetadata.NextCursor,
+			"limit":  "1000",
+		})
+		if err != nil {
+			return nil, err
+		}
 
-	users := &UsersResponse{}
-	err = json.Unmarshal(body, users)
-	if err != nil {
-		return nil, err
-	}
+		err = json.Unmarshal(body, resp)
+		if err != nil {
+			return nil, err
+		}
 
-	if !users.Ok {
-		return nil, fmt.Errorf("users response not OK: %s", body)
+		if !resp.Ok {
+			return nil, fmt.Errorf("users response not OK: %s", body)
+		}
+
+		users = append(users, resp.Members...)
+
+		if resp.ResponseMetadata.NextCursor == "" {
+			break
+		}
 	}
 
 	return users, nil
@@ -380,13 +393,13 @@ func (c *SlackClient) UsernameForID(id string) (string, error) {
 		return name, nil
 	}
 
-	ur, err := c.users(nil)
+	ur, err := c.users()
 	if err != nil {
 		return "", err
 	}
 
 	c.cache.Users = make(map[string]string)
-	for _, ch := range ur.Members {
+	for _, ch := range ur {
 		c.cache.Users[ch.ID] = ch.Name
 	}