diff --git a/src/app/chat/view.nim b/src/app/chat/view.nim index f12da87ddc..3bd952d05a 100644 --- a/src/app/chat/view.nim +++ b/src/app/chat/view.nim @@ -1,6 +1,7 @@ import NimQml, Tables, json, sequtils, chronicles, times, re, sugar, strutils, os import ../../status/status +import ../../status/libstatus/accounts/constants import ../../status/accounts as status_accounts import ../../status/chat as status_chat import ../../status/messages as status_messages @@ -110,7 +111,7 @@ QtObject: proc sendImage*(self: ChatsView, imagePath: string) {.slot.} = let image = replace(imagePath, "file://", "") - let tmpImagePath = image_resizer(image, 2000) + let tmpImagePath = image_resizer(image, 2000, TMPDIR) self.status.chat.sendImage(self.activeChannel.id, tmpImagePath) removeFile(tmpImagePath) diff --git a/src/app/chat/views/message_list.nim b/src/app/chat/views/message_list.nim index 81e3f9d748..2bdb2eca74 100644 --- a/src/app/chat/views/message_list.nim +++ b/src/app/chat/views/message_list.nim @@ -131,7 +131,7 @@ QtObject: ChatMessageRoles.ResponseTo.int: "responseTo", ChatMessageRoles.Index.int: "index", ChatMessageRoles.ImageUrls.int: "imageUrls", - ChatMessageRoles.Timeout.int: "timeout" + ChatMessageRoles.Timeout.int: "timeout", ChatMessageRoles.Image.int: "image" }.toTable diff --git a/src/status/libstatus/accounts/constants.nim b/src/status/libstatus/accounts/constants.nim index e4dec336b5..e25e602d54 100644 --- a/src/status/libstatus/accounts/constants.nim +++ b/src/status/libstatus/accounts/constants.nim @@ -213,3 +213,4 @@ let clientDir = let DATADIR* = joinPath(clientDir, "data") & sep let KEYSTOREDIR* = joinPath(clientDir, "data", "keystore") & sep +let TMPDIR* = joinPath(clientDir, "tmp") & sep \ No newline at end of file diff --git a/vendor/DOtherSide b/vendor/DOtherSide index bdd3292573..e3baf29683 160000 --- a/vendor/DOtherSide +++ b/vendor/DOtherSide @@ -1 +1 @@ -Subproject commit bdd329257355588146087f77ecdc2b3f7ed3857c +Subproject commit e3baf29683f713ec418d3bb5c39fa043bd87f92f diff --git a/vendor/nimqml b/vendor/nimqml index 5befb45943..2f26af684a 160000 --- a/vendor/nimqml +++ b/vendor/nimqml @@ -1 +1 @@ -Subproject commit 5befb459437ea33e3e8c5bc7ac2ebc15c65a483e +Subproject commit 2f26af684a6e40e49e5577a4606ad64ab0ffa8dc