status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/groups): group modal is missing context menu options

This commit is contained in:
Iuri Matias 2022-04-11 13:07:19 -04:00
parent 0ee91a1d1f
commit dbc16329c0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app_service/service/chat/dto/chat.nim
View File

@ -36,6 +36,7 @@ type ChatMember* = object
id*: string id*: string
admin*: bool admin*: bool
joined*: bool joined*: bool
roles*: seq[int]
type ChatDto* = object type ChatDto* = object
id*: string # ID is the id of the chat, for public chats it is the name e.g. status, id*: string # ID is the id of the chat, for public chats it is the name e.g. status,
@ -146,6 +147,11 @@ proc toChatMember*(jsonObj: JsonNode): ChatMember =
discard jsonObj.getProp("admin", result.admin) discard jsonObj.getProp("admin", result.admin)
discard jsonObj.getProp("joined", result.joined) discard jsonObj.getProp("joined", result.joined)
var rolesObj: JsonNode
if(jsonObj.getProp("roles", rolesObj) and rolesObj.kind == JArray):
for role in rolesObj:
result.roles.add(role.getInt)
proc toChatMember(jsonObj: JsonNode, memberId: string): ChatMember = proc toChatMember(jsonObj: JsonNode, memberId: string): ChatMember =
# Mapping this DTO is not strightforward since only keys are used for id. We # Mapping this DTO is not strightforward since only keys are used for id. We
# handle it a bit different. # handle it a bit different.
@ -193,9 +199,13 @@ proc toChatDto*(jsonObj: JsonNode): ChatDto =
result.chatType = ChatType(chatTypeInt) result.chatType = ChatType(chatTypeInt)
var membersObj: JsonNode var membersObj: JsonNode
if(jsonObj.getProp("members", membersObj) and membersObj.kind == JArray): if(jsonObj.getProp("members", membersObj)):
if(membersObj.kind == JArray):
for memberObj in membersObj: for memberObj in membersObj:
result.members.add(toChatMember(memberObj)) result.members.add(toChatMember(memberObj))
elif(membersObj.kind == JObject):
for memberId, memberObj in membersObj:
result.members.add(toChatMember(memberObj, memberId))
# Add community ID if needed # Add community ID if needed
if (result.communityId != "" and not result.id.contains(result.communityId)): if (result.communityId != "" and not result.id.contains(result.communityId)):