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(@communities): create channel 

fixes #4565
This commit is contained in:
Anthony Laibe 2022-01-25 17:28:13 +01:00 committed by Sale Djenic
parent a8f2a3cb08
commit 2e3d252fec
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app_service/service/community/service.nim
View File

@ -117,16 +117,18 @@ QtObject:
self.joinedCommunities[membershipRequest.communityId] = community
self.events.emit(SIGNAL_COMMUNITY_EDITED, CommunityArgs(community: community))
proc mapChatToChatDto(chat: Chat): ChatDto =
proc mapChatToChatDto(chat: Chat, communityId: string): ChatDto =
result = ChatDto()
result.id = chat.id
result.name = chat.name
result.chatType = ChatType.CommunityChat
result.color = chat.color
result.emoji = chat.emoji
result.description = chat.description
result.canPost = chat.canPost
result.position = chat.position
result.categoryId = chat.categoryId
result.communityId = communityId
proc findChatById(id: string, chats: seq[ChatDto]): ChatDto =
for chat in chats:
@ -158,7 +160,9 @@ QtObject:
chat_to_be_added.id = community.id&chat.id
chat_to_be_added.color = updated_chat.color
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_CREATED, CommunityChatArgs(communityId: community.id, chat: mapChatToChatDto(chat_to_be_added)))
self.events.emit(
SIGNAL_COMMUNITY_CHANNEL_CREATED,
CommunityChatArgs(communityId: community.id, chat: mapChatToChatDto(chat_to_be_added, community.id)))
# channel was removed
elif(community.chats.len < prev_community.chats.len):
@ -191,7 +195,9 @@ QtObject:
if(updated_chat.color != ""):
chat_to_be_edited.color = updated_chat.color
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_EDITED, CommunityChatArgs(communityId: community.id, chat: mapChatToChatDto(chat_to_be_edited)))
self.events.emit(
SIGNAL_COMMUNITY_CHANNEL_EDITED,
CommunityChatArgs(communityId: community.id, chat: mapChatToChatDto(chat_to_be_edited, community.id)))
self.joinedCommunities[community.id].chats = community.chats
@ -464,7 +470,7 @@ QtObject:
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_CREATED, CommunityChatArgs(
communityId: communityId,
chat: mapChatToChatDto(chat))
chat: mapChatToChatDto(chat, communityId))
)
except Exception as e:
error "Error creating community channel", msg = e.msg, communityId, name, description
@ -498,7 +504,7 @@ QtObject:
if(idx != -1):
self.joinedCommunities[communityId].chats[idx] = chat
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_EDITED, CommunityChatArgs(chat: mapChatToChatDto(chat)))
self.events.emit(SIGNAL_COMMUNITY_CHANNEL_EDITED, CommunityChatArgs(chat: mapChatToChatDto(chat, communityId)))
except Exception as e:
error "Error editing community channel", msg = e.msg, communityId, channelId