ability to set --max-results for followers and friends

igorbrigadir · igorbrigadir · commit 40cb158941d1 · 2021-10-14T14:32:17.000+01:00
diff --git a/twarc/client2.py b/twarc/client2.py
@@ -969,9 +969,6 @@ def following(
         expansions=None,
         tweet_fields=None,
         user_fields=None,
-        media_fields=None,
-        poll_fields=None,
-        place_fields=None,
         pagination_token=None,
     ):
         """
@@ -989,9 +986,6 @@ def following(
         params = self._prepare_params(
             tweet_fields=tweet_fields,
             user_fields=user_fields,
-            media_fields=media_fields,
-            poll_fields=poll_fields,
-            place_fields=place_fields,
             max_results=max_results,
             pagination_token=pagination_token,
         )
@@ -1008,9 +1002,6 @@ def followers(
         expansions=None,
         tweet_fields=None,
         user_fields=None,
-        media_fields=None,
-        poll_fields=None,
-        place_fields=None,
         pagination_token=None,
     ):
         """
diff --git a/twarc/command2.py b/twarc/command2.py
@@ -696,14 +696,19 @@ def tweet(T, tweet_id, outfile, pretty):
 @click.option(
     "--limit",
     default=0,
-    help="Maximum number of followers to save. Increments of 1000.",
+    help="Maximum number of followers to save. Increments of 1000 or --max-results if set.",
+)
+@click.option(
+    "--max-results",
+    default=1000,
+    help="Maximum number of users per page. Default is 1000.",
 )
 @command_line_progressbar_option
 @click.argument("user", type=str)
 @click.argument("outfile", type=click.File("w"), default="-")
 @click.pass_obj
 @cli_api_error
-def followers(T, user, outfile, limit, hide_progress):
+def followers(T, user, outfile, limit, max_results, hide_progress):
     """
     Get the followers for a given user.
     """
@@ -720,7 +725,7 @@ def followers(T, user, outfile, limit, hide_progress):
         lookup_total = target_user["public_metrics"]["followers_count"]
 
     with tqdm(disable=hide_progress, total=lookup_total) as progress:
-        for result in T.followers(user, user_id=user_id):
+        for result in T.followers(user, user_id=user_id, max_results=max_results):
             _write(result, outfile)
             count += len(result["data"])
             progress.update(len(result["data"]))
@@ -731,14 +736,21 @@ def followers(T, user, outfile, limit, hide_progress):
 
 @twarc2.command("following")
 @click.option(
-    "--limit", default=0, help="Maximum number of friends to save. Increments of 1000."
+    "--limit",
+    default=0,
+    help="Maximum number of friends to save. Increments of 1000 or --max-results if set.",
+)
+@click.option(
+    "--max-results",
+    default=1000,
+    help="Maximum number of users per page. Default is 1000.",
 )
 @command_line_progressbar_option
 @click.argument("user", type=str)
 @click.argument("outfile", type=click.File("w"), default="-")
 @click.pass_obj
 @cli_api_error
-def following(T, user, outfile, limit, hide_progress):
+def following(T, user, outfile, limit, max_results, hide_progress):
     """
     Get the users that a given user is following.
     """
@@ -755,7 +767,7 @@ def following(T, user, outfile, limit, hide_progress):
         lookup_total = target_user["public_metrics"]["following_count"]
 
     with tqdm(disable=hide_progress, total=lookup_total) as progress:
-        for result in T.following(user, user_id=user_id):
+        for result in T.following(user, user_id=user_id, max_results=max_results):
             _write(result, outfile)
             count += len(result["data"])
             progress.update(len(result["data"]))
