From af54fc1242276fb59cd0c7e51bfef04eb3798765 Mon Sep 17 00:00:00 2001
From: Ross Smith II <ross@smithii.com>
Date: Mon, 18 Apr 2022 13:30:32 -0700
Subject: [PATCH 1/2] Add maxResults param

---
 simplegmail/gmail.py | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/simplegmail/gmail.py b/simplegmail/gmail.py
index 2c9aba7..99527f1 100644
--- a/simplegmail/gmail.py
+++ b/simplegmail/gmail.py
@@ -58,6 +58,10 @@ class Gmail(object):
     # https://developers.google.com/gmail/api/quickstart/python
     # Make sure the client secret file is in the root directory of your app.
 
+    # Max query results, per
+    # https://developers.google.com/gmail/api/reference/rest/v1/users.messages/list#query-parameters
+    MAX_RESULTS = 500
+
     def __init__(
         self,
         client_secret_file: str = 'client_secret.json',
@@ -66,6 +70,7 @@ def __init__(
     ) -> None:
         self.client_secret_file = client_secret_file
         self.creds_file = creds_file
+        self._maxResults = 0
 
         try:
             # The file gmail_token.json stores the user's access and refresh
@@ -509,11 +514,15 @@ def get_messages(
         ]
 
         try:
+            max_results = self._maxResults
+            if max_results == 0:
+                max_results = MAX_RESULTS
             response = self.service.users().messages().list(
                 userId=user_id,
                 q=query,
                 labelIds=labels_ids,
-                includeSpamTrash=include_spam_trash
+                includeSpamTrash=include_spam_trash,
+                maxResults=max_results
             ).execute()
 
             message_refs = []
@@ -521,16 +530,24 @@ def get_messages(
                 message_refs.extend(response['messages'])
 
             while 'nextPageToken' in response:
+                if self._maxResults != 0:
+                    remaining = self._maxResults - len(message_refs)
+                    if remaining <= 0:
+                        break
+                    max_results = remaining
+
                 page_token = response['nextPageToken']
                 response = self.service.users().messages().list(
                     userId=user_id,
                     q=query,
                     labelIds=labels_ids,
                     includeSpamTrash=include_spam_trash,
-                    pageToken=page_token
+                    pageToken=page_token,
+                    maxResults=max_results
                 ).execute()
 
-                message_refs.extend(response['messages'])
+                if 'messages' in response:  # ensure request was successful
+                    message_refs.extend(response['messages'])
 
             return self._get_messages_from_refs(user_id, message_refs,
                                                 attachments)
@@ -988,3 +1005,11 @@ def _get_alias_info(
 
         res = req.execute()
         return res
+
+    @property
+    def maxResults(self):
+        return self._maxResults
+
+    @maxResults.setter
+    def maxResults(self, value):
+        self._maxResults = int(value)

From 555d926ca475ce0893058ab7cc2db4947c43a410 Mon Sep 17 00:00:00 2001
From: Ross Smith II <ross@smithii.com>
Date: Mon, 18 Apr 2022 18:56:22 -0700
Subject: [PATCH 2/2] Fix typo

---
 simplegmail/gmail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplegmail/gmail.py b/simplegmail/gmail.py
index 99527f1..01a9c6e 100644
--- a/simplegmail/gmail.py
+++ b/simplegmail/gmail.py
@@ -516,7 +516,7 @@ def get_messages(
         try:
             max_results = self._maxResults
             if max_results == 0:
-                max_results = MAX_RESULTS
+                max_results = self.MAX_RESULTS
             response = self.service.users().messages().list(
                 userId=user_id,
                 q=query,