2 files changed, 19 insertions, 15 deletions
diff --git a/bridge/whatsappmulti/helpers.go b/bridge/whatsappmulti/helpers.go
index c3c9d018..75d9f5fd 100644
--- a/bridge/whatsappmulti/helpers.go
+++ b/bridge/whatsappmulti/helpers.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"strings"
 
+	"go.mau.fi/whatsmeow"
 	"go.mau.fi/whatsmeow/store"
 	"go.mau.fi/whatsmeow/store/sqlstore"
 	"go.mau.fi/whatsmeow/types"
@@ -18,7 +19,7 @@ type ProfilePicInfo struct {
 	Status int16  `json:"status"`
 }
 
-func (b *Bwhatsapp) reloadContacts(){
+func (b *Bwhatsapp) reloadContacts() {
 	if _, err := b.wc.Store.Contacts.GetAllContacts(); err != nil {
 		b.Log.Errorf("error on update of contacts: %v", err)
 	}
@@ -48,7 +49,7 @@ func (b *Bwhatsapp) getSenderName(info types.MessageInfo) string {
 	if exists && sender.FullName != "" {
 		return sender.FullName
 	}
-	
+
 	if info.PushName != "" {
 		return info.PushName
 	}
@@ -56,7 +57,7 @@ func (b *Bwhatsapp) getSenderName(info types.MessageInfo) string {
 	if exists && sender.FirstName != "" {
 		return sender.FirstName
 	}
-	
+
 	return "Someone"
 }
 
@@ -71,11 +72,11 @@ func (b *Bwhatsapp) getSenderNotify(senderJid types.JID) string {
 	if !exists {
 		return "someone"
 	}
-	
+
 	if exists && sender.FullName != "" {
 		return sender.FullName
 	}
-	
+
 	if exists && sender.PushName != "" {
 		return sender.PushName
 	}
@@ -83,13 +84,16 @@ func (b *Bwhatsapp) getSenderNotify(senderJid types.JID) string {
 	if exists && sender.FirstName != "" {
 		return sender.FirstName
 	}
-	
+
 	return "someone"
 }
 
 func (b *Bwhatsapp) GetProfilePicThumb(jid string) (*types.ProfilePictureInfo, error) {
 	pjid, _ := types.ParseJID(jid)
-	info, err := b.wc.GetProfilePictureInfo(pjid, true, "")
+
+	info, err := b.wc.GetProfilePictureInfo(pjid, &whatsmeow.GetProfilePictureParams{
+		Preview: true,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to get avatar: %v", err)
 	}
diff --git a/bridge/whatsappmulti/whatsapp.go b/bridge/whatsappmulti/whatsapp.go
index 686396d3..76e4ae46 100644
--- a/bridge/whatsappmulti/whatsapp.go
+++ b/bridge/whatsappmulti/whatsapp.go
@@ -238,7 +238,7 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
 	b.Log.Debugf("=> Sending %#v as a document", msg)
 
 	ID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
+	_, err = b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
 
 	return ID, err
 }
@@ -272,7 +272,7 @@ func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (strin
 	b.Log.Debugf("=> Sending %#v as an image", msg)
 
 	ID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
+	_, err = b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
 
 	return ID, err
 }
@@ -305,7 +305,7 @@ func (b *Bwhatsapp) PostVideoMessage(msg config.Message, filetype string) (strin
 	b.Log.Debugf("=> Sending %#v as a video", msg)
 
 	ID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
+	_, err = b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
 
 	return ID, err
 }
@@ -335,14 +335,14 @@ func (b *Bwhatsapp) PostAudioMessage(msg config.Message, filetype string) (strin
 	b.Log.Debugf("=> Sending %#v as audio", msg)
 
 	ID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
+	_, err = b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
 
 	var captionMessage proto.Message
 	caption := msg.Username + fi.Comment + "\u2B06" // the char on the end is upwards arrow emoji
 	captionMessage.Conversation = &caption
 
 	captionID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, captionID, &captionMessage)
+	_, err = b.wc.SendMessage(context.TODO(), groupJID, &captionMessage, whatsmeow.SendRequestExtra{ID: captionID})
 
 	return ID, err
 }
@@ -389,10 +389,10 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) {
 		switch filetype {
 		case "image/jpeg", "image/png", "image/gif":
 			return b.PostImageMessage(msg, filetype)
-		case "video/mp4", "video/3gpp": //TODO: Check if codecs are supported by WA
+		case "video/mp4", "video/3gpp": // TODO: Check if codecs are supported by WA
 			return b.PostVideoMessage(msg, filetype)
 		case "audio/ogg":
-			return b.PostAudioMessage(msg, "audio/ogg; codecs=opus") //TODO: Detect if it is actually OPUS
+			return b.PostAudioMessage(msg, "audio/ogg; codecs=opus") // TODO: Detect if it is actually OPUS
 		case "audio/aac", "audio/mp4", "audio/amr", "audio/mpeg":
 			return b.PostAudioMessage(msg, filetype)
 		default:
@@ -407,7 +407,7 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) {
 	message.Conversation = &text
 
 	ID := whatsmeow.GenerateMessageID()
-	_, err := b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
+	_, err := b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
 
 	return ID, err
 }