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(Contacts): fix weird behaviour in some contacts flows edge cases (#10613) 

* fix(Chat): Fix displaying CR messages in the chat

* fix(Contacts): Relay on actual status-go state during contact state manipulation

Close #10500
This commit is contained in:
Mikhail Rogachev 2023-05-15 15:22:04 +04:00 committed by GitHub
parent 41c6addc3e
commit 3a030102fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app_service/service/contacts/dto/contacts.nim
View File

@ -88,6 +88,7 @@ proc `$`*(self: ContactsDto): string =
isSyncing:{self.isSyncing},
removed:{self.removed},
trustStatus:{self.trustStatus},
contactRequestState:{self.contactRequestState},
verificationStatus:{self.verificationStatus},
)"""
@ -111,12 +112,12 @@ proc toTrustStatus*(value: int): TrustStatus =
result = TrustStatus.Unknown
if value >= ord(low(TrustStatus)) or value <= ord(high(TrustStatus)):
result = TrustStatus(value)
proc toVerificationStatus*(value: int): VerificationStatus =
result = VerificationStatus.Unverified
if value >= ord(low(VerificationStatus)) or value <= ord(high(VerificationStatus)):
result = VerificationStatus(value)
proc toVerificationRequest*(jsonObj: JsonNode): VerificationRequest =
result = VerificationRequest()
discard jsonObj.getProp("id", result.id)

129
src/app_service/service/contacts/service.nim
View File

@ -101,6 +101,7 @@ QtObject:
proc getContactById*(self: Service, id: string): ContactsDto
proc saveContact(self: Service, contact: ContactsDto)
proc fetchReceivedVerificationRequests*(self: Service) : seq[VerificationRequest]
proc requestContactInfo*(self: Service, pubkey: string)
proc delete*(self: Service) =
self.closingApp = true
@ -361,16 +362,17 @@ QtObject:
let alias = self.generateAlias(pubkey)
let trustStatus = self.getTrustStatus(pubkey)
result = ContactsDto(
let contact = ContactsDto(
id: pubkey,
alias: alias,
ensVerified: false,
added: false,
blocked: false,
hasAddedUs: false,
ensVerified: result.ensVerified,
added: result.added,
blocked: result.blocked,
hasAddedUs: result.hasAddedUs,
trustStatus: trustStatus
)
self.addContact(result)
self.addContact(contact)
return contact
proc getStatusForContactWithId*(self: Service, publicKey: string): StatusUpdateDto =
if publicKey == singletonInstance.userProfile.getPubKey():
@ -407,28 +409,39 @@ QtObject:
# we must keep local contacts updated
self.contacts[contact.id] = contact
proc sendContactRequest*(self: Service, chatKey: string, message: string) =
try:
let publicKey = status_accounts.decompressPk(chatKey).result
proc updateContact(self: Service, contact: ContactsDto) =
var signal = SIGNAL_CONTACT_ADDED
let publicKey = contact.id
if self.contacts.hasKey(publicKey):
if self.contacts[publicKey].added and not self.contacts[publicKey].removed and contact.added and not contact.removed:
signal = SIGNAL_CONTACT_UPDATED
if contact.removed:
signal = SIGNAL_CONTACT_REMOVED
self.contacts[publicKey] = contact
self.events.emit(signal, ContactArgs(contactId: publicKey))
proc parseContactsResponse*(self: Service, response: RpcResponse[JsonNode]) =
if response.result["contacts"] != nil:
for contactJson in response.result["contacts"]:
self.updateContact(contactJson.toContactsDto())
# NOTE: this response may also contain chats and messages
self.activityCenterService.parseActivityCenterResponse(response)
proc sendContactRequest*(self: Service, publicKey: string, message: string) =
# Prefetch contact to avoid race condition with AC notification
discard self.getContactById(publicKey)
try:
let response = status_contacts.sendContactRequest(publicKey, message)
if(not response.error.isNil):
let msg = response.error.message
error "error sending contact request", msg
if not response.error.isNil:
error "error sending contact request", msg = response.error.message
return
var contact = self.getContactById(publicKey)
contact.added = true
contact.blocked = false
contact.removed = false
contact.contactRequestState = ContactRequestState.Sent
self.saveContact(contact)
self.events.emit(SIGNAL_CONTACT_ADDED, ContactArgs(contactId: contact.id))
self.activityCenterService.parseActivityCenterResponse(response)
self.parseContactsResponse(response)
except Exception as e:
error "an error occurred while sending contact request", msg=e.msg
error "an error occurred while sending contact request", msg = e.msg
proc acceptContactRequest*(self: Service, publicKey: string, contactRequestId: string) =
try:
@ -439,19 +452,11 @@ QtObject:
else:
status_contacts.acceptLatestContactRequestForContact(publicKey)
if (not response.error.isNil):
let msg = response.error.message
error "error accepting contact request", msg
if not response.error.isNil:
error "error accepting contact request", msg = response.error.message
return
var contact = self.getContactById(publicKey)
contact.added = true
contact.removed = false
contact.contactRequestState = ContactRequestState.Mutual
self.saveContact(contact)
self.events.emit(SIGNAL_CONTACT_ADDED, ContactArgs(contactId: contact.id))
self.activityCenterService.parseActivityCenterResponse(response)
self.parseContactsResponse(response)
except Exception as e:
error "an error occurred while accepting contact request", msg=e.msg
@ -465,17 +470,12 @@ QtObject:
else:
status_contacts.dismissLatestContactRequestForContact(publicKey)
if(not response.error.isNil):
let msg = response.error.message
error "error dismissing contact ", msg
if not response.error.isNil:
error "error dismissing contact ", msg = response.error.message
return
var contact = self.getContactById(publicKey)
contact.removed = true
contact.contactRequestState = ContactRequestState.Dismissed
self.saveContact(contact)
self.events.emit(SIGNAL_CONTACT_REMOVED, ContactArgs(contactId: contact.id))
self.activityCenterService.parseActivityCenterResponse(response)
self.parseContactsResponse(response)
except Exception as e:
error "an error occurred while dismissing contact request", msg=e.msg
@ -484,9 +484,8 @@ QtObject:
contact.localNickname = nickname
let response = status_contacts.setContactLocalNickname(contact.id, contact.localNickname)
if(not response.error.isNil):
let msg = response.error.message
error "error setting local name ", msg
if not response.error.isNil:
error "error setting local name ", msg = response.error.message
return
self.saveContact(contact)
let data = ContactArgs(contactId: contact.id)
@ -496,9 +495,8 @@ QtObject:
var contact = self.getContactById(publicKey)
let response = status_contacts.unblockContact(contact.id)
if(not response.error.isNil):
let msg = response.error.message
error "error unblocking contact ", msg
if not response.error.isNil:
error "error unblocking contact ", msg = response.error.message
return
contact.blocked = false
@ -509,9 +507,8 @@ QtObject:
var contact = self.getContactById(publicKey)
let response = status_contacts.blockContact(contact.id)
if(not response.error.isNil):
let msg = response.error.message
error "error blocking contact ", msg
if not response.error.isNil:
error "error blocking contact ", msg = response.error.message
return
contact.blocked = true
@ -520,19 +517,11 @@ QtObject:
proc removeContact*(self: Service, publicKey: string) =
let response = status_contacts.retractContactRequest(publicKey)
if(not response.error.isNil):
let msg = response.error.message
error "error removing contact ", msg
if not response.error.isNil:
error "error removing contact ", msg = response.error.message
return
var contact = self.getContactById(publicKey)
contact.removed = true
contact.added = false
contact.hasAddedUs = false
contact.contactRequestState = ContactRequestState.None
self.saveContact(contact)
self.events.emit(SIGNAL_CONTACT_REMOVED, ContactArgs(contactId: contact.id))
self.parseContactsResponse(response)
proc ensResolved*(self: Service, jsonObj: string) {.slot.} =
let jsonObj = jsonObj.parseJson()
@ -581,8 +570,7 @@ QtObject:
proc markUntrustworthy*(self: Service, publicKey: string) =
let response = status_contacts.markUntrustworthy(publicKey)
if not response.error.isNil:
let msg = response.error.message
error "error marking as untrustworthy ", msg
error "error marking as untrustworthy ", msg = response.error.message
return
if self.contacts.hasKey(publicKey):
@ -643,9 +631,8 @@ QtObject:
proc removeTrustStatus*(self: Service, publicKey: string) =
let response = status_contacts.removeTrustStatus(publicKey)
if(not response.error.isNil):
let msg = response.error.message
error "error removing trust status", msg
if not response.error.isNil:
error "error removing trust status", msg = response.error.message
return
if self.contacts.hasKey(publicKey):
@ -694,9 +681,8 @@ QtObject:
proc sendVerificationRequest*(self: Service, publicKey: string, challenge: string) =
try:
let response = status_contacts.sendVerificationRequest(publicKey, challenge)
if(not response.error.isNil):
let msg = response.error.message
error "error sending contact verification request", msg
if not response.error.isNil:
error "error sending contact verification request", msg = response.error.message
return
var contact = self.getContactById(publicKey)
@ -719,8 +705,7 @@ QtObject:
response = status_contacts.cancelVerificationRequest(request.id)
if not response.error.isNil:
let msg = response.error.message
error "error sending contact verification request", msg
error "error sending contact verification request", msg = response.error.message
return
var contact = self.getContactById(publicKey)

1
ui/imports/shared/views/chat/MessageView.qml
View File

@ -218,6 +218,7 @@ Loader {
case Constants.messageContentType.audioType:
case Constants.messageContentType.communityInviteType:
case Constants.messageContentType.discordMessageType:
case Constants.messageContentType.contactRequestType:
return messageComponent
case Constants.messageContentType.unknownContentType:
// NOTE: We could display smth like "unknown message type, please upgrade Status to see it".

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit ac837365be321df8443cafd4c89f256eefde3e1d
Subproject commit d55adaf3a486246fa7f266cf0d864cad853db179