diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 26b9c489..6028a5d1 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,9 +10,13 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads-Installs](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads-Installs) for Windows or other options, including manual installation +### 6.79.11 + +Fixed bug in `gam print|show chatmembers` where the `filter ` was not applied. + ### 6.79.10 -Updated commands to handle a trap that occurs when oauth2service.json specifies a YubiKey but the YubiKey is not insertd. +Updated commands to handle a trap that occurs when oauth2service.json specifies a YubiKey but the YubiKey is not inserted. ### 6.79.09 diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 01b921d1..53de5fe2 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin$ gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.79.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.11 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -923,7 +923,7 @@ writes the credentials into the file oauth2.txt. C:\>del C:\GAMConfig\oauth2.txt C:\>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.79.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.11 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-People-Contacts-Profiles.md b/docs/Users-People-Contacts-Profiles.md index 4ddec7b6..49d5b03a 100644 --- a/docs/Users-People-Contacts-Profiles.md +++ b/docs/Users-People-Contacts-Profiles.md @@ -59,6 +59,7 @@ gam user user@domain.com check serviceaccount ``` ::= (json [charset ] ) | (json file [charset ]) | + ::= ::= people/ ::= "(,)*" diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 66e4353a..cce809c0 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.79.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.11 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.79.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.11 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.79.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.79.11 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.79.10 + Latest: 6.79.11 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.79.10 +6.79.11 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.79.10 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.79.11 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 2251d2f0..0a276f5e 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,9 +2,13 @@ Merged GAM-Team version +6.79.11 + +Fixed bug in `gam print|show chatmembers` where the `filter ` was not applied. + 6.79.10 -Updated commands to handle a trap that occurs when oauth2service.json specifies a YubiKey but the YubiKey is not insertd. +Updated commands to handle a trap that occurs when oauth2service.json specifies a YubiKey but the YubiKey is not inserted. 6.79.09 diff --git a/src/gam/__init__.py b/src/gam/__init__.py index ab48ee92..dd92d505 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -26523,16 +26523,16 @@ def printShowChatMembers(users): substituteQueryTimes(queries, queryTimes) kwargsCS['query'] = queries[0] kwargsCS['useAdminAccess'] = True - if pfilter: - if 'member.type' not in pfilter: - kwargs['filter'] = 'member.type != "BOT" AND '+pfilter - else: - kwargs['filter'] = pfilter - else: - kwargs['filter'] = 'member.type != "BOT"' else: if not parentList and not kwargsCS: kwargsCS['filter'] = 'spaceType = "SPACE" OR spaceType = "GROUP_CHAT" OR spaceType = "DIRECT_MESSAGE"' + if pfilter: + if 'member.type' not in pfilter: + kwargs['filter'] = 'member.type != "BOT" AND '+pfilter + else: + kwargs['filter'] = pfilter + else: + kwargs['filter'] = 'member.type != "BOT"' fields = getItemFieldsFromFieldsList('memberships', fieldsList) i, count, users = getEntityArgument(users) if useAdminAccess: @@ -26568,7 +26568,7 @@ def printShowChatMembers(users): else: try: spaces = callGAPIpages(chatsp.spaces(), 'list', 'spaces', - pageMessage=_getChatPageMessage(Ent.CHAT_SPACE, user, i, count, pfilter), + pageMessage=_getChatPageMessage(Ent.CHAT_SPACE, user, i, count, kwargsCS['filter']), bailOnInternalError=True, throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.INTERNAL_ERROR, GAPI.PERMISSION_DENIED, GAPI.FAILED_PRECONDITION],