From 493c49cde5b5d51f3dd9bc6b1a925b0fd2a1c52f Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Sat, 25 Jun 2022 16:58:15 -0400 Subject: Same robust file retrieval for calculating avatar SHA1 and Base64 --- xmpp/handlers.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'xmpp') diff --git a/xmpp/handlers.go b/xmpp/handlers.go index 4f048fb..ee1db21 100644 --- a/xmpp/handlers.go +++ b/xmpp/handlers.go @@ -5,7 +5,6 @@ import ( "encoding/base64" "github.com/pkg/errors" "io" - "os" "strconv" "strings" @@ -252,17 +251,7 @@ func handleGetVcardTempIq(s xmpp.Sender, iq *stanza.IQ) { vcard.Fn.Text = chat.Title if chat.Photo != nil { - path := chat.Photo.Small.Local.Path - file, err := os.Open(path) - // obtain the photo right now if still not downloaded - if err != nil && !chat.Photo.Small.Local.IsDownloadingCompleted { - tdFile, tdErr := session.DownloadFile(chat.Photo.Small.Id, 32, true) - if tdErr == nil { - path = tdFile.Local.Path - file, err = os.Open(path) - } - } - + file, path, err := session.OpenPhotoFile(chat.Photo.Small, 32) if err == nil { defer file.Close() -- cgit v1.2.3