status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-17 00:56:39 +00:00
Code Issues Projects Releases Wiki Activity

fix(chat/messages): use timestamp instead of whisperTimestamp

Browse Source 
iterates: #8962
This commit is contained in:
Patryk Osmaczko 2023-01-16 19:29:30 +01:00 committed by osmaczko
parent 8644c841d4
commit b242624c47
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ proc createMessageItemFromDto(self: Module, message: MessageDto, chatDetails: Ch
message.image, message.image,
message.containsContactMentions(), message.containsContactMentions(),
message.seen, message.seen,
timestamp = message.whisperTimestamp, timestamp = message.timestamp,
clock = message.clock, clock = message.clock,
ContentType(message.contentType), ContentType(message.contentType),
message.messageType, message.messageType,

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

@ -228,7 +228,7 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
message.image, message.image,
message.containsContactMentions(), message.containsContactMentions(),
message.seen, message.seen,
timestamp = message.whisperTimestamp, timestamp = message.timestamp,
clock = message.clock, clock = message.clock,
message.contentType.ContentType, message.contentType.ContentType,
message.messageType, message.messageType,
@ -341,7 +341,7 @@ method messagesAdded*(self: Module, messages: seq[MessageDto]) =
message.image, message.image,
message.containsContactMentions(), message.containsContactMentions(),
message.seen, message.seen,
timestamp = message.whisperTimestamp, timestamp = message.timestamp,
clock = message.clock, clock = message.clock,
message.contentType.ContentType, message.contentType.ContentType,
message.messageType, message.messageType,
@ -638,7 +638,7 @@ method getMessageById*(self: Module, messageId: string): message_item.Item =
message.image, message.image,
message.containsContactMentions(), message.containsContactMentions(),
message.seen, message.seen,
timestamp = message.whisperTimestamp, timestamp = message.timestamp,
clock = message.clock, clock = message.clock,
message.contentType.ContentType, message.contentType.ContentType,
message.messageType, message.messageType,

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

@ -181,7 +181,7 @@ proc buildPinnedMessageItem(self: Module, messageId: string, actionInitiatedBy:
message.image, message.image,
message.containsContactMentions(), message.containsContactMentions(),
message.seen, message.seen,
timestamp = message.whisperTimestamp, timestamp = message.timestamp,
clock = message.clock, clock = message.clock,
message.contentType.ContentType, message.contentType.ContentType,
message.messageType, message.messageType,

2
src/app_service/service/message/dto/message.nim
View File

@ -85,7 +85,6 @@ type TransactionParameters* = object
type MessageDto* = object type MessageDto* = object
id*: string id*: string
communityId*: string communityId*: string
whisperTimestamp*: int64
`from`*: string `from`*: string
alias*: string alias*: string
seen*: bool seen*: bool
@ -205,7 +204,6 @@ proc toMessageDto*(jsonObj: JsonNode): MessageDto =
result = MessageDto() result = MessageDto()
discard jsonObj.getProp("id", result.id) discard jsonObj.getProp("id", result.id)
discard jsonObj.getProp("communityId", result.communityId) discard jsonObj.getProp("communityId", result.communityId)
discard jsonObj.getProp("whisperTimestamp", result.whisperTimestamp)
discard jsonObj.getProp("from", result.from) discard jsonObj.getProp("from", result.from)
discard jsonObj.getProp("alias", result.alias) discard jsonObj.getProp("alias", result.alias)
discard jsonObj.getProp("seen", result.seen) discard jsonObj.getProp("seen", result.seen)