refactor(contacts): remove hack force refreshing images with a timestamp

Fixes #16814
status-im · Jan 10, 2025 · f82f0c1 · f82f0c1
1 parent 06d5499
commit f82f0c1
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 62 deletions.
diff --git a/src/app/global/utils.nim b/src/app/global/utils.nim
@@ -1,7 +1,6 @@
 import NimQml, strutils, uri, stew/shims/strformat, strutils, stint, httpclient
 import stew/byteutils
 import ./utils/qrcodegen
-import ./utils/time_utils
 
 # Services as instances shouldn't be used in this class, just some general/global procs
 import ../../app_service/common/conversion
@@ -143,9 +142,6 @@ QtObject:
       return value[2..^1]
     return value
 
-  proc addTimestampToURL*(self: Utils, url: string): string {.slot.} =
-    return time_utils.addTimestampToURL(url)
-
   proc isValidURL*(self: Utils, url: string): bool {.slot.} =
     var client = newHttpClient()
     defer: client.close()

diff --git a/src/app/global/utils/time_utils.nim b/src/app/global/utils/time_utils.nim
diff --git a/src/app/modules/main/chat_section/chat_content/messages/module.nim b/src/app/modules/main/chat_section/chat_content/messages/module.nim
@@ -16,7 +16,6 @@ import ../../../../../../app_service/service/mailservers/service as mailservers_
 import ../../../../../../app_service/service/shared_urls/service as shared_urls_service
 import ../../../../../../app_service/service/contacts/dto/contact_details
 import ../../../../../../app_service/common/types
-import ../../../../../global/utils as utils
 import ../../../../../global/global_singleton
 
 export io_interface
@@ -434,12 +433,11 @@ method getNumberOfPinnedMessages*(self: Module): int =
 method updateContactDetails*(self: Module, contactId: string) =
   let updatedContact = self.controller.getContactDetails(contactId)
 
-  let updatedSenderIcon = singletonInstance.utils().addTimestampToURL(updatedContact.icon)
   for item in self.view.model().modelContactUpdateIterator(contactId):
     if item.senderId == contactId:
       item.senderDisplayName = updatedContact.defaultDisplayName
       item.senderOptionalName = updatedContact.optionalName
-      item.senderIcon = updatedSenderIcon
+      item.senderIcon = updatedContact.icon
       item.senderColorHash = updatedContact.colorHash
       item.senderIsAdded = updatedContact.dto.added
       item.senderTrustStatus = updatedContact.dto.trustStatus
@@ -448,7 +446,7 @@ method updateContactDetails*(self: Module, contactId: string) =
     if item.quotedMessageAuthorDetails.dto.id == contactId:
       item.quotedMessageAuthorDetails = updatedContact
       item.quotedMessageAuthorDisplayName = updatedContact.defaultDisplayName
-      item.quotedMessageAuthorAvatar = updatedSenderIcon
+      item.quotedMessageAuthorAvatar = updatedContact.icon
 
     if item.messageContainsMentions and item.mentionedUsersPks.anyIt(it == contactId):
       let communityChats = self.controller.getCommunityDetails().chats

diff --git a/src/app/modules/main/chat_section/model.nim b/src/app/modules/main/chat_section/model.nim
@@ -466,9 +466,7 @@ QtObject:
       return
     self.items[index].name = name
 
-    var updatedIcon = singletonInstance.utils().addTimestampToURL(icon)
-
-    self.items[index].icon = updatedIcon
+    self.items[index].icon = icon
     self.items[index].trustStatus = trustStatus
     let modelIndex = self.createIndex(index, 0, nil)
     defer: modelIndex.delete

diff --git a/src/app/modules/shared_models/user_model.nim b/src/app/modules/shared_models/user_model.nim
@@ -332,10 +332,6 @@ QtObject:
       roles.add(ModelRole.IsUntrustworthy.int)
       roles.add(ModelRole.IsVerified.int)
 
-    # The image is actually a URL that doesn't change. We need to force refresh it just in case
-    roles.add(ModelRole.ThumbnailImage.int)
-    roles.add(ModelRole.LargeImage.int)
-
     if roles.len == 0:
       return
 

diff --git a/test/nim/utils_test.nim b/test/nim/utils_test.nim
diff --git a/ui/imports/shared/popups/CommonContactDialog.qml b/ui/imports/shared/popups/CommonContactDialog.qml
@@ -49,7 +49,7 @@ StatusDialog {
                 name: root.mainDisplayName
                 colorHash: contactDetails.colorHash
                 colorId: contactDetails.colorId
-                image: Utils.addTimestampToURL(contactDetails.largeImage)
+                image: contactDetails.largeImage
                 interactive: false
                 imageWidth: 60
                 imageHeight: 60

diff --git a/ui/imports/shared/views/ProfileDialogView.qml b/ui/imports/shared/views/ProfileDialogView.qml
@@ -217,7 +217,7 @@ Pane {
                 Layout.alignment: Qt.AlignTop
                 objectName: "ProfileDialog_userImage"
                 name: d.mainDisplayName
-                image: Utils.addTimestampToURL(contactDetails.largeImage)
+                image: contactDetails.largeImage
                 colorId: contactDetails.colorId
                 colorHash: contactDetails.colorHash
 

diff --git a/ui/imports/utils/Utils.qml b/ui/imports/utils/Utils.qml
@@ -949,8 +949,4 @@ QtObject {
 
         return ""
     }
-
-    function addTimestampToURL(url) {
-        return globalUtilsInst.addTimestampToURL(url)
-    }
 }
diff --git a/vendor/status-go b/vendor/status-go
+2 −0		images/main.go
+24 −0		images/main_test.go
+1 −1		protocol/messenger_contacts.go
+2 −2		server/server_media.go
+9 −0		server/server_test.go