gam7 7.9.7__tar.gz → 7.10.1__tar.gz

{gam7-7.9.7 → gam7-7.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.9.7
+Version: 7.10.1
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.9.7 → gam7-7.10.1}/src/GamCommands.txt

@@ -1,4 +1,4 @@
-This document describes the GAM command line syntax in modified BNF, see https://en.wikipedia.org/wiki/Backus-Naur_Form
+his document describes the GAM command line syntax in modified BNF, see https://en.wikipedia.org/wiki/Backus-Naur_Form
 Skip the History section and start reading at Introduction.
 
 Items on the command line are space separated, when an actual space character is required, it will be indicated by <Space>.
@@ -380,6 +380,8 @@ If an item contains spaces, it should be surrounded by ".
         domain:<DomainName>|domain|default
 <CalendarItem> ::= <EmailAddress>
 <ChannelCustomerID> ::= <String>
+<ChatEmojiName> ::= :<String>:
+<ChatEmoji> ::= emojiname <ChatEmojiName> | customemojis/<String>
 <ChatMember> ::= spaces/<String>/members/<String>
 <ChatMessage> ::= spaces/<String>/messages/<String>
 <ChatSpace> ::= spaces/<String> | space <String> | space spaces/<String>
@@ -664,6 +666,7 @@ If an item contains spaces, it should be surrounded by ".
         (gdoc|ghtml <UserGoogleDoc>)|
         (gcsdoc|gcshtml <StorageBucketObjectName>)
 <YouTubeChannelID> ::= <String>
+
 ## Lists of basic items
 
 <APIScopeURLList> ::= "<APIScopeURL>(,<APIScopeURL>)*"
@@ -4437,13 +4440,14 @@ gam report usage customer [todrive <ToDriveAttribute>*]
         calendar|calendars|
         chat|
         chrome|
+        classroom|
         contextawareaccess|
         currents|gplus|google+|
         datastudio|
         devices|mobile|
         domain|
         drive|doc|docs|
-        gcp|
+        gcp|cloud|
         gemini|geminiforworkspace|
         groups|group|
         groupsenterprise|enterprisegroups|
@@ -4462,7 +4466,7 @@ gam report <ActivityApplicationName> [todrive <ToDriveAttribute>*]
         [(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath> [showorgunit])|(select <UserTypeEntity>)]
         [([start <Time>] [end <Time>])|(range <Time> <Time>)|
          yesterday|today|thismonth|(previousmonths <Integer>)]
-        [filtertime.* <Time>] [filter|filters <String>]
+        [filtertime.String> <Time>] [filter|filters <String>]
         [event|events <EventNameList>] [ip <String>]
         [groupidfilter <String>]
         [maxactivities <Number>] [maxevents <Number>] [maxresults <Number>]
@@ -6436,6 +6440,22 @@ gam <UserTypeEntity> print chatevents [todrive <ToDriveAttribute>*]
         filter <String>
         [formatjson [quotechar <Character>]]
 
+<ChatEmojiName> ::= :[0-9a-z_-]+:
+<ChatEmoji> ::= emojiname <ChatEmojiName> | customemojis/<String>
+
+gam <UserTypeEntity> create chatemoji <ChatEmojiName>
+         ([drivedir|(sourcefolder <FilePath>)] [filename <FileNamePattern>])
+        [formatjson]
+gam <UserTypeEntity> delete chatemoji <ChatEmoji>
+gam <UserTypeEntity> info chatemoji <ChatEmoji>
+        [formatjson]
+gam <UserTypeEntity> show chatemojis
+        [showcreatedby any|me|others]
+        [formatjson]
+gam <UserTypeEntity> print chatemojis [todrive <ToDriveAttribute>*]
+        [showcreatedby any|me|others]
+        [formatjson [quotechar <Character>]]
+
 # Users - Drive
 
 <DriveFileOrderByFieldName> ::=
@@ -7398,10 +7418,12 @@ gam <UserTypeEntity> print filters [labelidsonly] [todrive <ToDriveAttribute>*]
 
 gam <UserTypeEntity> create form
         title <String> [description <String>] [isquiz [<Boolean>]] [<JSONData>]
+        [ispublished [<Boolean>] isacceptingresponses [<Boolean>]]
         [drivefilename <DriveFileName>] [<DriveFileParentAttribute>]
         [(csv [todrive <ToDriveAttribute>*]) | returnidonly]
 gam <UserTypeEntity> update form <DriveFileEntity>
         [title <String>] [description <String>] [isquiz [<Boolean>]] [<JSONData>]
+        [ispublished [<Boolean>] isacceptingresponses [<Boolean>]]
 
 gam <UserTypeEntity> print forms <DriveFileEntity> [todrive <ToDriveAttribute>*]
         (addcsvdata <FieldName> <String>)*

{gam7-7.9.7 → gam7-7.10.1}/src/GamUpdate.txt

@@ -1,3 +1,18 @@
+7.10.01
+
+Added options `ispublished [<Boolean>]` and `isacceptingresponses [<Boolean>]` to
+`gam <UserTypeEntity> create|update form`.
+
+7.10.00
+
+Added commands to manage/display Chat Custom Emojis.
+
+* See: https://github.com/GAM-team/GAM/wiki/Users-Chat#manage-chat-emojis
+* See: https://github.com/GAM-team/GAM/wiki/Users-Chat#display-chat-emojis
+
+Updated `gam <UserItem> print|show chatspaces|chatmembers asadmin` to display
+the spaces in ascending display name order.
+
 7.09.07
 
 Added `webviewlink` to `<FileTreeFieldName>` for use in `gam <UserTypeEntity> print|show filetree`.

{gam7-7.9.7 → gam7-7.10.1}/src/gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.09.07'
+__version__ = '7.10.01'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -13556,7 +13556,10 @@ REPORT_CHOICE_MAP = {
   'calendars': 'calendar',
   'chat': 'chat',
   'chrome': 'chrome',
+  'classroom': 'classroom',
+  'cloud': 'gcp',
   'contextawareaccess': 'context_aware_access',
+  'currents': 'gplus',
   'customer': 'customer',
   'customers': 'customer',
   'datastudio': 'data_studio',
@@ -22786,7 +22789,7 @@ def _processPeopleContactPhotos(users, function):
         if function == 'GetContactPhoto' and not os.path.isdir(targetFolder):
           os.makedirs(targetFolder)
       elif myarg == 'filename':
-        filenamePattern = getString(Cmd.OB_PHOTO_FILENAME_PATTERN)
+        filenamePattern = getString(Cmd.OB_FILE_NAME_PATTERN)
       else:
         unknownArgumentExit()
     subForContactId = filenamePattern.find('#contactid#') != -1
@@ -25990,6 +25993,8 @@ def _printChatItem(user, citem, parent, entityType, csvPF, FJQC, addCSVData=None
   if entityType == Ent.CHAT_SPACE:
     _cleanChatSpace(citem)
     baserow = {'User': user} if user is not None else {}
+  elif entityType == Ent.CHAT_EMOJI:
+    baserow = {'User': user, 'name': citem['name'], 'emojiName': citem['emojiName']}
   else:
     if user is not None:
       baserow = {'User': user, 'space.name': parent['name'], 'space.displayName': parent['displayName']}
@@ -26009,6 +26014,190 @@ def _printChatItem(user, citem, parent, entityType, csvPF, FJQC, addCSVData=None
                 'JSON': json.dumps(cleanJSON(citem, timeObjects=CHAT_TIME_OBJECTS), ensure_ascii=False, sort_keys=True)})
     csvPF.WriteRowNoFilter(row)
 
+def _getValidateEmojiName():
+  name = getString(Cmd.OB_CHAT_EMOJI_NAME)
+  if re.match(r'^:[0-9a-z_-]+:$', name):
+    return name
+  Cmd.Backup()
+  usageErrorExit(Msg.INVALID_EMOJI_NAME.format(name))
+
+# gam <UserTypeEntity> create chatemoji <ChatEmojiName>
+#	 ([drivedir|(sourcefolder <FilePath>)] [filename <FileNamePattern>])
+#	[formatjson]
+def createChatEmoji(users):
+  FJQC = FormatJSONQuoteChar()
+  name = _getValidateEmojiName()
+  body = {'emojiName': name, 'payload': {'filename': '', 'fileContent': ''}}
+  sourceFolder = os.getcwd()
+  filenamePattern = '#email#.jpg'
+  while Cmd.ArgumentsRemaining():
+    myarg = getArgument()
+    if myarg == 'drivedir':
+      sourceFolder = GC.Values[GC.DRIVE_DIR]
+    elif myarg == 'sourcefolder':
+      sourceFolder = os.path.expanduser(getString(Cmd.OB_FILE_PATH))
+      if not os.path.isdir(sourceFolder):
+        entityDoesNotExistExit(Ent.DIRECTORY, sourceFolder)
+    elif myarg == 'filename':
+      filenamePattern = getString(Cmd.OB_FILE_NAME_PATTERN)
+    else:
+      FJQC.GetFormatJSON(myarg)
+  i, count, users = getEntityArgument(users)
+  for user in users:
+    i += 1
+    user, chat, kvList = buildChatServiceObject(API.CHAT_CUSTOM_EMOJIS, user, i, count, [Ent.CHAT_EMOJI, name])
+    if not chat:
+      continue
+    user, userName, _ = splitEmailAddressOrUID(user)
+    filename = _substituteForUser(filenamePattern, user, userName)
+    if sourceFolder is not None:
+      filename = os.path.join(sourceFolder, filename)
+    filename = os.path.expanduser(filename)
+    try:
+      with open(filename, 'rb') as f:
+        image_data = f.read()
+    except (OSError, IOError) as e:
+      entityActionFailedWarning([Ent.USER, user, Ent.CHAT_EMOJI, filename], str(e), i, count)
+      continue
+    body['payload'] = {'filename': os.path.basename(filename),
+                       'fileContent':base64.urlsafe_b64encode(image_data).decode(UTF8)}
+    try:
+      emoji = callGAPI(chat.customEmojis(), 'create',
+                       throwReasons=[GAPI.ALREADY_EXISTS, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.FAILED_PRECONDITION],
+                       body=body)
+      _showChatItem(emoji, Ent.CHAT_EMOJI, FJQC, i, count)
+    except (GAPI.alreadyExists, GAPI.invalidArgument, GAPI.permissionDenied) as e:
+      exitIfChatNotConfigured(chat, kvList, str(e), i, count)
+    except GAPI.failedPrecondition:
+      userChatServiceNotEnabledWarning(user, i, count)
+
+def getEmojiName(myarg):
+  if myarg == 'emojiname':
+    name = _getValidateEmojiName()
+    return 'customEmojis/'+name
+  _, chatEmoji = Cmd.Previous().split('/', 1)
+  return 'customEmojis/'+chatEmoji
+
+# gam <UserTypeEntity> delete chatemoji <ChatEmoji>
+def deleteChatEmoji(users):
+  name = None
+  while Cmd.ArgumentsRemaining():
+    myarg = getArgument()
+    if myarg == 'emojiname':
+      name = getEmojiName(myarg)
+    elif myarg.startswith('customemojis/'):
+      name = getEmojiName(myarg)
+    else:
+      unknownArgumentExit()
+  if not name:
+    missingArgumentExit('ChatEmoji')
+  i, count, users = getEntityArgument(users)
+  for user in users:
+    i += 1
+    user, chat, kvList = buildChatServiceObject(API.CHAT_CUSTOM_EMOJIS, user, i, count, [Ent.CHAT_EMOJI, name])
+    if not chat:
+      continue
+    try:
+      callGAPI(chat.customEmojis(), 'delete',
+               throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.FAILED_PRECONDITION],
+               name=name)
+      entityActionPerformed(kvList, i, count)
+    except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied) as e:
+      exitIfChatNotConfigured(chat, kvList, str(e), i, count)
+    except GAPI.failedPrecondition:
+      userChatServiceNotEnabledWarning(user, i, count)
+
+# gam <UserTypeEntity> info chatemoji <ChatEmoji>
+#	[formatjson]
+def infoChatEmoji(users):
+  FJQC = FormatJSONQuoteChar()
+  name = None
+  while Cmd.ArgumentsRemaining():
+    myarg = getArgument()
+    if myarg == 'emojiname':
+      name = getEmojiName(myarg)
+    elif myarg.startswith('customemojis/'):
+      name = getEmojiName(myarg)
+    else:
+      FJQC.GetFormatJSON(myarg)
+  if not name:
+    missingArgumentExit('ChatEmoji')
+  i, count, users = getEntityArgument(users)
+  for user in users:
+    i += 1
+    user, chat, kvList = buildChatServiceObject(API.CHAT_CUSTOM_EMOJIS, user, i, count, [Ent.CHAT_EMOJI, name])
+    if not chat:
+      continue
+    try:
+      emoji = callGAPI(chat.customEmojis(), 'get',
+                       throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.FAILED_PRECONDITION],
+                       name=name)
+      if not FJQC.formatJSON:
+        entityPerformAction(kvList, i, count)
+      _showChatItem(emoji, Ent.CHAT_EMOJI, FJQC, i, count)
+    except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied) as e:
+      exitIfChatNotConfigured(chat, kvList, str(e), i, count)
+    except GAPI.failedPrecondition:
+      userChatServiceNotEnabledWarning(user, i, count)
+
+CHAT_EMOJI_SHOW_CREATED_BY_CHOICE_MAP = {
+  'any': None,
+  'me': 'creator("users/me")',
+  'others': 'NOT creator("users/me")'
+  }
+
+# gam <UserTypeEntity> show chatemojis
+#	[showcreatedby any|me|others]
+#	[formatjson]
+# gam <UserTypeEntity> print chatemojis [todrive <ToDriveAttribute>*]
+#	[showcreatedby any|me|others]
+#	[formatjson [quotechar <Character>]]
+def printShowChatEmojis(users):
+  csvPF = CSVPrintFile(['User', 'name', 'emojiName'])  if Act.csvFormat() else None
+  FJQC = FormatJSONQuoteChar(csvPF)
+  pfilter = CHAT_EMOJI_SHOW_CREATED_BY_CHOICE_MAP['me']
+  while Cmd.ArgumentsRemaining():
+    myarg = getArgument()
+    if csvPF and myarg == 'todrive':
+      csvPF.GetTodriveParameters()
+    elif myarg =='showcreatedby':
+      pfilter = getChoice(CHAT_EMOJI_SHOW_CREATED_BY_CHOICE_MAP, mapChoice=True)
+    else:
+      FJQC.GetFormatJSONQuoteChar(myarg, True)
+  i, count, users = getEntityArgument(users)
+  for user in users:
+    i += 1
+    user, chat, kvList = buildChatServiceObject(API.CHAT_CUSTOM_EMOJIS, user, i, count, [Ent.CHAT_EMOJI, None])
+    if not chat:
+      continue
+    try:
+      emojis = callGAPIpages(chat.customEmojis(), 'list', 'customEmojis',
+                             pageMessage=_getChatPageMessage(Ent.CHAT_EMOJI, user, i, count, pfilter),
+                             throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
+                             retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
+                             pageSize=CHAT_PAGE_SIZE, filter=pfilter)
+    except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied) as e:
+      exitIfChatNotConfigured(chat, kvList, str(e), i, count)
+      continue
+    except GAPI.failedPrecondition:
+      userChatServiceNotEnabledWarning(user, i, count)
+      break
+    if not csvPF:
+      jcount = len(emojis)
+      if not FJQC.formatJSON:
+        entityPerformActionNumItems(kvList, jcount, Ent.CHAT_EMOJI, i, count)
+      Ind.Increment()
+      j = 0
+      for emoji in sorted(emojis, key=lambda k: k['emojiName']):
+        j += 1
+        _showChatItem(emoji, Ent.CHAT_EMOJI, FJQC, j, jcount)
+      Ind.Decrement()
+    else:
+      for emoji in sorted(emojis, key=lambda k: k['emojiName']):
+        _printChatItem(user, emoji, '', Ent.CHAT_EMOJI, csvPF, FJQC)
+  if csvPF:
+    csvPF.writeCSVfile('Chat Custom Emojis')
+
 # gam setup chat
 def doSetupChat():
   checkForExtraneousArguments()
@@ -26472,6 +26661,9 @@ def printShowChatSpaces(users):
     substituteQueryTimes(queries, queryTimes)
     pfilter = kwargsCS['query'] = queries[0]
     kwargsCS['useAdminAccess'] = True
+    sortName = 'displayName'
+  else:
+    sortName = 'name'
   for user in users:
     i += 1
     user, chat, kvList = buildChatServiceObject(api, user, i, count, None, useAdminAccess)
@@ -26499,12 +26691,12 @@ def printShowChatSpaces(users):
         entityPerformActionNumItems(kvList, jcount, Ent.CHAT_SPACE, i, count)
       Ind.Increment()
       j = 0
-      for space in spaces:
+      for space in sorted(spaces, key=lambda k: k[sortName]):
         j += 1
         _showChatItem(space, Ent.CHAT_SPACE, FJQC, j, jcount)
       Ind.Decrement()
     else:
-      for space in spaces:
+      for space in sorted(spaces, key=lambda k: k[sortName]):
         _printChatItem(user, space, None, Ent.CHAT_SPACE, csvPF, FJQC)
   if csvPF:
     csvPF.writeCSVfile('Chat Spaces')
@@ -27139,6 +27331,9 @@ def printShowChatMembers(users):
   i, count, users = getEntityArgument(users)
   if useAdminAccess:
     _chkChatAdminAccess(count)
+    sortName = 'displayName'
+  else:
+    sortName = 'name'
   for user in users:
     i += 1
     user, chat, kvList = buildChatServiceObject(api, user, i, count, [Ent.CHAT_SPACE, None], useAdminAccess)
@@ -27161,7 +27356,7 @@ def printShowChatMembers(users):
                                  retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
                                  fields="nextPageToken,spaces(name,displayName,spaceType,membershipCount)", pageSize=CHAT_PAGE_SIZE,
                                  **kwargsCS)
-          for space in spaces:
+          for space in sorted(spaces, key=lambda k: k[sortName]):
             if space['spaceType'] == 'SPACE' and 'membershipCount' in space:
               parentList.append({'name': space['name'], 'displayName': space.get('displayName', 'None')})
         except (GAPI.notFound, GAPI.invalidArgument, GAPI.internalError,
@@ -27178,7 +27373,7 @@ def printShowChatMembers(users):
                                  retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
                                  fields="nextPageToken,spaces(name,displayName,spaceType,membershipCount)", pageSize=CHAT_PAGE_SIZE,
                                  **kwargsCS)
-          for space in spaces:
+          for space in sorted(spaces, key=lambda k: k[sortName]):
 #            if 'membershipCount' in space:
 #              parentList.append({'name': space['name'], 'displayName': space.get('displayName', 'None')})
             parentList.append({'name': space['name'], 'displayName': space.get('displayName', 'None')})
@@ -67871,7 +68066,7 @@ def updatePhoto(users):
   baseFileIdEntity = drive = owner = None
   sourceFolder = os.getcwd()
   if Cmd.NumArgumentsRemaining() == 1:
-    filenamePattern = getString(Cmd.OB_PHOTO_FILENAME_PATTERN)
+    filenamePattern = getString(Cmd.OB_FILE_NAME_PATTERN)
   else:
     filenamePattern = '#email#.jpg'
     while Cmd.ArgumentsRemaining():
@@ -67883,7 +68078,7 @@ def updatePhoto(users):
         if not os.path.isdir(sourceFolder):
           entityDoesNotExistExit(Ent.DIRECTORY, sourceFolder)
       elif myarg == 'filename':
-        filenamePattern = getString(Cmd.OB_PHOTO_FILENAME_PATTERN)
+        filenamePattern = getString(Cmd.OB_FILE_NAME_PATTERN)
       elif myarg == 'gphoto':
         owner, drive = buildGAPIServiceObject(API.DRIVE3, getEmailAddress())
         if not drive:
@@ -67984,7 +68179,7 @@ def getPhoto(users, profileMode):
       if not os.path.isdir(targetFolder):
         os.makedirs(targetFolder)
     elif myarg == 'filename':
-      filenamePattern = getString(Cmd.OB_PHOTO_FILENAME_PATTERN)
+      filenamePattern = getString(Cmd.OB_FILE_NAME_PATTERN)
     elif myarg == 'nofile':
       writeFileData = False
     elif myarg == 'noshow':
@@ -72411,8 +72606,23 @@ def updateFormRequestUpdateMasks(ubody):
         v['updateMask'] = ','.join(v['updateMask'])
         break
 
+def _initPublishSettings():
+  return {'publishSettings': {'publishState': {'isPublished': False, 'isAcceptingResponses': False}},
+          'updateMask': ''}
+
+def _getPublishSettings(myarg, pbody):
+  if myarg == 'ispublished':
+    pbody['publishSettings']['publishState']['isPublished'] = getBoolean()
+  elif myarg == 'isacceptingresponses':
+    pbody['publishSettings']['publishState']['isAcceptingResponses'] = getBoolean()
+  else:
+    return False
+  pbody['updateMask'] = 'publishState'
+  return True
+
 # gam <UserTypeEntity> create form
 #	title <String> [description <String>] [isquiz [<Boolean>]] [<JSONData>]
+#	[ispublished [<Boolean>] isacceptingresponses [<Boolean>]]
 #	[drivefilename <DriveFileName>] [<DriveFileParentAttribute>]
 #	[(csv [todrive <ToDriveAttribute>*]) | returnidonly]
 def createForm(users):
@@ -72421,6 +72631,7 @@ def createForm(users):
   title = ''
   body = {'mimeType': MIMETYPE_GA_FORM}
   ubody = {'includeFormInResponse': True, 'requests': []}
+  pbody = _initPublishSettings()
   parentParms = initDriveFileAttributes()
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
@@ -72434,6 +72645,8 @@ def createForm(users):
     elif myarg == 'json':
       jsonData = getJSON([])
       ubody['requests'].extend(jsonData.get('requests', []))
+    elif _getPublishSettings(myarg, pbody):
+      pass
     elif myarg == 'drivefilename':
       body['name'] = getString(Cmd.OB_DRIVE_FILE_NAME)
     elif getDriveFileParentAttribute(myarg, parentParms):
@@ -72474,6 +72687,10 @@ def createForm(users):
       form = callGAPI(gform.forms(), 'batchUpdate',
                       throwReasons=[GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
                       formId=formId, body=ubody)
+      if pbody['updateMask']:
+        callGAPI(gform.forms(), 'setPublishSettings',
+                 throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
+                 formId=formId, body=pbody)
       if returnIdOnly:
         writeStdout(f'{formId}\n')
       elif not csvPF:
@@ -72498,8 +72715,10 @@ def createForm(users):
 
 # gam <UserTypeEntity> update form <DriveFileEntity>
 #	[title <String>] [description <String>] [isquiz [Boolean>]] [<JSONData>]
+#	[ispublished [<Boolean>] isacceptingresponses [<Boolean>]]
 def updateForm(users):
   ubody = {'includeFormInResponse': False, 'requests': []}
+  pbody = _initPublishSettings()
   fileIdEntity = getDriveFileEntity()
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
@@ -72512,10 +72731,12 @@ def updateForm(users):
     elif myarg == 'json':
       jsonData = getJSON([])
       ubody['requests'].extend(jsonData.get('requests', []))
+    elif _getPublishSettings(myarg, pbody):
+      pass
     else:
       unknownArgumentExit()
   updateFormRequestUpdateMasks(ubody)
-  if not ubody['requests']:
+  if not ubody['requests'] and not pbody['updateMask']:
     return
   i, count, users = getEntityArgument(users)
   for user in users:
@@ -72531,9 +72752,14 @@ def updateForm(users):
     for formId in fileIdEntity['list']:
       j += 1
       try:
-        callGAPI(gform.forms(), 'batchUpdate',
-                 throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
-                 formId=formId, body=ubody)
+        if ubody['requests']:
+          callGAPI(gform.forms(), 'batchUpdate',
+                   throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
+                   formId=formId, body=ubody)
+        if pbody['updateMask']:
+          callGAPI(gform.forms(), 'setPublishSettings',
+                   throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
+                   formId=formId, body=pbody)
         entityActionPerformed([Ent.USER, user, Ent.FORM, formId], j, jcount)
       except (GAPI.notFound, GAPI.invalidArgument) as e:
         entityActionFailedWarning([Ent.USER, user, Ent.FORM, formId], str(e), j, jcount)
@@ -76983,6 +77209,7 @@ USER_ADD_CREATE_FUNCTIONS = {
   Cmd.ARG_CALENDAR:		addCreateCalendars,
   Cmd.ARG_GROUP:		addUserToGroups,
   Cmd.ARG_CALENDARACL:		createCalendarACLs,
+  Cmd.ARG_CHATEMOJI:		createChatEmoji,
   Cmd.ARG_CHATMEMBER:		createChatMember,
   Cmd.ARG_CHATMESSAGE:		createChatMessage,
   Cmd.ARG_CHATSPACE:		createChatSpace,
@@ -77099,6 +77326,7 @@ USER_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_BACKUPCODE:	deleteBackupCodes,
       Cmd.ARG_CALENDAR:		deleteCalendars,
       Cmd.ARG_CALENDARACL:	deleteCalendarACLs,
+      Cmd.ARG_CHATEMOJI:	deleteChatEmoji,
       Cmd.ARG_CHATMEMBER:	deleteUpdateChatMember,
       Cmd.ARG_CHATMESSAGE:	deleteChatMessage,
       Cmd.ARG_CHATSPACE:	deleteChatSpace,
@@ -77203,6 +77431,7 @@ USER_COMMANDS_WITH_OBJECTS = {
     (Act.INFO,
      {Cmd.ARG_CALENDAR:		infoCalendars,
       Cmd.ARG_CALENDARACL:	infoCalendarACLs,
+      Cmd.ARG_CHATEMOJI:	infoChatEmoji,
       Cmd.ARG_CHATEVENT:	infoChatEvent,
       Cmd.ARG_CHATMEMBER:	infoChatMember,
       Cmd.ARG_CHATMESSAGE:	infoChatMessage,
@@ -77275,6 +77504,7 @@ USER_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_CALENDAR:		printShowCalendars,
       Cmd.ARG_CALENDARACL:	printShowCalendarACLs,
       Cmd.ARG_CALSETTINGS:	printShowCalSettings,
+      Cmd.ARG_CHATEMOJI:	printShowChatEmojis,
       Cmd.ARG_CHATEVENT:	printShowChatEvents,
       Cmd.ARG_CHATMEMBER:	printShowChatMembers,
       Cmd.ARG_CHATMESSAGE:	printShowChatMessages,
@@ -77382,6 +77612,7 @@ USER_COMMANDS_WITH_OBJECTS = {
       Cmd.ARG_CALENDAR:		printShowCalendars,
       Cmd.ARG_CALENDARACL:	printShowCalendarACLs,
       Cmd.ARG_CALSETTINGS:	printShowCalSettings,
+      Cmd.ARG_CHATEMOJI:	printShowChatEmojis,
       Cmd.ARG_CHATEVENT:	printShowChatEvents,
       Cmd.ARG_CHATMEMBER:	printShowChatMembers,
       Cmd.ARG_CHATMESSAGE:	printShowChatMessages,
@@ -77598,6 +77829,7 @@ USER_COMMANDS_OBJ_ALIASES = {
   Cmd.ARG_CLASSIFICATIONLABELPERMISSION:	Cmd.ARG_DRIVELABELPERMISSION,
   Cmd.ARG_CLASSIFICATIONLABELPERMISSIONS:	Cmd.ARG_DRIVELABELPERMISSION,
   Cmd.ARG_CLASSROOMINVITATIONS:	Cmd.ARG_CLASSROOMINVITATION,
+  Cmd.ARG_CHATEMOJIS:		Cmd.ARG_CHATEMOJI,
   Cmd.ARG_CHATEVENTS:		Cmd.ARG_CHATEVENT,
   Cmd.ARG_CHATMEMBERS:		Cmd.ARG_CHATMEMBER,
   Cmd.ARG_CHATMESSAGES:		Cmd.ARG_CHATMESSAGE,

{gam7-7.9.7 → gam7-7.10.1}/src/gam/gamlib/glapi.py

@@ -26,6 +26,7 @@ ANALYTICS_ADMIN = 'analyticsadmin'
 CALENDAR = 'calendar'
 CBCM = 'cbcm'
 CHAT = 'chat'
+CHAT_CUSTOM_EMOJIS = 'chatcustomemojis'
 CHAT_EVENTS = 'chatevents'
 CHAT_MEMBERSHIPS = 'chatmemberships'
 CHAT_MEMBERSHIPS_ADMIN = 'chatmembershipsadmin'
@@ -210,6 +211,7 @@ _INFO = {
   CALENDAR: {'name': 'Calendar API', 'version': 'v3', 'v2discovery': True, 'mappedAPI': 'calendar-json'},
   CBCM: {'name': 'Chrome Browser Cloud Management API', 'version': 'v1.1beta1', 'v2discovery': True, 'localjson': True},
   CHAT: {'name': 'Chat API', 'version': 'v1', 'v2discovery': True},
+  CHAT_CUSTOM_EMOJIS: {'name': 'Chat API - Custom Emojis', 'version': 'v1', 'v2discovery': True, 'mappedAPI': CHAT},
   CHAT_EVENTS: {'name': 'Chat API - Events', 'version': 'v1', 'v2discovery': True, 'mappedAPI': CHAT},
   CHAT_MEMBERSHIPS: {'name': 'Chat API - Memberships', 'version': 'v1', 'v2discovery': True, 'mappedAPI': CHAT},
   CHAT_MEMBERSHIPS_ADMIN: {'name': 'Chat API - Memberships Admin', 'version': 'v1', 'v2discovery': True, 'mappedAPI': CHAT},
@@ -544,6 +546,10 @@ _SVCACCT_SCOPES = [
    'api': CALENDAR,
    'subscopes': READONLY,
    'scope': 'https://www.googleapis.com/auth/calendar'},
+  {'name': 'Chat API - Custom Emojis',
+   'api': CHAT_CUSTOM_EMOJIS,
+   'subscopes': READONLY,
+   'scope': 'https://www.googleapis.com/auth/chat.customemojis'},
   {'name': 'Chat API - Memberships',
    'api': CHAT_MEMBERSHIPS,
    'subscopes': READONLY,
@@ -644,7 +650,7 @@ _SVCACCT_SCOPES = [
    'api': GMAIL,
    'subscopes': [],
    'scope': 'https://www.googleapis.com/auth/gmail.modify'},
-  {'name': 'Gmail API - Basic Settings (Filters,IMAP, Language, POP, Vacation) - read/write, Sharing Settings (Delegates, Forwarding, SendAs) - read',
+  {'name': 'Gmail API - Basic Settings (Filters, IMAP, Language, POP, Vacation) - read/write, Sharing Settings (Delegates, Forwarding, SendAs) - read',
    'api': GMAIL,
    'subscopes': [],
    'scope': 'https://www.googleapis.com/auth/gmail.settings.basic'},

{gam7-7.9.7 → gam7-7.10.1}/src/gam/gamlib/glclargs.py

@@ -461,6 +461,8 @@ class GamCLArgs():
   ARG_CHANNELSKU = 'channelsku'
   ARG_CHANNELSKUS = 'channelskus'
   ARG_CHAT = 'chat'
+  ARG_CHATEMOJI = 'chatemoji'
+  ARG_CHATEMOJIS = 'chatemojis'
   ARG_CHATEVENT = 'chatevent'
   ARG_CHATEVENTS = 'chatevents'
   ARG_CHATMEMBER = 'chatmember'
@@ -843,6 +845,8 @@ class GamCLArgs():
   OB_CHARACTER = 'Character'
   OB_CHAR_SET = 'CharacterSet'
   OG_CHAT_ATTACHMENT = 'ChatAttachment'
+  OB_CHAT_EMOJI = 'ChatEmoji'
+  OB_CHAT_EMOJI_NAME = 'ChatEmojiName'
   OB_CHAT_EVENT = 'ChatEvent'
   OB_CHAT_MEMBER = 'ChatMember'
   OB_CHAT_MESSAGE = 'ChatMessage'
@@ -930,6 +934,7 @@ class GamCLArgs():
   OB_FILE_NAME = 'FileName'
   OB_FILE_NAME_FIELD_NAME = OB_FILE_NAME+'(:'+OB_FIELD_NAME+')+'
   OB_FILE_NAME_OR_URL = 'FileName|URL'
+  OB_FILE_NAME_PATTERN = 'FileNamePattern'
   OB_FILE_PATH = 'FilePath'
   OB_FILTER_ID_ENTITY = 'FilterIDEntity'
   OB_FORMAT_LIST = 'FormatList'
@@ -975,7 +980,6 @@ class GamCLArgs():
   OB_PERMISSION_ID_LIST = 'PermissionIDList'
   OB_PERMISSION_ROLE_LIST = 'PermissionRoleList'
   OB_PERMISSION_TYPE_LIST = 'PermissionTypeList'
-  OB_PHOTO_FILENAME_PATTERN = 'FilenameNamePattern'
   OB_PRINTER_ID = 'PrinterID'
   OB_PRIVILEGE_LIST = 'PrivilegeList'
   OB_PRODUCT_ID = 'ProductID'

{gam7-7.9.7 → gam7-7.10.1}/src/gam/gamlib/glentity.py

@@ -86,6 +86,7 @@ class GamEntity():
   CHANNEL_SKU = 'chsk'
   CHAT_BOT = 'chbo'
   CHAT_ADMIN = 'chad'
+  CHAT_EMOJI = 'chem'
   CHAT_EVENT = 'chev'
   CHAT_MANAGER_USER = 'chgu'
   CHAT_MEMBER = 'chme'
@@ -436,6 +437,7 @@ class GamEntity():
     CHANNEL_SKU: ['Channel SKUs', 'Channel SKU'],
     CHAT_BOT: ['Chat BOTs', 'Chat BOT'],
     CHAT_ADMIN: ['Chat Admins', 'Chat Admin'],
+    CHAT_EMOJI: ['Chat Emojis', 'Chat Emoji'],
     CHAT_EVENT: ['Chat Events', 'Chat Event'],
     CHAT_MANAGER_USER: ['Chat User Managers', 'Chat User Manager'],
     CHAT_MESSAGE: ['Chat Messages', 'Chat Message'],

{gam7-7.9.7 → gam7-7.10.1}/src/gam/gamlib/glmsgs.py

@@ -309,6 +309,7 @@ INVALID_ALIAS = 'Invalid Alias'
 INVALID_ATTENDEE_CHANGE = 'Invalid attendee change "{0}"'
 INVALID_CHARSET = 'Invalid charset "{0}"'
 INVALID_DATE_TIME_RANGE = '{0} {1} must be greater than/equal to {2} {3}'
+INVALID_EMOJI_NAME = '{0} does not match pattern :[0-9a-z_-]:'
 INVALID_ENTITY = 'Invalid {0}, {1}'
 INVALID_EVENT_TIMERANGE = '{0} {1} must be less than {2}'
 INVALID_FILE_SELECTION_WITH_ADMIN_ACCESS = 'Invalid file selection with adminaccess|asadmin'

{gam7-7.9.7 → gam7-7.10.1}/wiki/Basic-Items.md

@@ -96,7 +96,7 @@
         banana|basil|blueberry|flamingo|graphite|grape|
         lavender|peacock|sage|tangerine|tomato
 <FileFormat> ::=
-        csv|doc|dot|docx|dotx|epub|html|jpeg|jpg|mht|odp|ods|odt|
+        csv|doc|dot|docx|dotx|epub|html|jpeg|jpg|json|mht|odp|ods|odt|
         pdf|png|ppt|pot|potx|pptx|rtf|svg|tsv|txt|xls|xlt|xlsx|xltx|zip|
         ms|microsoft|openoffice|
 <LabelColorHex> ::=
@@ -278,6 +278,8 @@
         domain:<DomainName>|domain|default
 <CalendarItem> ::= <EmailAddress>
 <ChannelCustomerID> ::= <String>
+<ChatEmojiName> ::= :[0-9a-z_-]+:
+<ChatEmoji> ::= emojiname <ChatEmojiName> | customemojis/<String>
 <ChatMember> ::= spaces/<String>/members/<String>
 <ChatMessage> ::= spaces/<String>/messages/<String>
 <ChatSpace> ::= spaces/<String> | space <String> | space spaces/<String>