diff --git a/docs/Users-Gmail-Messages-Threads.md b/docs/Users-Gmail-Messages-Threads.md index 6b8ed463..250d1771 100644 --- a/docs/Users-Gmail-Messages-Threads.md +++ b/docs/Users-Gmail-Messages-Threads.md @@ -365,10 +365,6 @@ gam archive messages Messages are archived to the group specified by ``. -When `query` is specified: -* `max_to_archive 0` - All messages selected will be archived; this is the default -* `max_to_archive ` - No messages will be archived if the number messages selected is > `` - By default, the command results are displayed as indented keys and values. Use the `csv` option to display the command results in CSV form. ``` @@ -410,10 +406,6 @@ By default, when exporting a message, an existing local file will not be overwri * `overwrite true` - Overwite an existing file * `overwrite false` - Do not overwite an existing file; add a numeric prefix and create a new file -When `query` is specified: -* `max_to_export 0` - All messages selected will be exported -* `max_to_export ` - No messages will be exported if the number messages selected is > ``; `` defaults to 1. - See below for message selection. ## Forward messages/threads @@ -437,10 +429,6 @@ If `addorigfieldstosubject` is specified, GAM appends the original `from`, `to` Fwd: Ross to TestUser (Original From: Ross Scroggs To: testuser@domain.com Date: Thu, 23 Nov 2023 07:01:59 -0800) ``` -When `query` is specified: -* `max_to_forward 0` - All messages selected will be forwarded -* `max_to_forward ` - No messages will be forwarded if the number messages selected is > ``; `` defaults to 1. - See below for message selection. ## Manage messages/threads @@ -554,8 +542,7 @@ gam print messages|threads [todrive *] ``` ## Display all messages By default, Gam displays all messages. -* `max_to_print|max_to_show 0` - All messages will be displayed; this is the default -* `max_to_print|max_to_show ` - Limit the number of messages that will be displayed to `` +* `max_to_xxx` - Limit the number of messages that will be displayed * `includespamtrash` - Include messages in the Spam and Trash folders ## Display a specific set of messages @@ -563,8 +550,7 @@ By default, Gam displays all messages. ## Display a selected set of messages * `((query [querytime ]*) (matchlabel ) [or|and])+` - Criteria to select messages -* `max_to_print|max_to_show 0` - All selected messages will be displayed; this is the default -* `max_to_print|max_to_show ` - Limit the number of selected messages that will be displayed to `` +* `max_to_xxx` - Limit the number of messages that will be displayed * `includespamtrash` - Include messages in the Spam and Trash folders * `labelmatchpattern ` - Only display messages with some label that matches `` * `labelmatchpattern xyz` - Label must start with xyz diff --git a/src/gam/gamlib/glapi.py b/src/gam/gamlib/glapi.py index c90a8bcf..c76871fa 100644 --- a/src/gam/gamlib/glapi.py +++ b/src/gam/gamlib/glapi.py @@ -521,6 +521,7 @@ _SVCACCT_SCOPES = [ {'name': 'Chat API - Admin Memberships', 'api': CHAT_MEMBERSHIPS_ADMIN, 'subscopes': READONLY, + 'offByDefault': True, 'scope': 'https://www.googleapis.com/auth/chat.admin.memberships'}, {'name': 'Chat API - Messages', 'api': CHAT_MESSAGES, @@ -533,6 +534,7 @@ _SVCACCT_SCOPES = [ {'name': 'Chat API - Admin Spaces', 'api': CHAT_SPACES_ADMIN, 'subscopes': READONLY, + 'offByDefault': True, 'scope': 'https://www.googleapis.com/auth/chat.admin.spaces'}, {'name': 'Chat API - Spaces Delete', 'api': CHAT_SPACES_DELETE,