update whatsmeow to 20240603 from tulir/whatsmeow@64bc969

d99kris · Jun 22, 2024 · 354b0b7 · 354b0b7
1 parent 1f3c82e
commit 354b0b7
Show file tree

Hide file tree

Showing 156 changed files with 42,920 additions and 64,068 deletions.
diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "4.88"
+#define NCHAT_VERSION "4.89"
diff --git a/lib/wmchat/go/ext/whatsmeow/appstate.go b/lib/wmchat/go/ext/whatsmeow/appstate.go
@@ -318,14 +318,14 @@ func (cli *Client) requestAppStateKeys(ctx context.Context, rawKeyIDs [][]byte)
 	keyIDs := make([]*waProto.AppStateSyncKeyId, len(rawKeyIDs))
 	debugKeyIDs := make([]string, len(rawKeyIDs))
 	for i, keyID := range rawKeyIDs {
-		keyIDs[i] = &waProto.AppStateSyncKeyId{KeyId: keyID}
+		keyIDs[i] = &waProto.AppStateSyncKeyId{KeyID: keyID}
 		debugKeyIDs[i] = hex.EncodeToString(keyID)
 	}
 	msg := &waProto.Message{
 		ProtocolMessage: &waProto.ProtocolMessage{
 			Type: waProto.ProtocolMessage_APP_STATE_SYNC_KEY_REQUEST.Enum(),
 			AppStateSyncKeyRequest: &waProto.AppStateSyncKeyRequest{
-				KeyIds: keyIDs,
+				KeyIDs: keyIDs,
 			},
 		},
 	}

diff --git a/lib/wmchat/go/ext/whatsmeow/appstate/encode.go b/lib/wmchat/go/ext/whatsmeow/appstate/encode.go
@@ -257,7 +257,7 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
 			Record: &waProto.SyncdRecord{
 				Index: &waProto.SyncdIndex{Blob: indexMac},
 				Value: &waProto.SyncdValue{Blob: append(encryptedContent, valueMac...)},
-				KeyId: &waProto.KeyId{Id: keyID},
+				KeyID: &waProto.KeyId{ID: keyID},
 			},
 		})
 	}
@@ -275,11 +275,11 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
 	state.Version += 1
 
 	syncdPatch := &waProto.SyncdPatch{
-		SnapshotMac: state.generateSnapshotMAC(patchInfo.Type, keys.SnapshotMAC),
-		KeyId:       &waProto.KeyId{Id: keyID},
+		SnapshotMAC: state.generateSnapshotMAC(patchInfo.Type, keys.SnapshotMAC),
+		KeyID:       &waProto.KeyId{ID: keyID},
 		Mutations:   mutations,
 	}
-	syncdPatch.PatchMac = generatePatchMAC(syncdPatch, patchInfo.Type, keys.PatchMAC, state.Version)
+	syncdPatch.PatchMAC = generatePatchMAC(syncdPatch, patchInfo.Type, keys.PatchMAC, state.Version)
 
 	result, err := proto.Marshal(syncdPatch)
 	if err != nil {

diff --git a/lib/wmchat/go/ext/whatsmeow/armadillomessage.go b/lib/wmchat/go/ext/whatsmeow/armadillomessage.go
@@ -11,10 +11,10 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"go.mau.fi/whatsmeow/binary/armadillo"
-	"go.mau.fi/whatsmeow/binary/armadillo/waCommon"
-	"go.mau.fi/whatsmeow/binary/armadillo/waMsgApplication"
-	"go.mau.fi/whatsmeow/binary/armadillo/waMsgTransport"
+	armadillo "go.mau.fi/whatsmeow/proto"
+	"go.mau.fi/whatsmeow/proto/waCommon"
+	"go.mau.fi/whatsmeow/proto/waMsgApplication"
+	"go.mau.fi/whatsmeow/proto/waMsgTransport"
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
 )

diff --git a/lib/wmchat/go/ext/whatsmeow/binary/armadillo/.gitignore b/lib/wmchat/go/ext/whatsmeow/binary/armadillo/.gitignore
diff --git a/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waAdv/WAAdv.proto b/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waAdv/WAAdv.proto
diff --git a/...go/ext/whatsmeow/binary/armadillo/waArmadilloBackupMessage/WAArmadilloBackupMessage.proto b/...go/ext/whatsmeow/binary/armadillo/waArmadilloBackupMessage/WAArmadilloBackupMessage.proto
diff --git a/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waArmadilloICDC/WAArmadilloICDC.proto b/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waArmadilloICDC/WAArmadilloICDC.proto
diff --git a/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waCert/WACert.proto b/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waCert/WACert.proto
diff --git a/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waCommon/WACommon.proto b/lib/wmchat/go/ext/whatsmeow/binary/armadillo/waCommon/WACommon.proto