deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-29 18:31:38 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed bug in gam <UserTypeEntity> create chatmember <ChatSpace> ... group <GroupItem> that caused an error.

Browse Source
This commit is contained in:
Ross Scroggs
2024-07-07 14:56:45 -07:00
parent f6d0f14b49
commit c421904b78
5 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gam/__init__.py
View File

@@ -25742,6 +25742,12 @@ def _getChatMemberEmail(cd, member):
# (group <GroupItem>)* (groups <GroupEntity>)*
# [formatjson|returnidonly]
def createChatMember(users):
def normalizeUserMember(user):
userList.append(convertEmailAddressToUID(user, cd, emailType='user'))
def normalizeGroupMember(group):
groupList.append(convertEmailAddressToUID(group, cd, emailType='group'))
def addMembers(members, field, entityType, i, count):
jcount = len(members)
entityPerformActionNumItems(kvList, jcount, entityType, i, count)
@@ -25791,14 +25797,16 @@ def createChatMember(users):
if myarg == 'space' or myarg.startswith('spaces/') or myarg.startswith('space/'):
parent = getChatSpace(myarg)
elif myarg == 'user':
userList.append(getEmailAddress(returnUIDprefix='uid:'))
normalizeUserMember(getEmailAddress(returnUIDprefix='uid:'))
elif myarg in {'member', 'members'}:
_, members = getEntityToModify(defaultEntityType=Cmd.ENTITY_USERS)
userList.extend(members)
for user in members:
normalizeUserMember(user)
elif myarg == 'group':
groupList.append(getEmailAddress(returnUIDprefix='uid:'))
normalizeGroupMember(getEmailAddress(returnUIDprefix='uid:'))
elif myarg == 'groups':
groupList.extend(getEntityList(Cmd.OB_GROUP_ENTITY))
for group in getEntityList(Cmd.OB_GROUP_ENTITY):
normalizeGroupMember(group)
elif myarg == 'role':
role = getChoice(CHAT_MEMBER_ROLE_MAP, mapChoice=True)
elif myarg == 'type':
@@ -25814,12 +25822,10 @@ def createChatMember(users):
userEntityType = Ent.CHAT_MEMBER_USER if role == 'ROLE_MEMBER' else Ent.CHAT_MANAGER_USER
userMembers = []
for user in userList:
name = normalizeEmailAddressOrUID(user)
userMembers.append({'member': {'name': f'users/{name}', 'type': mtype}})
userMembers.append({'member': {'name': f'users/{user}', 'type': mtype}})
groupMembers = []
for group in groupList:
name = normalizeEmailAddressOrUID(group)
groupMembers.append({'groupMember': {'name': f'groups/{name}'}})
groupMembers.append({'groupMember': {'name': f'groups/{group}'}})
i, count, users = getEntityArgument(users)
if useAdminAccess:
_chkChatAdminAccess(count)