Skip to content

Commit

Permalink
don't modify query
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblum committed Dec 4, 2018
1 parent e9d2b4e commit 57b7902
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions go/chat/storage/inbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -443,15 +443,16 @@ func (i *Inbox) applyQuery(ctx context.Context, query *chat1.GetInboxQuery, rcs
}

queryMemberStatusMap := map[chat1.ConversationMemberStatus]bool{}
memberStatus := query.MemberStatus
// Default allowed member statuses
if len(query.MemberStatus) == 0 {
query.MemberStatus = []chat1.ConversationMemberStatus{
if len(memberStatus) == 0 {
memberStatus = []chat1.ConversationMemberStatus{
chat1.ConversationMemberStatus_ACTIVE,
chat1.ConversationMemberStatus_PREVIEW,
chat1.ConversationMemberStatus_RESET,
}
}
for _, memberStatus := range query.MemberStatus {
for _, memberStatus := range memberStatus {
queryMemberStatusMap[memberStatus] = true
}

Expand All @@ -467,7 +468,7 @@ func (i *Inbox) applyQuery(ctx context.Context, query *chat1.GetInboxQuery, rcs
continue
}
// Member status check
if _, ok := queryMemberStatusMap[conv.ReaderInfo.Status]; !ok && len(query.MemberStatus) > 0 {
if _, ok := queryMemberStatusMap[conv.ReaderInfo.Status]; !ok && len(memberStatus) > 0 {
continue
}
// Status check
Expand Down

0 comments on commit 57b7902

Please sign in to comment.