Skip to content

Commit f9f9f52

Browse files
protomolequletulir
protomolequle
authored and
tulir
committed
all: replace all uses of old protobuf module
Closes #748
1 parent aab8ae6 commit f9f9f52

24 files changed

+322
-306
lines changed

‎appstate.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import (
1515

1616
"go.mau.fi/whatsmeow/appstate"
1717
waBinary "go.mau.fi/whatsmeow/binary"
18-
waProto "go.mau.fi/whatsmeow/binary/proto"
18+
"go.mau.fi/whatsmeow/proto/waE2E"
19+
"go.mau.fi/whatsmeow/proto/waServerSync"
1920
"go.mau.fi/whatsmeow/store"
2021
"go.mau.fi/whatsmeow/types"
2122
"go.mau.fi/whatsmeow/types/events"
@@ -109,10 +110,9 @@ func (cli *Client) filterContacts(mutations []appstate.Mutation) ([]appstate.Mut
109110
}
110111

111112
func (cli *Client) dispatchAppState(mutation appstate.Mutation, fullSync bool, emitOnFullSync bool) {
112-
113113
dispatchEvts := !fullSync || emitOnFullSync
114114

115-
if mutation.Operation != waProto.SyncdMutation_SET {
115+
if mutation.Operation != waServerSync.SyncdMutation_SET {
116116
return
117117
}
118118

@@ -270,7 +270,7 @@ func (cli *Client) dispatchAppState(mutation appstate.Mutation, fullSync bool, e
270270
}
271271
}
272272

273-
func (cli *Client) downloadExternalAppStateBlob(ref *waProto.ExternalBlobReference) ([]byte, error) {
273+
func (cli *Client) downloadExternalAppStateBlob(ref *waServerSync.ExternalBlobReference) ([]byte, error) {
274274
return cli.Download(ref)
275275
}
276276

@@ -318,16 +318,16 @@ func (cli *Client) requestMissingAppStateKeys(ctx context.Context, patches *apps
318318
}
319319

320320
func (cli *Client) requestAppStateKeys(ctx context.Context, rawKeyIDs [][]byte) {
321-
keyIDs := make([]*waProto.AppStateSyncKeyId, len(rawKeyIDs))
321+
keyIDs := make([]*waE2E.AppStateSyncKeyId, len(rawKeyIDs))
322322
debugKeyIDs := make([]string, len(rawKeyIDs))
323323
for i, keyID := range rawKeyIDs {
324-
keyIDs[i] = &waProto.AppStateSyncKeyId{KeyID: keyID}
324+
keyIDs[i] = &waE2E.AppStateSyncKeyId{KeyID: keyID}
325325
debugKeyIDs[i] = hex.EncodeToString(keyID)
326326
}
327-
msg := &waProto.Message{
328-
ProtocolMessage: &waProto.ProtocolMessage{
329-
Type: waProto.ProtocolMessage_APP_STATE_SYNC_KEY_REQUEST.Enum(),
330-
AppStateSyncKeyRequest: &waProto.AppStateSyncKeyRequest{
327+
msg := &waE2E.Message{
328+
ProtocolMessage: &waE2E.ProtocolMessage{
329+
Type: waE2E.ProtocolMessage_APP_STATE_SYNC_KEY_REQUEST.Enum(),
330+
AppStateSyncKeyRequest: &waE2E.AppStateSyncKeyRequest{
331331
KeyIDs: keyIDs,
332332
},
333333
},

‎appstate/decode.go

+24-23
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import (
1515
"google.golang.org/protobuf/proto"
1616

1717
waBinary "go.mau.fi/whatsmeow/binary"
18-
waProto "go.mau.fi/whatsmeow/binary/proto"
18+
"go.mau.fi/whatsmeow/proto/waServerSync"
19+
"go.mau.fi/whatsmeow/proto/waSyncAction"
1920
"go.mau.fi/whatsmeow/store"
2021
"go.mau.fi/whatsmeow/util/cbcutil"
2122
)
@@ -24,20 +25,20 @@ import (
2425
type PatchList struct {
2526
Name WAPatchName
2627
HasMorePatches bool
27-
Patches []*waProto.SyncdPatch
28-
Snapshot *waProto.SyncdSnapshot
28+
Patches []*waServerSync.SyncdPatch
29+
Snapshot *waServerSync.SyncdSnapshot
2930
}
3031

3132
// DownloadExternalFunc is a function that can download a blob of external app state patches.
32-
type DownloadExternalFunc func(*waProto.ExternalBlobReference) ([]byte, error)
33+
type DownloadExternalFunc func(*waServerSync.ExternalBlobReference) ([]byte, error)
3334

34-
func parseSnapshotInternal(collection *waBinary.Node, downloadExternal DownloadExternalFunc) (*waProto.SyncdSnapshot, error) {
35+
func parseSnapshotInternal(collection *waBinary.Node, downloadExternal DownloadExternalFunc) (*waServerSync.SyncdSnapshot, error) {
3536
snapshotNode := collection.GetChildByTag("snapshot")
3637
rawSnapshot, ok := snapshotNode.Content.([]byte)
3738
if snapshotNode.Tag != "snapshot" || !ok {
3839
return nil, nil
3940
}
40-
var snapshot waProto.ExternalBlobReference
41+
var snapshot waServerSync.ExternalBlobReference
4142
err := proto.Unmarshal(rawSnapshot, &snapshot)
4243
if err != nil {
4344
return nil, fmt.Errorf("failed to unmarshal snapshot: %w", err)
@@ -47,24 +48,24 @@ func parseSnapshotInternal(collection *waBinary.Node, downloadExternal DownloadE
4748
if err != nil {
4849
return nil, fmt.Errorf("failed to download external mutations: %w", err)
4950
}
50-
var downloaded waProto.SyncdSnapshot
51+
var downloaded waServerSync.SyncdSnapshot
5152
err = proto.Unmarshal(rawData, &downloaded)
5253
if err != nil {
5354
return nil, fmt.Errorf("failed to unmarshal mutation list: %w", err)
5455
}
5556
return &downloaded, nil
5657
}
5758

58-
func parsePatchListInternal(collection *waBinary.Node, downloadExternal DownloadExternalFunc) ([]*waProto.SyncdPatch, error) {
59+
func parsePatchListInternal(collection *waBinary.Node, downloadExternal DownloadExternalFunc) ([]*waServerSync.SyncdPatch, error) {
5960
patchesNode := collection.GetChildByTag("patches")
6061
patchNodes := patchesNode.GetChildren()
61-
patches := make([]*waProto.SyncdPatch, 0, len(patchNodes))
62+
patches := make([]*waServerSync.SyncdPatch, 0, len(patchNodes))
6263
for i, patchNode := range patchNodes {
6364
rawPatch, ok := patchNode.Content.([]byte)
6465
if patchNode.Tag != "patch" || !ok {
6566
continue
6667
}
67-
var patch waProto.SyncdPatch
68+
var patch waServerSync.SyncdPatch
6869
err := proto.Unmarshal(rawPatch, &patch)
6970
if err != nil {
7071
return nil, fmt.Errorf("failed to unmarshal patch #%d: %w", i+1, err)
@@ -75,7 +76,7 @@ func parsePatchListInternal(collection *waBinary.Node, downloadExternal Download
7576
if err != nil {
7677
return nil, fmt.Errorf("failed to download external mutations: %w", err)
7778
}
78-
var downloaded waProto.SyncdMutations
79+
var downloaded waServerSync.SyncdMutations
7980
err = proto.Unmarshal(rawData, &downloaded)
8081
if err != nil {
8182
return nil, fmt.Errorf("failed to unmarshal mutation list: %w", err)
@@ -116,9 +117,9 @@ type patchOutput struct {
116117
Mutations []Mutation
117118
}
118119

119-
func (proc *Processor) decodeMutations(mutations []*waProto.SyncdMutation, out *patchOutput, validateMACs bool) error {
120+
func (proc *Processor) decodeMutations(mutations []*waServerSync.SyncdMutation, out *patchOutput, validateMACs bool) error {
120121
for i, mutation := range mutations {
121-
keyID := mutation.GetRecord().GetKeyId().GetId()
122+
keyID := mutation.GetRecord().GetKeyID().GetID()
122123
keys, err := proc.getAppStateKey(keyID)
123124
if err != nil {
124125
return fmt.Errorf("failed to get key %X to decode mutation: %w", keyID, err)
@@ -136,7 +137,7 @@ func (proc *Processor) decodeMutations(mutations []*waProto.SyncdMutation, out *
136137
if err != nil {
137138
return fmt.Errorf("failed to decrypt mutation #%d: %w", i+1, err)
138139
}
139-
var syncAction waProto.SyncActionData
140+
var syncAction waSyncAction.SyncActionData
140141
err = proto.Unmarshal(plaintext, &syncAction)
141142
if err != nil {
142143
return fmt.Errorf("failed to unmarshal mutation #%d: %w", i+1, err)
@@ -153,9 +154,9 @@ func (proc *Processor) decodeMutations(mutations []*waProto.SyncdMutation, out *
153154
if err != nil {
154155
return fmt.Errorf("failed to unmarshal index of mutation #%d: %w", i+1, err)
155156
}
156-
if mutation.GetOperation() == waProto.SyncdMutation_REMOVE {
157+
if mutation.GetOperation() == waServerSync.SyncdMutation_REMOVE {
157158
out.RemovedMACs = append(out.RemovedMACs, indexMAC)
158-
} else if mutation.GetOperation() == waProto.SyncdMutation_SET {
159+
} else if mutation.GetOperation() == waServerSync.SyncdMutation_SET {
159160
out.AddedMACs = append(out.AddedMACs, store.AppStateMutationMAC{
160161
IndexMAC: indexMAC,
161162
ValueMAC: valueMAC,
@@ -200,14 +201,14 @@ func (proc *Processor) validateSnapshotMAC(name WAPatchName, currentState HashSt
200201
return
201202
}
202203

203-
func (proc *Processor) decodeSnapshot(name WAPatchName, ss *waProto.SyncdSnapshot, initialState HashState, validateMACs bool, newMutationsInput []Mutation) (newMutations []Mutation, currentState HashState, err error) {
204+
func (proc *Processor) decodeSnapshot(name WAPatchName, ss *waServerSync.SyncdSnapshot, initialState HashState, validateMACs bool, newMutationsInput []Mutation) (newMutations []Mutation, currentState HashState, err error) {
204205
currentState = initialState
205206
currentState.Version = ss.GetVersion().GetVersion()
206207

207-
encryptedMutations := make([]*waProto.SyncdMutation, len(ss.GetRecords()))
208+
encryptedMutations := make([]*waServerSync.SyncdMutation, len(ss.GetRecords()))
208209
for i, record := range ss.GetRecords() {
209-
encryptedMutations[i] = &waProto.SyncdMutation{
210-
Operation: waProto.SyncdMutation_SET.Enum(),
210+
encryptedMutations[i] = &waServerSync.SyncdMutation{
211+
Operation: waServerSync.SyncdMutation_SET.Enum(),
211212
Record: record,
212213
}
213214
}
@@ -225,7 +226,7 @@ func (proc *Processor) decodeSnapshot(name WAPatchName, ss *waProto.SyncdSnapsho
225226
}
226227

227228
if validateMACs {
228-
_, err = proc.validateSnapshotMAC(name, currentState, ss.GetKeyId().GetId(), ss.GetMac())
229+
_, err = proc.validateSnapshotMAC(name, currentState, ss.GetKeyID().GetID(), ss.GetMac())
229230
if err != nil {
230231
return
231232
}
@@ -286,12 +287,12 @@ func (proc *Processor) DecodePatches(list *PatchList, initialState HashState, va
286287

287288
if validateMACs {
288289
var keys ExpandedAppStateKeys
289-
keys, err = proc.validateSnapshotMAC(list.Name, currentState, patch.GetKeyId().GetId(), patch.GetSnapshotMac())
290+
keys, err = proc.validateSnapshotMAC(list.Name, currentState, patch.GetKeyID().GetID(), patch.GetSnapshotMac())
290291
if err != nil {
291292
return
292293
}
293294
patchMAC := generatePatchMAC(patch, list.Name, keys.PatchMAC, patch.GetVersion().GetVersion())
294-
if !bytes.Equal(patchMAC, patch.GetPatchMac()) {
295+
if !bytes.Equal(patchMAC, patch.GetPatchMAC()) {
295296
err = fmt.Errorf("failed to verify patch v%d: %w", version, ErrMismatchingPatchMAC)
296297
return
297298
}

‎appstate/encode.go

+34-32
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import (
88

99
"google.golang.org/protobuf/proto"
1010

11-
waProto "go.mau.fi/whatsmeow/binary/proto"
11+
"go.mau.fi/whatsmeow/proto/waCommon"
12+
"go.mau.fi/whatsmeow/proto/waServerSync"
13+
"go.mau.fi/whatsmeow/proto/waSyncAction"
1214
"go.mau.fi/whatsmeow/types"
1315
"go.mau.fi/whatsmeow/util/cbcutil"
1416
)
@@ -20,7 +22,7 @@ type MutationInfo struct {
2022
// Version is a static number that depends on the thing being mutated.
2123
Version int32
2224
// Value contains the data for the mutation.
23-
Value *waProto.SyncActionValue
25+
Value *waSyncAction.SyncActionValue
2426
}
2527

2628
// PatchInfo contains information about a patch to the app state.
@@ -48,8 +50,8 @@ func BuildMute(target types.JID, mute bool, muteDuration time.Duration) PatchInf
4850
Mutations: []MutationInfo{{
4951
Index: []string{IndexMute, target.String()},
5052
Version: 2,
51-
Value: &waProto.SyncActionValue{
52-
MuteAction: &waProto.MuteAction{
53+
Value: &waSyncAction.SyncActionValue{
54+
MuteAction: &waSyncAction.MuteAction{
5355
Muted: proto.Bool(mute),
5456
MuteEndTimestamp: muteEndTimestamp,
5557
},
@@ -62,8 +64,8 @@ func newPinMutationInfo(target types.JID, pin bool) MutationInfo {
6264
return MutationInfo{
6365
Index: []string{IndexPin, target.String()},
6466
Version: 5,
65-
Value: &waProto.SyncActionValue{
66-
PinAction: &waProto.PinAction{
67+
Value: &waSyncAction.SyncActionValue{
68+
PinAction: &waSyncAction.PinAction{
6769
Pinned: &pin,
6870
},
6971
},
@@ -85,17 +87,17 @@ func BuildPin(target types.JID, pin bool) PatchInfo {
8587
// The last message timestamp and last message key are optional and can be set to zero values (`time.Time{}` and `nil`).
8688
//
8789
// Archiving a chat will also unpin it automatically.
88-
func BuildArchive(target types.JID, archive bool, lastMessageTimestamp time.Time, lastMessageKey *waProto.MessageKey) PatchInfo {
90+
func BuildArchive(target types.JID, archive bool, lastMessageTimestamp time.Time, lastMessageKey *waCommon.MessageKey) PatchInfo {
8991
if lastMessageTimestamp.IsZero() {
9092
lastMessageTimestamp = time.Now()
9193
}
9294
archiveMutationInfo := MutationInfo{
9395
Index: []string{IndexArchive, target.String()},
9496
Version: 3,
95-
Value: &waProto.SyncActionValue{
96-
ArchiveChatAction: &waProto.ArchiveChatAction{
97+
Value: &waSyncAction.SyncActionValue{
98+
ArchiveChatAction: &waSyncAction.ArchiveChatAction{
9799
Archived: &archive,
98-
MessageRange: &waProto.SyncActionMessageRange{
100+
MessageRange: &waSyncAction.SyncActionMessageRange{
99101
LastMessageTimestamp: proto.Int64(lastMessageTimestamp.Unix()),
100102
// TODO set LastSystemMessageTimestamp?
101103
},
@@ -104,7 +106,7 @@ func BuildArchive(target types.JID, archive bool, lastMessageTimestamp time.Time
104106
}
105107

106108
if lastMessageKey != nil {
107-
archiveMutationInfo.Value.ArchiveChatAction.MessageRange.Messages = []*waProto.SyncActionMessage{{
109+
archiveMutationInfo.Value.ArchiveChatAction.MessageRange.Messages = []*waSyncAction.SyncActionMessage{{
108110
Key: lastMessageKey,
109111
Timestamp: proto.Int64(lastMessageTimestamp.Unix()),
110112
}}
@@ -127,8 +129,8 @@ func newLabelChatMutation(target types.JID, labelID string, labeled bool) Mutati
127129
return MutationInfo{
128130
Index: []string{IndexLabelAssociationChat, labelID, target.String()},
129131
Version: 3,
130-
Value: &waProto.SyncActionValue{
131-
LabelAssociationAction: &waProto.LabelAssociationAction{
132+
Value: &waSyncAction.SyncActionValue{
133+
LabelAssociationAction: &waSyncAction.LabelAssociationAction{
132134
Labeled: &labeled,
133135
},
134136
},
@@ -149,8 +151,8 @@ func newLabelMessageMutation(target types.JID, labelID, messageID string, labele
149151
return MutationInfo{
150152
Index: []string{IndexLabelAssociationMessage, labelID, target.String(), messageID, "0", "0"},
151153
Version: 3,
152-
Value: &waProto.SyncActionValue{
153-
LabelAssociationAction: &waProto.LabelAssociationAction{
154+
Value: &waSyncAction.SyncActionValue{
155+
LabelAssociationAction: &waSyncAction.LabelAssociationAction{
154156
Labeled: &labeled,
155157
},
156158
},
@@ -171,8 +173,8 @@ func newLabelEditMutation(labelID string, labelName string, labelColor int32, de
171173
return MutationInfo{
172174
Index: []string{IndexLabelEdit, labelID},
173175
Version: 3,
174-
Value: &waProto.SyncActionValue{
175-
LabelEditAction: &waProto.LabelEditAction{
176+
Value: &waSyncAction.SyncActionValue{
177+
LabelEditAction: &waSyncAction.LabelEditAction{
176178
Name: &labelName,
177179
Color: &labelColor,
178180
Deleted: &deleted,
@@ -195,8 +197,8 @@ func newSettingPushNameMutation(pushName string) MutationInfo {
195197
return MutationInfo{
196198
Index: []string{IndexSettingPushName},
197199
Version: 1,
198-
Value: &waProto.SyncActionValue{
199-
PushNameSetting: &waProto.PushNameSetting{
200+
Value: &waSyncAction.SyncActionValue{
201+
PushNameSetting: &waSyncAction.PushNameSetting{
200202
Name: &pushName,
201203
},
202204
},
@@ -217,8 +219,8 @@ func newStarMutation(targetJID, senderJID string, messageID types.MessageID, fro
217219
return MutationInfo{
218220
Index: []string{IndexStar, targetJID, messageID, fromMe, senderJID},
219221
Version: 2,
220-
Value: &waProto.SyncActionValue{
221-
StarAction: &waProto.StarAction{
222+
Value: &waSyncAction.SyncActionValue{
223+
StarAction: &waSyncAction.StarAction{
222224
Starred: &starred,
223225
},
224226
},
@@ -253,7 +255,7 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
253255
patchInfo.Timestamp = time.Now()
254256
}
255257

256-
mutations := make([]*waProto.SyncdMutation, 0, len(patchInfo.Mutations))
258+
mutations := make([]*waServerSync.SyncdMutation, 0, len(patchInfo.Mutations))
257259
for _, mutationInfo := range patchInfo.Mutations {
258260
mutationInfo.Value.Timestamp = proto.Int64(patchInfo.Timestamp.UnixMilli())
259261

@@ -262,7 +264,7 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
262264
return nil, fmt.Errorf("failed to marshal mutation index: %w", err)
263265
}
264266

265-
pbObj := &waProto.SyncActionData{
267+
pbObj := &waSyncAction.SyncActionData{
266268
Index: indexBytes,
267269
Value: mutationInfo.Value,
268270
Padding: []byte{},
@@ -279,15 +281,15 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
279281
return nil, fmt.Errorf("failed to encrypt mutation: %w", err)
280282
}
281283

282-
valueMac := generateContentMAC(waProto.SyncdMutation_SET, encryptedContent, keyID, keys.ValueMAC)
284+
valueMac := generateContentMAC(waServerSync.SyncdMutation_SET, encryptedContent, keyID, keys.ValueMAC)
283285
indexMac := concatAndHMAC(sha256.New, keys.Index, indexBytes)
284286

285-
mutations = append(mutations, &waProto.SyncdMutation{
286-
Operation: waProto.SyncdMutation_SET.Enum(),
287-
Record: &waProto.SyncdRecord{
288-
Index: &waProto.SyncdIndex{Blob: indexMac},
289-
Value: &waProto.SyncdValue{Blob: append(encryptedContent, valueMac...)},
290-
KeyID: &waProto.KeyId{ID: keyID},
287+
mutations = append(mutations, &waServerSync.SyncdMutation{
288+
Operation: waServerSync.SyncdMutation_SET.Enum(),
289+
Record: &waServerSync.SyncdRecord{
290+
Index: &waServerSync.SyncdIndex{Blob: indexMac},
291+
Value: &waServerSync.SyncdValue{Blob: append(encryptedContent, valueMac...)},
292+
KeyID: &waServerSync.KeyId{ID: keyID},
291293
},
292294
})
293295
}
@@ -304,9 +306,9 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
304306

305307
state.Version += 1
306308

307-
syncdPatch := &waProto.SyncdPatch{
309+
syncdPatch := &waServerSync.SyncdPatch{
308310
SnapshotMAC: state.generateSnapshotMAC(patchInfo.Type, keys.SnapshotMAC),
309-
KeyID: &waProto.KeyId{ID: keyID},
311+
KeyID: &waServerSync.KeyId{ID: keyID},
310312
Mutations: mutations,
311313
}
312314
syncdPatch.PatchMAC = generatePatchMAC(syncdPatch, patchInfo.Type, keys.PatchMAC, state.Version)

0 commit comments

Comments
 (0)