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

chore: rename ContactDetails::details -> dto

This commit is contained in:
Patryk Osmaczko 2023-05-25 13:47:40 +02:00 committed by osmaczko
parent 0933db17c6
commit c40472c285
13 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/modules/main/activity_center/module.nim
View File

@ -101,7 +101,7 @@ proc createMessageItemFromDto(self: Module, message: MessageDto, communityId: st
contactDetails.icon,
contactDetails.colorHash,
contactDetails.isCurrentUser,
contactDetails.details.added,
contactDetails.dto.added,
message.outgoingStatus,
self.controller.getRenderedText(message.parsedText, communityChats),
self.controller.replacePubKeysWithDisplayNames(message.text),
@ -119,8 +119,8 @@ proc createMessageItemFromDto(self: Module, message: MessageDto, communityId: st
message.links,
newTransactionParametersItem("","","","","","",-1,""),
message.mentionedUsersPks,
contactDetails.details.trustStatus,
contactDetails.details.ensVerified,
contactDetails.dto.trustStatus,
contactDetails.dto.ensVerified,
message.discordMessage,
resendError = "",
message.mentioned,

22
src/app/modules/main/chat_section/chat_content/messages/module.nim
View File

@ -144,7 +144,7 @@ proc createChatIdentifierItem(self: Module): Item =
var senderIsAdded = false
if(chatDto.chatType == ChatType.OneToOne):
let sender = self.controller.getContactDetails(chatDto.id)
senderIsAdded = sender.details.added
senderIsAdded = sender.dto.added
(chatName, smallImage, chatIcon) = self.controller.getOneToOneChatNameAndImage()
senderColorHash = sender.colorHash
@ -272,7 +272,7 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
sender.icon,
sender.colorHash,
(isCurrentUser and message.contentType != ContentType.DiscordMessage),
sender.details.added,
sender.dto.added,
message.outgoingStatus,
renderedMessageText,
self.controller.replacePubKeysWithDisplayNames(message.text),
@ -297,8 +297,8 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
message.transactionParameters.commandState,
message.transactionParameters.signature),
message.mentionedUsersPks(),
sender.details.trustStatus,
sender.details.ensVerified,
sender.dto.trustStatus,
sender.dto.ensVerified,
message.discordMessage,
resendError = "",
message.mentioned,
@ -406,7 +406,7 @@ method messagesAdded*(self: Module, messages: seq[MessageDto]) =
sender.icon,
sender.colorHash,
(isCurrentUser and message.contentType != ContentType.DiscordMessage),
sender.details.added,
sender.dto.added,
message.outgoingStatus,
renderedMessageText,
self.controller.replacePubKeysWithDisplayNames(message.text),
@ -431,8 +431,8 @@ method messagesAdded*(self: Module, messages: seq[MessageDto]) =
message.transactionParameters.commandState,
message.transactionParameters.signature),
message.mentionedUsersPks,
sender.details.trustStatus,
sender.details.ensVerified,
sender.dto.trustStatus,
sender.dto.ensVerified,
message.discordMessage,
resendError = "",
message.mentioned,
@ -578,11 +578,11 @@ method updateContactDetails*(self: Module, contactId: string) =
item.senderOptionalName = updatedContact.optionalName
item.senderIcon = updatedContact.icon
item.senderColorHash = updatedContact.colorHash
item.senderIsAdded = updatedContact.details.added
item.senderTrustStatus = updatedContact.details.trustStatus
item.senderEnsVerified = updatedContact.details.ensVerified
item.senderIsAdded = updatedContact.dto.added
item.senderTrustStatus = updatedContact.dto.trustStatus
item.senderEnsVerified = updatedContact.dto.ensVerified
if item.quotedMessageAuthorDetails.details.id == contactId:
if item.quotedMessageAuthorDetails.dto.id == contactId:
item.quotedMessageAuthorDetails = updatedContact
item.quotedMessageAuthorDisplayName = updatedContact.defaultDisplayName
item.quotedMessageAuthorAvatar = updatedContact.icon

14
src/app/modules/main/chat_section/chat_content/module.nim
View File

@ -180,7 +180,7 @@ proc buildPinnedMessageItem(self: Module, message: MessageDto, actionInitiatedBy
contactDetails.icon,
contactDetails.colorHash,
isCurrentUser,
contactDetails.details.added,
contactDetails.dto.added,
message.outgoingStatus,
self.controller.getRenderedText(message.parsedText, communityChats),
self.controller.replacePubKeysWithDisplayNames(message.text),
@ -205,8 +205,8 @@ proc buildPinnedMessageItem(self: Module, message: MessageDto, actionInitiatedBy
message.transactionParameters.commandState,
message.transactionParameters.signature),
message.mentionedUsersPks,
contactDetails.details.trustStatus,
contactDetails.details.ensVerified,
contactDetails.dto.trustStatus,
contactDetails.dto.ensVerified,
message.discordMessage,
resendError = "",
message.mentioned,
@ -341,11 +341,11 @@ method onContactDetailsUpdated*(self: Module, contactId: string) =
if item.senderId == contactId:
item.senderDisplayName = updatedContact.defaultDisplayName
item.senderOptionalName = updatedContact.optionalName
item.senderEnsVerified = updatedContact.details.ensVerified
item.senderEnsVerified = updatedContact.dto.ensVerified
item.senderIcon = updatedContact.icon
item.senderTrustStatus = updatedContact.details.trustStatus
item.senderTrustStatus = updatedContact.dto.trustStatus
if item.quotedMessageAuthorDetails.details.id == contactId:
if item.quotedMessageAuthorDetails.dto.id == contactId:
item.quotedMessageAuthorDetails = updatedContact
item.quotedMessageAuthorDisplayName = updatedContact.defaultDisplayName
item.quotedMessageAuthorAvatar = updatedContact.icon
@ -357,7 +357,7 @@ method onContactDetailsUpdated*(self: Module, contactId: string) =
if(self.controller.getMyChatId() == contactId):
self.view.updateChatDetailsNameAndIcon(updatedContact.defaultDisplayName, updatedContact.icon)
self.view.updateTrustStatus(updatedContact.details.trustStatus == TrustStatus.Untrustworthy)
self.view.updateTrustStatus(updatedContact.dto.trustStatus == TrustStatus.Untrustworthy)
method onNotificationsUpdated*(self: Module, hasUnreadMessages: bool, notificationCount: int) =
self.view.updateChatDetailsNotifications(hasUnreadMessages, notificationCount)

54
src/app/modules/main/chat_section/chat_content/users/module.nim
View File

@ -63,9 +63,9 @@ method contactNicknameChanged*(self: Module, publicKey: string) =
let contactDetails = self.controller.getContactDetails(publicKey)
self.view.model().setName(
publicKey,
contactDetails.details.displayName,
contactDetails.details.name,
contactDetails.details.localNickname
contactDetails.dto.displayName,
contactDetails.dto.name,
contactDetails.dto.localNickname
)
method contactsStatusUpdated*(self: Module, statusUpdates: seq[StatusUpdateDto]) =
@ -77,15 +77,15 @@ method contactUpdated*(self: Module, publicKey: string) =
let contactDetails = self.controller.getContactDetails(publicKey)
self.view.model().updateItem(
pubKey = publicKey,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isUntrustworthy = contactDetails.details.trustStatus == TrustStatus.Untrustworthy,
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
isUntrustworthy = contactDetails.dto.trustStatus == TrustStatus.Untrustworthy,
)
method userProfileUpdated*(self: Module) =
@ -119,20 +119,20 @@ proc addChatMember(self: Module, member: ChatMember) =
self.view.model().addItem(initMemberItem(
pubKey = member.id,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = status,
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
isAdmin = member.admin,
joined = member.joined,
isUntrustworthy = contactDetails.details.trustStatus == TrustStatus.Untrustworthy
isUntrustworthy = contactDetails.dto.trustStatus == TrustStatus.Untrustworthy
))
method onChatMembersAdded*(self: Module, ids: seq[string]) =
@ -158,17 +158,17 @@ method onChatMemberUpdated*(self: Module, publicKey: string, admin: bool, joined
let contactDetails = self.controller.getContactDetails(publicKey)
self.view.model().updateItem(
pubKey = publicKey,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
isAdmin = admin,
joined = joined,
isUntrustworthy = contactDetails.details.trustStatus == TrustStatus.Untrustworthy,
isUntrustworthy = contactDetails.dto.trustStatus == TrustStatus.Untrustworthy,
)
method addGroupMembers*(self: Module, pubKeys: seq[string]) =

30
src/app/modules/main/chat_section/module.nim
View File

@ -250,20 +250,20 @@ proc createItemFromPublicKey(self: Module, publicKey: string): UserItem =
let contactDetails = self.controller.getContactDetails(publicKey)
return initUserItem(
pubKey = contactDetails.details.id,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
pubKey = contactDetails.dto.id,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = toOnlineStatus(self.controller.getStatusForContactWithId(publicKey).statusType),
isContact = contactDetails.details.isContact(),
isVerified = contactDetails.details.isContactVerified(),
isUntrustworthy = contactDetails.details.isContactUntrustworthy(),
isBlocked = contactDetails.details.isBlocked(),
isContact = contactDetails.dto.isContact(),
isVerified = contactDetails.dto.isContactVerified(),
isUntrustworthy = contactDetails.dto.isContactUntrustworthy(),
isBlocked = contactDetails.dto.isBlocked(),
)
proc initContactRequestsModel(self: Module) =
@ -573,7 +573,7 @@ method addNewChat*(
let contactDetails = self.controller.getContactDetails(chatDto.id)
chatName = contactDetails.defaultDisplayName
chatImage = contactDetails.icon
blocked = contactDetails.details.isBlocked()
blocked = contactDetails.dto.isBlocked()
isUsersListAvailable = false
colorHash = self.controller.getColorHash(chatDto.id)
colorId = self.controller.getColorId(chatDto.id)
@ -912,9 +912,9 @@ method onContactDetailsUpdated*(self: Module, publicKey: string) =
if(self.controller.isCommunity()):
return
let contactDetails = self.controller.getContactDetails(publicKey)
if (contactDetails.details.isContactRequestReceived() and
not contactDetails.details.isContactRequestSent() and
not contactDetails.details.isBlocked() and
if (contactDetails.dto.isContactRequestReceived() and
not contactDetails.dto.isContactRequestSent() and
not contactDetails.dto.isBlocked() and
not self.view.contactRequestsModel().isContactWithIdAdded(publicKey)):
let item = self.createItemFromPublicKey(publicKey)
self.view.contactRequestsModel().addItem(item)
@ -924,7 +924,7 @@ method onContactDetailsUpdated*(self: Module, publicKey: string) =
let chatName = contactDetails.defaultDisplayName
let chatImage = contactDetails.icon
let trustStatus = contactDetails.details.trustStatus
let trustStatus = contactDetails.dto.trustStatus
self.view.chatsModel().updateItemDetailsById(publicKey, chatName, chatImage, trustStatus)
method onNewMessagesReceived*(self: Module, sectionIdMsgBelongsTo: string, chatIdMsgBelongsTo: string,

14
src/app/modules/main/communities/module.nim
View File

@ -116,17 +116,17 @@ proc createMemberItem(self: Module, memberId, requestId: string): MemberItem =
let contactDetails = self.controller.getContactDetails(memberId)
result = initMemberItem(
pubKey = memberId,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = toOnlineStatus(self.controller.getStatusForContactWithId(memberId).statusType),
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
requestToJoinId = requestId)
method getCommunityItem(self: Module, c: CommunityDto): SectionItem =

72
src/app/modules/main/module.nim
View File

@ -284,17 +284,17 @@ proc createChannelGroupItem[T](self: Module[T], channelGroup: ChannelGroupDto):
let contactDetails = self.controller.getContactDetails(member.id)
result = initMemberItem(
pubKey = member.id,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = toOnlineStatus(self.controller.getStatusForContactWithId(member.id).statusType),
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
isAdmin = member.admin
)),
# pendingRequestsToJoin
@ -313,17 +313,17 @@ proc createChannelGroupItem[T](self: Module[T], channelGroup: ChannelGroupDto):
let contactDetails = self.controller.getContactDetails(bannedMemberId)
result = initMemberItem(
pubKey = bannedMemberId,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = toOnlineStatus(self.controller.getStatusForContactWithId(bannedMemberId).statusType),
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified()
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified()
)
),
# pendingMemberRequests
@ -331,17 +331,17 @@ proc createChannelGroupItem[T](self: Module[T], channelGroup: ChannelGroupDto):
let contactDetails = self.controller.getContactDetails(requestDto.publicKey)
result = initMemberItem(
pubKey = requestDto.publicKey,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = toOnlineStatus(self.controller.getStatusForContactWithId(requestDto.publicKey).statusType),
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
requestToJoinId = requestDto.id
)
) else: @[],
@ -350,17 +350,17 @@ proc createChannelGroupItem[T](self: Module[T], channelGroup: ChannelGroupDto):
let contactDetails = self.controller.getContactDetails(requestDto.publicKey)
result = initMemberItem(
pubKey = requestDto.publicKey,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = toOnlineStatus(self.controller.getStatusForContactWithId(requestDto.publicKey).statusType),
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
requestToJoinId = requestDto.id
)
) else: @[],
@ -1029,15 +1029,15 @@ method contactUpdated*[T](self: Module[T], publicKey: string) =
let contactDetails = self.controller.getContactDetails(publicKey)
self.view.activeSection().updateMember(
publicKey,
contactDetails.details.displayName,
contactDetails.details.name,
contactDetails.details.ensVerified,
contactDetails.details.localNickname,
contactDetails.details.alias,
contactDetails.dto.displayName,
contactDetails.dto.name,
contactDetails.dto.ensVerified,
contactDetails.dto.localNickname,
contactDetails.dto.alias,
contactDetails.icon,
isContact = contactDetails.details.isContact,
isVerified = contactDetails.details.isContactVerified(),
isUntrustworthy = contactDetails.details.isContactUntrustworthy(),
isContact = contactDetails.dto.isContact,
isVerified = contactDetails.dto.isContactVerified(),
isUntrustworthy = contactDetails.dto.isContactUntrustworthy(),
)
method calculateProfileSectionHasNotification*[T](self: Module[T]): bool =

26
src/app/modules/main/profile_section/contacts/module.nim
View File

@ -44,20 +44,20 @@ proc createItemFromPublicKey(self: Module, publicKey: string): UserItem =
let contactDetails = self.controller.getContactDetails(publicKey)
return initUserItem(
pubKey = contactDetails.details.id,
displayName = contactDetails.details.displayName,
ensName = contactDetails.details.name,
isEnsVerified = contactDetails.details.ensVerified,
localNickname = contactDetails.details.localNickname,
alias = contactDetails.details.alias,
pubKey = contactDetails.dto.id,
displayName = contactDetails.dto.displayName,
ensName = contactDetails.dto.name,
isEnsVerified = contactDetails.dto.ensVerified,
localNickname = contactDetails.dto.localNickname,
alias = contactDetails.dto.alias,
icon = contactDetails.icon,
colorId = contactDetails.colorId,
colorHash = contactDetails.colorHash,
onlineStatus = toOnlineStatus(self.controller.getStatusForContactWithId(publicKey).statusType),
isContact = contactDetails.details.isContact(),
isVerified = contactDetails.details.isContactVerified(),
isUntrustworthy = contactDetails.details.isContactUntrustworthy(),
isBlocked = contactDetails.details.isBlocked(),
isContact = contactDetails.dto.isContact(),
isVerified = contactDetails.dto.isContactVerified(),
isUntrustworthy = contactDetails.dto.isContactUntrustworthy(),
isBlocked = contactDetails.dto.isBlocked(),
)
proc buildModel(self: Module, model: Model, group: ContactsGroup) =
@ -180,9 +180,9 @@ method contactsStatusUpdated*(self: Module, statusUpdates: seq[StatusUpdateDto])
method contactNicknameChanged*(self: Module, publicKey: string) =
let contactDetails = self.controller.getContactDetails(publicKey)
let displayName = contactDetails.details.displayName
let ensName = contactDetails.details.name
let localNickname = contactDetails.details.localNickname
let displayName = contactDetails.dto.displayName
let ensName = contactDetails.dto.name
let localNickname = contactDetails.dto.localNickname
self.view.myMutualContactsModel().setName(publicKey, displayName, ensName, localNickname)
self.view.receivedContactRequestsModel().setName(publicKey, displayName, ensName, localNickname)

2
src/app/modules/main/profile_section/notifications/module.nim
View File

@ -65,7 +65,7 @@ proc createChatItem(self: Module, chatDto: ChatDto): Item =
var itemType = item.Type.GroupChat
if(chatDto.chatType == ChatType.OneToOne):
let contactDetails = self.controller.getContactDetails(chatDto.id)
chatName = contactDetails.details.displayName
chatName = contactDetails.dto.displayName
chatImage = contactDetails.icon
itemType = item.Type.OneToOneChat

4
src/app/modules/shared_models/message_item.nim
View File

@ -162,8 +162,8 @@ proc initItem*(
if result.quotedMessageAuthorAvatar == "":
result.quotedMessageAuthorAvatar = quotedMessageDiscordMessage.author.avatarUrl
else:
result.quotedMessageAuthorDisplayName = quotedMessageAuthorDetails.details.userDefaultDisplayName()
result.quotedMessageAuthorAvatar = quotedMessageAuthorDetails.details.image.thumbnail
result.quotedMessageAuthorDisplayName = quotedMessageAuthorDetails.dto.userDefaultDisplayName()
result.quotedMessageAuthorAvatar = quotedMessageAuthorDetails.dto.image.thumbnail
if contentType == ContentType.DiscordMessage:

6
src/app/modules/shared_models/message_model.nim
View File

@ -247,15 +247,15 @@ QtObject:
of ModelRole.QuotedMessageDeleted:
result = newQVariant(item.quotedMessageDeleted)
of ModelRole.QuotedMessageAuthorName:
result = newQVariant(item.quotedMessageAuthorDetails.details.name)
result = newQVariant(item.quotedMessageAuthorDetails.dto.name)
of ModelRole.QuotedMessageAuthorDisplayName:
result = newQVariant(item.quotedMessageAuthorDisplayName)
of ModelRole.QuotedMessageAuthorThumbnailImage:
result = newQVariant(item.quotedMessageAuthorAvatar)
of ModelRole.QuotedMessageAuthorEnsVerified:
result = newQVariant(item.quotedMessageAuthorDetails.details.ensVerified)
result = newQVariant(item.quotedMessageAuthorDetails.dto.ensVerified)
of ModelRole.QuotedMessageAuthorIsContact:
result = newQVariant(item.quotedMessageAuthorDetails.details.isContact())
result = newQVariant(item.quotedMessageAuthorDetails.dto.isContact())
of ModelRole.QuotedMessageAuthorColorHash:
result = newQVariant(item.quotedMessageAuthorDetails.colorHash)
of ModelRole.MessageText:

2
src/app_service/service/contacts/dto/contact_details.nim
View File

@ -12,4 +12,4 @@ type
isCurrentUser*: bool
colorId*: int
colorHash*: string
details*: ContactsDto
dto*: ContactsDto

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

@ -132,8 +132,8 @@ QtObject:
proc addContact(self: Service, contact: ContactDetails) =
# Private proc, used for adding contacts only.
self.contacts[contact.details.id] = contact
self.contactsStatus[contact.details.id] = StatusUpdateDto(publicKey: contact.details.id, statusType: StatusType.Unknown)
self.contacts[contact.dto.id] = contact
self.contactsStatus[contact.dto.id] = StatusUpdateDto(publicKey: contact.dto.id, statusType: StatusType.Unknown)
proc fetchContacts*(self: Service) =
try:
@ -204,15 +204,15 @@ QtObject:
if request.status == VerificationStatus.Trusted:
if self.contacts.hasKey(request.fromId):
self.contacts[request.fromId].details.trustStatus = TrustStatus.Trusted
self.contacts[request.fromId].details.verificationStatus = VerificationStatus.Trusted
self.contacts[request.fromId].dto.trustStatus = TrustStatus.Trusted
self.contacts[request.fromId].dto.verificationStatus = VerificationStatus.Trusted
self.events.emit(SIGNAL_CONTACT_TRUSTED,
TrustArgs(publicKey: request.fromId, isUntrustworthy: false))
self.events.emit(SIGNAL_CONTACT_VERIFIED, ContactArgs(contactId: request.fromId))
if request.status == VerificationStatus.Canceled:
if self.contacts.hasKey(request.fromId):
self.contacts[request.fromId].details.verificationStatus = VerificationStatus.Canceled
self.contacts[request.fromId].dto.verificationStatus = VerificationStatus.Canceled
self.events.emit(SIGNAL_CONTACT_VERIFICATION_CANCELLED, ContactArgs(contactId: request.fromId))
else:
@ -252,7 +252,7 @@ QtObject:
# Having this logic here we ensure that the same contact group in each part of the app will have the same list
# of contacts. Be sure when you change any condition here.
let myPubKey = singletonInstance.userProfile.getPubKey()
let contacts = toSeq(self.contacts.values).map(cd => cd.details)
let contacts = toSeq(self.contacts.values).map(cd => cd.dto)
if (group == ContactsGroup.IncomingPendingContactRequests):
return contacts.filter(x => x.id != myPubKey and
x.isContactRequestReceived() and
@ -337,7 +337,7 @@ QtObject:
result.icon = icon
result.colorId = procs_from_visual_identity_service.colorIdOf(contactDto.id)
result.isCurrentUser = contactDto.id == singletonInstance.userProfile.getPubKey()
result.details = contactDto
result.dto = contactDto
if not contactDto.ensVerified:
result.colorHash = procs_from_visual_identity_service.getColorHashAsJson(contactDto.id)
@ -376,7 +376,7 @@ QtObject:
return self.contacts[pubkey]
result = self.fetchContact(pubkey)
if result.details.id.len == 0:
if result.dto.id.len == 0:
if(not pubkey.startsWith("0x")):
debug "id is not in a hex format"
return
@ -393,10 +393,10 @@ QtObject:
ContactsDto(
id: pubkey,
alias: alias,
ensVerified: result.details.ensVerified,
added: result.details.added,
blocked: result.details.blocked,
hasAddedUs: result.details.hasAddedUs,
ensVerified: result.dto.ensVerified,
added: result.dto.added,
blocked: result.dto.blocked,
hasAddedUs: result.dto.hasAddedUs,
trustStatus: trustStatus
)
)
@ -404,7 +404,7 @@ QtObject:
return contact
proc getContactById*(self: Service, id: string): ContactsDto =
return self.getContactDetails(id).details
return self.getContactDetails(id).dto
proc getStatusForContactWithId*(self: Service, publicKey: string): StatusUpdateDto =
if publicKey == singletonInstance.userProfile.getPubKey():
@ -434,7 +434,7 @@ QtObject:
var signal = SIGNAL_CONTACT_ADDED
let publicKey = contact.id
if self.contacts.hasKey(publicKey):
if self.contacts[publicKey].details.added and not self.contacts[publicKey].details.removed and contact.added and not contact.removed:
if self.contacts[publicKey].dto.added and not self.contacts[publicKey].dto.removed and contact.added and not contact.removed:
signal = SIGNAL_CONTACT_UPDATED
if contact.removed:
signal = SIGNAL_CONTACT_REMOVED
@ -582,7 +582,7 @@ QtObject:
return
if self.contacts.hasKey(publicKey):
self.contacts[publicKey].details.trustStatus = TrustStatus.Untrustworthy
self.contacts[publicKey].dto.trustStatus = TrustStatus.Untrustworthy
self.events.emit(SIGNAL_CONTACT_UNTRUSTWORTHY,
TrustArgs(publicKey: publicKey, isUntrustworthy: true))
@ -603,8 +603,8 @@ QtObject:
self.activityCenterService.parseActivityCenterResponse(response)
if self.contacts.hasKey(publicKey):
self.contacts[publicKey].details.trustStatus = TrustStatus.Trusted
self.contacts[publicKey].details.verificationStatus = VerificationStatus.Trusted
self.contacts[publicKey].dto.trustStatus = TrustStatus.Trusted
self.contacts[publicKey].dto.verificationStatus = VerificationStatus.Trusted
self.events.emit(SIGNAL_CONTACT_TRUSTED,
TrustArgs(publicKey: publicKey, isUntrustworthy: false))
@ -628,8 +628,8 @@ QtObject:
self.activityCenterService.parseActivityCenterResponse(response)
if self.contacts.hasKey(publicKey):
self.contacts[publicKey].details.trustStatus = TrustStatus.Untrustworthy
self.contacts[publicKey].details.verificationStatus = VerificationStatus.Untrustworthy
self.contacts[publicKey].dto.trustStatus = TrustStatus.Untrustworthy
self.contacts[publicKey].dto.verificationStatus = VerificationStatus.Untrustworthy
self.events.emit(SIGNAL_CONTACT_UNTRUSTWORTHY,
TrustArgs(publicKey: publicKey, isUntrustworthy: true))
@ -644,9 +644,9 @@ QtObject:
return
if self.contacts.hasKey(publicKey):
self.contacts[publicKey].details.trustStatus = TrustStatus.Unknown
if self.contacts[publicKey].details.verificationStatus == VerificationStatus.Verified:
self.contacts[publicKey].details.verificationStatus = VerificationStatus.Unverified
self.contacts[publicKey].dto.trustStatus = TrustStatus.Unknown
if self.contacts[publicKey].dto.verificationStatus == VerificationStatus.Verified:
self.contacts[publicKey].dto.verificationStatus = VerificationStatus.Unverified
self.events.emit(SIGNAL_REMOVED_TRUST_STATUS,
TrustArgs(publicKey: publicKey, isUntrustworthy: false))