Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/modules/main/activity_center/module.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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),
Expand All @@ -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,
Expand Down Expand Up @@ -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),
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions src/app/modules/main/chat_section/chat_content/module.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
54 changes: 27 additions & 27 deletions src/app/modules/main/chat_section/chat_content/users/module.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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]) =
Expand All @@ -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) =
Expand Down Expand Up @@ -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]) =
Expand All @@ -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]) =
Expand Down
30 changes: 15 additions & 15 deletions src/app/modules/main/chat_section/module.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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) =
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions src/app/modules/main/communities/module.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Loading