Skip to content

Commit

Permalink
Updated commands to delete chatmembers
Browse files Browse the repository at this point in the history
  • Loading branch information
@taers232c
taers232c committed Jun 4, 2023
1 parent f92657f commit e207063
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 78 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defaults:
working-directory: src

env:
GAMVERSION: 6.60.02
GAMVERSION: 6.60.03
OPENSSL_CONFIG_OPTS: no-fips --api=3.0.0
OPENSSL_INSTALL_PATH: ${{ github.workspace }}/bin/ssl
OPENSSL_SOURCE_PATH: ${{ github.workspace }}/src/openssl
Expand Down
10 changes: 7 additions & 3 deletions src/GamCommands.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5602,6 +5602,7 @@ gam <UserTypeEntity> update calattendees <UserCalendarEntity> <EventEntity> [any
(gcsdoc <StorageBucketObjectName>))

<ChatMember> ::= spaces/<String>/members/<String>
<ChatMemberList> ::= "<ChatMember>(,<ChatMember>)*"
<ChatMessage> ::= spaces/<String>/messages/<String>
<ChatSpace> ::= spaces/<String> | <String>
<ChatThread> ::= spaces/<String>/threads/<String>
Expand Down Expand Up @@ -5639,11 +5640,14 @@ gam <UserTypeEntity> print chatspaces [todrive <ToDriveAttribute>*]
[formatjson [quotechar <Character>]]

gam <UserTypeEntity> create chatmember space <ChatSpace>
(user <UserItem> [type human|bot])|(group <GroupItem>)
[type human|bot]
((user <UserItem>)|(members <UserTypeEntity>))*
[formatjson|returnidonly]
gam <UserTypeEntity> delete chatmember member <ChatMember>
gam <UserTypeEntity> delete chatmember space <ChatSpace>
((user <UserItem>)|(members <UserTypeEntity>))+
gam <UserTypeEntity> remove chatmember members <ChatMemberList>

gam <UserTypeEntity> info chatmember member <ChatMember>
gam <UserTypeEntity> info chatmember members <ChatMemberList>
[formatjson]
gam <UserTypeEntity> show chatmembers space <ChatSpace>
[formatjson]
Expand Down
11 changes: 11 additions & 0 deletions src/GamUpdate.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
6.60.03

Updated commands to delete chatmembers; `delete chatmembers` now deletes members by
specifying a chat space and user email addresses; `remove chatmembers` deletes members by
specifying chatmember names.
```
gam <UserTypeEntity> delete chatmember space <ChatSpace>
((user <UserItem>)|(members <UserTypeEntity>))+
gam <UserTypeEntity> remove chatmember members <ChatMemberList>
```

6.60.02

Added option `<ChatContent>` to `gam <UserTypeEntity> create chatspace` to allow sending an initial message
Expand Down
202 changes: 128 additions & 74 deletions src/gam/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"""

__author__ = 'Ross Scroggs <ross.scroggs@gmail.com>'
__version__ = '6.60.02'
__version__ = '6.60.03'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'

#pylint: disable=wrong-import-position
Expand Down Expand Up @@ -24093,7 +24093,6 @@ def createChatSpace(users):
pass
elif myarg == 'members':
_, members = getEntityToModify(defaultEntityType=Cmd.ENTITY_USERS)

elif myarg == 'returnidonly':
returnIdOnly = True
elif myarg in SORF_TEXT_ARGUMENTS:
Expand Down Expand Up @@ -24376,123 +24375,177 @@ def _showChatMember(member, FJQC, i=0, count=0):
}

# gam <UserTypeEntity> create chatmember space <ChatSpace>
# (user <UserItem> [type human|bot])|(group <GroupItem>)
# [type human|bot]
# (user <UserItem>)* (members <UserTypeEntity>)*
# [formatjson|returnidonly]
def createChatMember(users):
def addMembers(members, field, entityType, i, count):
jcount = len(members)
entityPerformActionNumItems(kvList, jcount, entityType, i, count)
if jcount == 0:
return
Ind.Increment()
j = 0
for body in members:
kvList[-1] = body[field]['name']
try:
member = callGAPI(chat.spaces().members(), 'create',
bailOnInternalError=True,
throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.INTERNAL_ERROR],
parent=parent, body=body)
if not returnIdOnly:
kvList[-1] = member['name']
_getChatMemberEmail(cd, member)
if not FJQC.formatJSON:
entityActionPerformed(kvList, j, jcount)
Ind.Increment()
_showChatMember(member, FJQC)
Ind.Decrement()
else:
writeStdout(f'{member["name"]}\n')
except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied, GAPI.internalError) as e:
entityActionFailedWarning(kvList, str(e))
Ind.Decrement()

cd = buildGAPIObject(API.DIRECTORY)
FJQC = FormatJSONQuoteChar()
parent = name = None
body = {}
parent = None
mtype = CHAT_MEMBER_TYPE_MAP['human']
userList = []
returnIdOnly = False
while Cmd.ArgumentsRemaining():
myarg = getArgument()
if myarg == 'space':
parent = getChatSpace()
elif myarg == 'user':
body.pop('groupMember', None)
body.setdefault('member', {'type': CHAT_MEMBER_TYPE_MAP['human']}) # 'domainId': _getCustomerIdNoC()
name = convertEmailAddressToUID(getEmailAddress(returnUIDprefix='uid:'), cd, 'user')
body['member']['name'] = f'users/{name}'
userList.append(getEmailAddress(returnUIDprefix='uid:'))
elif myarg == 'members':
_, members = getEntityToModify(defaultEntityType=Cmd.ENTITY_USERS)
userList.extend(members)
elif myarg == 'type':
body.pop('groupMember', None)
body.setdefault('member', {})
body['member']['type'] = getChoice(CHAT_MEMBER_TYPE_MAP, mapChoice=True)
elif myarg == 'group':
body.pop('member', None)
body.setdefault('groupMember', {})
name = convertEmailAddressToUID(getEmailAddress(returnUIDprefix='uid:'), cd, 'group')
body['groupMember']['name'] = f'groups/{name}'
mtype = getChoice(CHAT_MEMBER_TYPE_MAP, mapChoice=True)
elif myarg == 'returnidonly':
returnIdOnly = True
else:
FJQC.GetFormatJSON(myarg)
if not parent:
missingArgumentExit('space')
if not name:
missingArgumentExit('member')
if not userList:
missingArgumentExit('user|members')
userMembers = []
for user in userList:
name = convertEmailAddressToUID(user, cd, 'user')
userMembers.append({'member': {'name': f'users/{name}', 'type': mtype}})
i, count, users = getEntityArgument(users)
for user in users:
i += 1
user, chat, kvList = buildChatServiceObject(API.CHAT_MEMBERSHIPS, user, i, count, [Ent.CHAT_SPACE, parent, Ent.CHAT_MEMBER, name])
user, chat, kvList = buildChatServiceObject(API.CHAT_MEMBERSHIPS, user, i, count, [Ent.CHAT_SPACE, parent, Ent.CHAT_MEMBER, ''])
if not chat:
continue
try:
member = callGAPI(chat.spaces().members(), 'create',
bailOnInternalError=True,
throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.INTERNAL_ERROR],
parent=parent, body=body)
if not returnIdOnly:
_getChatMemberEmail(cd, member)
if not FJQC.formatJSON:
entityActionPerformed(kvList, i, count)
Ind.Increment()
_showChatMember(member, FJQC)
Ind.Decrement()
else:
writeStdout(f'{member["name"]}\n')
except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied, GAPI.internalError) as e:
entityActionFailedWarning(kvList, str(e))
addMembers(userMembers, 'member', Ent.USER, i, count)

# gam <UserTypeEntity> delete chatmember member <ChatMember>
# [formatjson]
# gam <UserTypeEntity> delete chatmember space <ChatSpace>
# ((user <UserItem>)|(members <UserTypeEntity>))+
# gam <UserTypeEntity> remove chatmember members <ChatMemberList>
def deleteChatMember(users):
name = None
cd = buildGAPIObject(API.DIRECTORY)
action = Act.Get()
parent = None
memberNames = []
userList = []
while Cmd.ArgumentsRemaining():
myarg = getArgument()
if myarg == 'member':
name = getString(Cmd.OB_CHAT_MEMBER)
else:
unknownArgumentExit()
if not name:
missingArgumentExit('member')
if action == Act.REMOVE:
if myarg in {'member', 'members'}:
memberNames.extend(getString(Cmd.OB_CHAT_MEMBER).replace(',', ' ').split())
else:
unknownArgumentExit()
else: # Act.DELETE
if myarg == 'space':
parent = getChatSpace()
elif myarg == 'user':
userList.append(getEmailAddress(returnUIDprefix='uid:'))
elif myarg == 'members':
_, members = getEntityToModify(defaultEntityType=Cmd.ENTITY_USERS)
userList.extend(members)
else:
unknownArgumentExit()
if action == Act.REMOVE:
if not memberNames:
missingArgumentExit('members')
else: # Act.DELETE
if not parent:
missingArgumentExit('space')
if not userList:
missingArgumentExit('user|members')
for user in userList:
name = convertEmailAddressToUID(user, cd, 'user')
memberNames.append(f'{parent}/members/{name}')
i, count, users = getEntityArgument(users)
for user in users:
i += 1
user, chat, kvList = buildChatServiceObject(API.CHAT_MEMBERSHIPS, user, i, count, [Ent.CHAT_MEMBER, name])
user, chat, kvList = buildChatServiceObject(API.CHAT_MEMBERSHIPS, user, i, count)
if not chat:
continue
try:
callGAPI(chat.spaces().members(), 'delete',
bailOnInternalError=True,
throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.INTERNAL_ERROR],
name=name)
entityActionPerformed(kvList)
except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied, GAPI.internalError) as e:
exitIfChatNotConfigured(chat, kvList, str(e), i, count)
jcount = len(memberNames)
entityPerformActionNumItems(kvList, jcount, Ent.CHAT_MEMBER, i, count)
kvList.extend([Ent.CHAT_MEMBER, ''])
Ind.Increment()
j = 0
for name in memberNames:
j += 1
kvList[-1] = name
try:
callGAPI(chat.spaces().members(), 'delete',
bailOnInternalError=True,
throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.INTERNAL_ERROR],
name=name)
entityActionPerformed(kvList, j, jcount)
except GAPI.notFound as e:
entityActionFailedWarning(kvList, str(e), j, jcount)
except (GAPI.invalidArgument, GAPI.permissionDenied, GAPI.internalError) as e:
exitIfChatNotConfigured(chat, kvList, str(e), i, count)
Ind.Decrement()

# gam [<UserTypeEntity>] info chatmember member <ChatMember>
# gam [<UserTypeEntity>] info chatmember members <ChatMemberList>
# [formatjson]
def infoChatMember(users):
cd = buildGAPIObject(API.DIRECTORY)
FJQC = FormatJSONQuoteChar()
name = None
memberNames = []
while Cmd.ArgumentsRemaining():
myarg = getArgument()
if myarg == 'member':
name = getString(Cmd.OB_CHAT_MEMBER)
if myarg in {'member', 'members'}:
memberNames.extend(getString(Cmd.OB_CHAT_MEMBER).replace(',', ' ').split())
else:
FJQC.GetFormatJSON(myarg)
if not name:
missingArgumentExit('member')
if not memberNames:
missingArgumentExit('members')
i, count, users = getEntityArgument(users)
for user in users:
i += 1
user, chat, kvList = buildChatServiceObject(API.CHAT_MEMBERSHIPS, user, i, count, [Ent.CHAT_MEMBER, name])
user, chat, kvList = buildChatServiceObject(API.CHAT_MEMBERSHIPS, user, i, count)
if not chat:
continue
try:
member = callGAPI(chat.spaces().members(), 'get',
bailOnInternalError=True,
throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.INTERNAL_ERROR],
name=name)
_getChatMemberEmail(cd, member)
if not FJQC.formatJSON:
entityPerformAction(kvList, i, count)
Ind.Increment()
_showChatMember(member, FJQC)
Ind.Decrement()
except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied, GAPI.internalError) as e:
exitIfChatNotConfigured(chat, kvList, str(e), i, count)
jcount = len(memberNames)
if not FJQC.formatJSON:
entityPerformActionNumItems(kvList, jcount, Ent.CHAT_MEMBER, i, count)
kvList.extend([Ent.CHAT_MEMBER, ''])
j = 0
for name in memberNames:
j += 1
kvList[-1] = name
try:
member = callGAPI(chat.spaces().members(), 'get',
bailOnInternalError=True,
throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED, GAPI.INTERNAL_ERROR],
name=name)
_getChatMemberEmail(cd, member)
Ind.Increment()
_showChatMember(member, FJQC, j, jcount)
Ind.Decrement()
except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied, GAPI.internalError) as e:
exitIfChatNotConfigured(chat, kvList, str(e), i, count)

def doInfoChatMember():
infoChatMember([None])
Expand Down Expand Up @@ -69335,6 +69388,7 @@ def processResourcesCommands():
'remove':
(Act.REMOVE,
{Cmd.ARG_CALENDAR: removeCalendars,
Cmd.ARG_CHATMEMBER: deleteChatMember,
}
),
'replacedomain':
Expand Down

0 comments on commit e207063

Please sign in to comment.