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

fix(chat-api): fix getChats functions (#2610)

This commit is contained in:
Jonathan Rainville 2022-04-01 18:39:25 -04:00 committed by GitHub
parent 478990febf
commit 391ef8a65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/chat/api.go
View File

@ -171,7 +171,7 @@ func (api *API) GetChats(ctx context.Context) (map[string]ChannelGroup, error) {
}
for _, chat := range channels {
if chat.CommunityID == community.IDString() {
if chat.CommunityID == community.IDString() && chat.Active {
c, err := api.toAPIChat(chat, community, pubKey)
if err != nil {
return nil, err
@ -285,10 +285,6 @@ func (api *API) toAPIChat(protocolChat *protocol.Chat, community *communities.Co
}
chat.Members = chatMembers
if chat.CommunityID == "" {
chat.CommunityID = pubKey
}
return chat, nil
}
@ -340,7 +336,8 @@ func (chat *Chat) populateCommunityFields(community *communities.Community) erro
commChat, exists := community.Chats()[chat.ID]
if !exists {
return ErrChatNotFound
// Skip unknown community chats. They might be channels that were deleted
return nil
}
canPost, err := community.CanMemberIdentityPost(chat.ID)
@ -353,7 +350,6 @@ func (chat *Chat) populateCommunityFields(community *communities.Community) erro
chat.Permissions = commChat.Permissions
chat.Emoji = commChat.Identity.Emoji
chat.Name = commChat.Identity.DisplayName
chat.Color = commChat.Identity.Color
chat.Description = commChat.Identity.Description
chat.CanPost = canPost