diff --git a/src/app_service/service/contacts/dto/contacts.nim b/src/app_service/service/contacts/dto/contacts.nim index 542756eba0..18b42abd3c 100644 --- a/src/app_service/service/contacts/dto/contacts.nim +++ b/src/app_service/service/contacts/dto/contacts.nim @@ -16,6 +16,14 @@ type TrustStatus* {.pure.}= enum Trusted = 1, Untrustworthy = 2 + +type ContactRequestState* {.pure.} = enum + None = 0 + Mutual = 1 + Sent = 2 + Received = 3 + Dismissed = 4 + type VerificationStatus* {.pure.}= enum Unverified = 0 Verifying = 1 @@ -51,6 +59,7 @@ type ContactsDto* = object isSyncing*: bool removed*: bool trustStatus*: TrustStatus + requestState*: ContactRequestState verificationStatus*: VerificationStatus proc `$`(self: Images): string = @@ -92,6 +101,11 @@ proc toImages(jsonObj: JsonNode): Images = if(jsonObj.getProp("thumbnail", thumbnailObj)): discard thumbnailObj.getProp("uri", result.thumbnail) +proc toContactRequestState*(value: int): ContactRequestState = + result = ContactRequestState.None + if value >= ord(low(ContactRequestState)) or value <= ord(high(ContactRequestState)): + result = ContactRequestState(value) + proc toTrustStatus*(value: int): TrustStatus = result = TrustStatus.Unknown if value >= ord(low(TrustStatus)) or value <= ord(high(TrustStatus)): @@ -126,6 +140,12 @@ proc toContactsDto*(jsonObj: JsonNode): ContactsDto = discard jsonObj.getProp("localNickname", result.localNickname) discard jsonObj.getProp("bio", result.bio) + + result.requestState = ContactRequestState.None + var requestState: int + discard jsonObj.getProp("contactRequestState", requestState) + result.requestState = requestState.toContactRequestState() + result.trustStatus = TrustStatus.Unknown var trustStatusInt: int discard jsonObj.getProp("trustStatus", trustStatusInt) @@ -170,6 +190,9 @@ proc userOptionalName*(contact: ContactsDto): string = proc isContactRequestReceived*(self: ContactsDto): bool = return self.hasAddedUs +proc isReceivedContactRequestRejected*(self: ContactsDto): bool = + return self.requestState == ContactRequestState.Dismissed + proc isContactRequestSent*(self: ContactsDto): bool = return self.added @@ -182,11 +205,6 @@ proc isContactRemoved*(self: ContactsDto): bool = # # We don't have this prop for now. # return false -# Temporary commented until we provide appropriate flags on the `status-go` side to cover all sections. -# proc isReceivedContactRequestRejected*(self: ContactsDto): bool = -# # We need to check this. -# return self.removed - proc isBlocked*(self: ContactsDto): bool = return self.blocked diff --git a/src/app_service/service/contacts/service.nim b/src/app_service/service/contacts/service.nim index e8d128286b..65d4494bd8 100644 --- a/src/app_service/service/contacts/service.nim +++ b/src/app_service/service/contacts/service.nim @@ -233,7 +233,7 @@ QtObject: x.isContactRequestReceived() and not x.isContactRequestSent() and not x.isContactRemoved() and - # not x.isReceivedContactRequestRejected() and + not x.isReceivedContactRequestRejected() and not x.isBlocked()) elif (group == ContactsGroup.OutgoingPendingContactRequests): return contacts.filter(x => x.id != myPubKey and @@ -242,12 +242,11 @@ QtObject: # not x.isSentContactRequestRejected() and not x.isContactRemoved() and not x.isBlocked()) - # Temporary commented until we provide appropriate flags on the `status-go` side to cover all sections. - # elif (group == ContactsGroup.IncomingRejectedContactRequests): - # return contacts.filter(x => x.id != myPubKey and - # x.isContactRequestReceived() and - # x.isReceivedContactRequestRejected() and - # not x.isBlocked()) + elif (group == ContactsGroup.IncomingRejectedContactRequests): + return contacts.filter(x => x.id != myPubKey and + x.isContactRequestReceived() and + x.isReceivedContactRequestRejected() and + not x.isBlocked()) # elif (group == ContactsGroup.OutgoingRejectedContactRequests): # return contacts.filter(x => x.id != myPubKey and # x.isContactRequestSent() and