Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add BuildContact and CRUD functionality for contacts #749

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add BuildContact and CRUD functionality for contacts #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e804f1
Add BuildContact and CRUD functionality for contacts
fourjr Feb 17, 2025
fe33c47
Fix bug where contact remove events were being ignored
fourjr Feb 17, 2025
3637734
Change syntax to RemoveContact
fourjr Feb 19, 2025
c05ea7b
Fix a race condition where mutation.Action is nil and causes a panic …
fourjr Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (cli *Client) filterContacts(mutations []appstate.Mutation) ([]appstate.Mut
func (cli *Client) dispatchAppState(mutation appstate.Mutation, fullSync bool, emitOnFullSync bool) {
dispatchEvts := !fullSync || emitOnFullSync

if mutation.Operation != waServerSync.SyncdMutation_SET {
if (mutation.Action != nil && mutation.Action.ContactAction == nil) && mutation.Operation != waServerSync.SyncdMutation_SET {
return
}

Expand Down
59 changes: 50 additions & 9 deletions appstate/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ type PatchInfo struct {
Timestamp time.Time
// Type is the app state type being mutated.
Type WAPatchName
// Operation is SET / REMOVE
Operation waServerSync.SyncdMutation_SyncdOperation
// Mutations contains the individual mutations to apply to the app state in this patch.
Mutations []MutationInfo
}
Expand All @@ -46,7 +48,8 @@ func BuildMute(target types.JID, mute bool, muteDuration time.Duration) PatchInf
}

return PatchInfo{
Type: WAPatchRegularHigh,
Type: WAPatchRegularHigh,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{{
Index: []string{IndexMute, target.String()},
Version: 2,
Expand All @@ -60,6 +63,37 @@ func BuildMute(target types.JID, mute bool, muteDuration time.Duration) PatchInf
}
}

func BuildContact(target types.JID, fullName string) PatchInfo {
Copy link
Contributor

@devlikepro devlikepro Mar 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func BuildContact(target types.JID, fullName string) PatchInfo {
func BuildAddContact(target types.JID, fullName string) PatchInfo {

OR

Suggested change
func BuildContact(target types.JID, fullName string) PatchInfo {
func BuildAddContactPatch(target types.JID, fullName string) PatchInfo {

return PatchInfo{
Type: WAPatchCriticalUnblockLow,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{{
Index: []string{IndexContact, target.String()},
Version: 2,
Value: &waSyncAction.SyncActionValue{
ContactAction: &waSyncAction.ContactAction{
FullName: &fullName,
SaveOnPrimaryAddressbook: proto.Bool(true),
},
},
}},
}
}

func RemoveContact(target types.JID) PatchInfo {
Copy link
Contributor

@devlikepro devlikepro Mar 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func RemoveContact(target types.JID) PatchInfo {
func BuildRemoveContact(target types.JID) PatchInfo {

OR

Suggested change
func RemoveContact(target types.JID) PatchInfo {
func BuildRemoveContactPatch(target types.JID) PatchInfo {

return PatchInfo{
Type: WAPatchCriticalUnblockLow,
Operation: waServerSync.SyncdMutation_REMOVE,
Mutations: []MutationInfo{{
Index: []string{IndexContact, target.String()},
Version: 2,
Value: &waSyncAction.SyncActionValue{
ContactAction: &waSyncAction.ContactAction{},
},
}},
}
}

func newPinMutationInfo(target types.JID, pin bool) MutationInfo {
return MutationInfo{
Index: []string{IndexPin, target.String()},
Expand All @@ -75,7 +109,8 @@ func newPinMutationInfo(target types.JID, pin bool) MutationInfo {
// BuildPin builds an app state patch for pinning or unpinning a chat.
func BuildPin(target types.JID, pin bool) PatchInfo {
return PatchInfo{
Type: WAPatchRegularLow,
Type: WAPatchRegularLow,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{
newPinMutationInfo(target, pin),
},
Expand Down Expand Up @@ -119,6 +154,7 @@ func BuildArchive(target types.JID, archive bool, lastMessageTimestamp time.Time

result := PatchInfo{
Type: WAPatchRegularLow,
Operation: waServerSync.SyncdMutation_SET,
Mutations: mutations,
}

Expand All @@ -140,7 +176,8 @@ func newLabelChatMutation(target types.JID, labelID string, labeled bool) Mutati
// BuildLabelChat builds an app state patch for labeling or un(labeling) a chat.
func BuildLabelChat(target types.JID, labelID string, labeled bool) PatchInfo {
return PatchInfo{
Type: WAPatchRegular,
Type: WAPatchRegular,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{
newLabelChatMutation(target, labelID, labeled),
},
Expand All @@ -162,7 +199,8 @@ func newLabelMessageMutation(target types.JID, labelID, messageID string, labele
// BuildLabelMessage builds an app state patch for labeling or un(labeling) a message.
func BuildLabelMessage(target types.JID, labelID, messageID string, labeled bool) PatchInfo {
return PatchInfo{
Type: WAPatchRegular,
Type: WAPatchRegular,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{
newLabelMessageMutation(target, labelID, messageID, labeled),
},
Expand All @@ -186,7 +224,8 @@ func newLabelEditMutation(labelID string, labelName string, labelColor int32, de
// BuildLabelEdit builds an app state patch for editing a label.
func BuildLabelEdit(labelID string, labelName string, labelColor int32, deleted bool) PatchInfo {
return PatchInfo{
Type: WAPatchRegular,
Type: WAPatchRegular,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{
newLabelEditMutation(labelID, labelName, labelColor, deleted),
},
Expand All @@ -208,7 +247,8 @@ func newSettingPushNameMutation(pushName string) MutationInfo {
// BuildSettingPushName builds an app state patch for setting the push name.
func BuildSettingPushName(pushName string) PatchInfo {
return PatchInfo{
Type: WAPatchCriticalBlock,
Type: WAPatchCriticalBlock,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{
newSettingPushNameMutation(pushName),
},
Expand Down Expand Up @@ -238,7 +278,8 @@ func BuildStar(target, sender types.JID, messageID types.MessageID, fromMe, star
senderJID = "0"
}
return PatchInfo{
Type: WAPatchRegularHigh,
Type: WAPatchRegularHigh,
Operation: waServerSync.SyncdMutation_SET,
Mutations: []MutationInfo{
newStarMutation(targetJID, senderJID, messageID, isFromMe, starred),
},
Expand Down Expand Up @@ -281,11 +322,11 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
return nil, fmt.Errorf("failed to encrypt mutation: %w", err)
}

valueMac := generateContentMAC(waServerSync.SyncdMutation_SET, encryptedContent, keyID, keys.ValueMAC)
valueMac := generateContentMAC(patchInfo.Operation, encryptedContent, keyID, keys.ValueMAC)
indexMac := concatAndHMAC(sha256.New, keys.Index, indexBytes)

mutations = append(mutations, &waServerSync.SyncdMutation{
Operation: waServerSync.SyncdMutation_SET.Enum(),
Operation: patchInfo.Operation.Enum(),
Record: &waServerSync.SyncdRecord{
Index: &waServerSync.SyncdIndex{Blob: indexMac},
Value: &waServerSync.SyncdValue{Blob: append(encryptedContent, valueMac...)},
Expand Down