signalmeow: update protobufs

Author: tulir

pkg/msgconv/from-signal-backup.go

@@ -189,16 +189,16 @@ func backupToSignalAttachment(
 	atts map[uuid.UUID]*backuppb.FilePointer_BackupLocator,
 ) *signalpb.AttachmentPointer {
 	sig := &signalpb.AttachmentPointer{
-		ContentType:             fp.ContentType,
-		IncrementalMac:          fp.IncrementalMac,
-		IncrementalMacChunkSize: fp.IncrementalMacChunkSize,
-		FileName:                fp.FileName,
-		Flags:                   ptr.NonZero(uint32(backupToSignalAttachmentFlag(flag))),
-		Width:                   fp.Width,
-		Height:                  fp.Height,
-		Caption:                 nil, // is this field deprecated or something?
-		BlurHash:                fp.BlurHash,
-		Uuid:                    clientUUID[:],
+		//IncrementalMacChunkSize: fp.IncrementalMacChunkSize,
+		ContentType:    fp.ContentType,
+		IncrementalMac: fp.IncrementalMac,
+		FileName:       fp.FileName,
+		Flags:          ptr.NonZero(uint32(backupToSignalAttachmentFlag(flag))),
+		Width:          fp.Width,
+		Height:         fp.Height,
+		Caption:        nil, // is this field deprecated or something?
+		BlurHash:       fp.BlurHash,
+		ClientUuid:     clientUUID[:],
 	}
 	switch loc := fp.Locator.(type) {
 	case *backuppb.FilePointer_AttachmentLocator_:

pkg/msgconv/from-signal.go

@@ -465,10 +465,10 @@ func (mc *MessageConverter) downloadSignalLongText(ctx context.Context, att *sig
 
 func (mc *MessageConverter) downloadAttachment(ctx context.Context, att *signalpb.AttachmentPointer, attMap AttachmentMap) ([]byte, error) {
 	if att.AttachmentIdentifier == nil {
-		if len(att.GetUuid()) != 16 {
+		if len(att.GetClientUuid()) != 16 {
 			return nil, fmt.Errorf("no attachment identifier found")
 		}
-		target, ok := attMap[uuid.UUID(att.GetUuid())]
+		target, ok := attMap[uuid.UUID(att.GetClientUuid())]
 		if !ok {
 			return nil, fmt.Errorf("no attachment identifier and attachment not found in map")
 		} else if target == nil {

pkg/signalmeow/contact.go

@@ -30,7 +30,6 @@ import (
 	"github.com/rs/zerolog"
 	"google.golang.org/protobuf/proto"
 
-	"go.mau.fi/mautrix-signal/pkg/libsignalgo"
 	signalpb "go.mau.fi/mautrix-signal/pkg/signalmeow/protobuf"
 	"go.mau.fi/mautrix-signal/pkg/signalmeow/types"
 )
@@ -49,10 +48,10 @@ func (cli *Client) StoreContactDetailsAsContact(ctx context.Context, contactDeta
 			recipient.E164 = contactDetails.GetNumber()
 		}
 		recipient.ContactName = contactDetails.GetName()
-		if profileKeyString := contactDetails.GetProfileKey(); profileKeyString != nil {
-			profileKey := libsignalgo.ProfileKey(profileKeyString)
-			recipient.Profile.Key = profileKey
-		}
+		//if profileKeyString := contactDetails.GetProfileKey(); profileKeyString != nil {
+		//	profileKey := libsignalgo.ProfileKey(profileKeyString)
+		//	recipient.Profile.Key = profileKey
+		//}
 		if avatar != nil && *avatar != nil && len(*avatar) > 0 {
 			rawHash := sha256.Sum256(*avatar)
 			avatarHash := hex.EncodeToString(rawHash[:])