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

fixed

This commit is contained in:
decanus 2020-07-09 18:15:14 +02:00 committed by Dean Eigenmann
parent 7b82f52fac
commit d45e78b3e0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/chat/views/channels_list.nim
View File

@ -33,6 +33,11 @@ QtObject:
result.status = status result.status = status
result.setup() result.setup()
proc userNameOrAlias(self: ChannelsList, pubKey: string): string {.slot.} =
if self.status.chat.contacts.hasKey(pubKey):
return ens.userNameOrAlias(self.status.chat.contacts[pubKey])
generateAlias(pubKey)
method rowCount(self: ChannelsList, index: QModelIndex = nil): int = self.chats.len method rowCount(self: ChannelsList, index: QModelIndex = nil): int = self.chats.len
proc renderBlock(self: ChannelsList, message: Message): string proc renderBlock(self: ChannelsList, message: Message): string
@ -44,9 +49,14 @@ QtObject:
return return
let chatItem = self.chats[index.row] let chatItem = self.chats[index.row]
var name = chatItem.name
if chatItem.chatType == ChatType.OneToOne:
name = self.userNameOrAlias(chatItem.id)
let chatItemRole = role.ChannelsRoles let chatItemRole = role.ChannelsRoles
case chatItemRole: case chatItemRole:
of ChannelsRoles.Name: result = newQVariant(chatItem.name) of ChannelsRoles.Name: result = newQVariant(name)
of ChannelsRoles.Timestamp: result = newQVariant($chatItem.timestamp) of ChannelsRoles.Timestamp: result = newQVariant($chatItem.timestamp)
of ChannelsRoles.LastMessage: result = newQVariant(self.renderBlock(chatItem.lastMessage)) of ChannelsRoles.LastMessage: result = newQVariant(self.renderBlock(chatItem.lastMessage))
of ChannelsRoles.UnreadMessages: result = newQVariant(chatItem.unviewedMessagesCount) of ChannelsRoles.UnreadMessages: result = newQVariant(chatItem.unviewedMessagesCount)
@ -126,14 +136,9 @@ QtObject:
self.dataChanged(topLeft, bottomRight, @[ChannelsRoles.Name.int, ChannelsRoles.LastMessage.int, ChannelsRoles.Timestamp.int, ChannelsRoles.UnreadMessages.int, ChannelsRoles.Identicon.int, ChannelsRoles.ChatType.int, ChannelsRoles.Color.int, ChannelsRoles.HasMentions.int]) self.dataChanged(topLeft, bottomRight, @[ChannelsRoles.Name.int, ChannelsRoles.LastMessage.int, ChannelsRoles.Timestamp.int, ChannelsRoles.UnreadMessages.int, ChannelsRoles.Identicon.int, ChannelsRoles.ChatType.int, ChannelsRoles.Color.int, ChannelsRoles.HasMentions.int])
proc mention(self: ChannelsList, pubKey: string): string =
if self.status.chat.contacts.hasKey(pubKey):
return ens.userNameOrAlias(self.status.chat.contacts[pubKey])
generateAlias(pubKey)
proc renderInline(self: ChannelsList, elem: TextItem): string = proc renderInline(self: ChannelsList, elem: TextItem): string =
case elem.textType: case elem.textType:
of "mention": result = self.mention(elem.literal) of "mention": result = self.userNameOrAlias(elem.literal)
of "link": result = elem.destination of "link": result = elem.destination
else: result = elem.literal else: result = elem.literal