slidge-whatsapp 0.2.5__cp312-cp312-manylinux_2_36_aarch64.whl → 0.2.6__cp312-cp312-manylinux_2_36_aarch64.whl

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/sendfb.go

@@ -197,9 +197,9 @@ func (cli *Client) SendFBMessage(
 	if len(expectedPHash) > 0 && phash != expectedPHash {
 		cli.Log.Warnf("Server returned different participant list hash when sending to %s. Some devices may not have received the message.", to)
 		// TODO also invalidate device list caches
-		cli.groupParticipantsCacheLock.Lock()
-		delete(cli.groupParticipantsCache, to)
-		cli.groupParticipantsCacheLock.Unlock()
+		cli.groupCacheLock.Lock()
+		delete(cli.groupCache, to)
+		cli.groupCacheLock.Unlock()
 	}
 	return
 }
@@ -214,11 +214,11 @@ func (cli *Client) sendGroupV3(
 	frankingTag []byte,
 	timings *MessageDebugTimings,
 ) (string, []byte, error) {
-	var participants []types.JID
+	var groupMeta *groupMetaCache
 	var err error
 	start := time.Now()
 	if to.Server == types.GroupServer {
-		participants, err = cli.getGroupMembers(ctx, to)
+		groupMeta, err = cli.getCachedGroupData(ctx, to)
 		if err != nil {
 			return "", nil, fmt.Errorf("failed to get group members: %w", err)
 		}
@@ -228,7 +228,7 @@ func (cli *Client) sendGroupV3(
 	start = time.Now()
 	builder := groups.NewGroupSessionBuilder(cli.Store, pbSerializer)
 	senderKeyName := protocol.NewSenderKeyName(to.String(), ownID.SignalAddress())
-	signalSKDMessage, err := builder.Create(senderKeyName)
+	signalSKDMessage, err := builder.Create(ctx, senderKeyName)
 	if err != nil {
 		return "", nil, fmt.Errorf("failed to create sender key distribution message to send %s to %s: %w", id, to, err)
 	}
@@ -265,14 +265,16 @@ func (cli *Client) sendGroupV3(
 	if err != nil {
 		return "", nil, fmt.Errorf("failed to marshal message transport: %w", err)
 	}
-	encrypted, err := cipher.Encrypt(plaintext)
+	encrypted, err := cipher.Encrypt(ctx, plaintext)
 	if err != nil {
 		return "", nil, fmt.Errorf("failed to encrypt group message to send %s to %s: %w", id, to, err)
 	}
 	ciphertext := encrypted.SignedSerialize()
 	timings.GroupEncrypt = time.Since(start)
 
-	node, allDevices, err := cli.prepareMessageNodeV3(ctx, to, ownID, id, nil, skdm, msgAttrs, frankingTag, participants, timings)
+	node, allDevices, err := cli.prepareMessageNodeV3(
+		ctx, to, ownID, id, nil, skdm, msgAttrs, frankingTag, groupMeta.Members, timings,
+	)
 	if err != nil {
 		return "", nil, err
 	}
@@ -526,11 +528,12 @@ func (cli *Client) encryptMessageForDevicesV3(
 			}
 			dsmForDevice = dsm
 		}
-		encrypted, err := cli.encryptMessageForDeviceAndWrapV3(payload, skdm, dsmForDevice, jid, nil, encAttrs)
+		encrypted, err := cli.encryptMessageForDeviceAndWrapV3(ctx, payload, skdm, dsmForDevice, jid, nil, encAttrs)
 		if errors.Is(err, ErrNoSession) {
 			retryDevices = append(retryDevices, jid)
 			continue
 		} else if err != nil {
+			// TODO return these errors if it's a fatal one (like context cancellation or database)
 			cli.Log.Warnf("Failed to encrypt %s for %s: %v", id, jid, err)
 			continue
 		}
@@ -551,8 +554,9 @@ func (cli *Client) encryptMessageForDevicesV3(
 				if jid.User == ownID.User {
 					dsmForDevice = dsm
 				}
-				encrypted, err := cli.encryptMessageForDeviceAndWrapV3(payload, skdm, dsmForDevice, jid, resp.bundle, encAttrs)
+				encrypted, err := cli.encryptMessageForDeviceAndWrapV3(ctx, payload, skdm, dsmForDevice, jid, resp.bundle, encAttrs)
 				if err != nil {
+					// TODO return these errors if it's a fatal one (like context cancellation or database)
 					cli.Log.Warnf("Failed to encrypt %s for %s (retry): %v", id, jid, err)
 					continue
 				}
@@ -564,6 +568,7 @@ func (cli *Client) encryptMessageForDevicesV3(
 }
 
 func (cli *Client) encryptMessageForDeviceAndWrapV3(
+	ctx context.Context,
 	payload *waMsgTransport.MessageTransport_Payload,
 	skdm *waMsgTransport.MessageTransport_Protocol_Ancillary_SenderKeyDistributionMessage,
 	dsm *waMsgTransport.MessageTransport_Protocol_Integral_DeviceSentMessage,
@@ -571,7 +576,7 @@ func (cli *Client) encryptMessageForDeviceAndWrapV3(
 	bundle *prekey.Bundle,
 	encAttrs waBinary.Attrs,
 ) (*waBinary.Node, error) {
-	node, err := cli.encryptMessageForDeviceV3(payload, skdm, dsm, to, bundle, encAttrs)
+	node, err := cli.encryptMessageForDeviceV3(ctx, payload, skdm, dsm, to, bundle, encAttrs)
 	if err != nil {
 		return nil, err
 	}
@@ -583,6 +588,7 @@ func (cli *Client) encryptMessageForDeviceAndWrapV3(
 }
 
 func (cli *Client) encryptMessageForDeviceV3(
+	ctx context.Context,
 	payload *waMsgTransport.MessageTransport_Payload,
 	skdm *waMsgTransport.MessageTransport_Protocol_Ancillary_SenderKeyDistributionMessage,
 	dsm *waMsgTransport.MessageTransport_Protocol_Integral_DeviceSentMessage,
@@ -593,16 +599,21 @@ func (cli *Client) encryptMessageForDeviceV3(
 	builder := session.NewBuilderFromSignal(cli.Store, to.SignalAddress(), pbSerializer)
 	if bundle != nil {
 		cli.Log.Debugf("Processing prekey bundle for %s", to)
-		err := builder.ProcessBundle(bundle)
+		err := builder.ProcessBundle(ctx, bundle)
 		if cli.AutoTrustIdentity && errors.Is(err, signalerror.ErrUntrustedIdentity) {
 			cli.Log.Warnf("Got %v error while trying to process prekey bundle for %s, clearing stored identity and retrying", err, to)
-			cli.clearUntrustedIdentity(to)
-			err = builder.ProcessBundle(bundle)
+			err = cli.clearUntrustedIdentity(ctx, to)
+			if err != nil {
+				return nil, fmt.Errorf("failed to clear untrusted identity: %w", err)
+			}
+			err = builder.ProcessBundle(ctx, bundle)
 		}
 		if err != nil {
 			return nil, fmt.Errorf("failed to process prekey bundle: %w", err)
 		}
-	} else if !cli.Store.ContainsSession(to.SignalAddress()) {
+	} else if contains, err := cli.Store.ContainsSession(ctx, to.SignalAddress()); err != nil {
+		return nil, err
+	} else if !contains {
 		return nil, ErrNoSession
 	}
 	cipher := session.NewCipher(builder, to.SignalAddress())
@@ -624,7 +635,7 @@ func (cli *Client) encryptMessageForDeviceV3(
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal message transport: %w", err)
 	}
-	ciphertext, err := cipher.Encrypt(plaintext)
+	ciphertext, err := cipher.Encrypt(ctx, plaintext)
 	if err != nil {
 		return nil, fmt.Errorf("cipher encryption failed: %w", err)
 	}

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/clientpayload.go

@@ -76,7 +76,7 @@ func (vc WAVersionContainer) ProtoAppVersion() *waWa6.ClientPayload_UserAgent_Ap
 }
 
 // waVersion is the WhatsApp web client version
-var waVersion = WAVersionContainer{2, 3000, 1020322842}
+var waVersion = WAVersionContainer{2, 3000, 1022781640}
 
 // waVersionHash is the md5 hash of a dot-separated waVersion
 var waVersionHash [16]byte
@@ -162,6 +162,7 @@ func (device *Device) getRegistrationPayload() *waWa6.ClientPayload {
 		DeviceProps: deviceProps,
 	}
 	payload.Passive = proto.Bool(false)
+	payload.Pull = proto.Bool(false)
 	return payload
 }
 
@@ -170,6 +171,7 @@ func (device *Device) getLoginPayload() *waWa6.ClientPayload {
 	payload.Username = proto.Uint64(device.ID.UserInt())
 	payload.Device = proto.Uint32(uint32(device.ID.Device))
 	payload.Passive = proto.Bool(true)
+	payload.Pull = proto.Bool(true)
 	return payload
 }
 

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/noop.go

@@ -7,6 +7,7 @@
 package store
 
 import (
+	"context"
 	"errors"
 	"time"
 
@@ -35,180 +36,221 @@ var NoopDevice = &Device{
 	ChatSettings:  nilStore,
 	MsgSecrets:    nilStore,
 	PrivacyTokens: nilStore,
+	EventBuffer:   nilStore,
 	Container:     nilStore,
 }
 
 var _ AllStores = (*NoopStore)(nil)
 var _ DeviceContainer = (*NoopStore)(nil)
 
-func (n *NoopStore) PutIdentity(address string, key [32]byte) error {
+func (n *NoopStore) PutIdentity(ctx context.Context, address string, key [32]byte) error {
 	return n.Error
 }
 
-func (n *NoopStore) DeleteAllIdentities(phone string) error {
+func (n *NoopStore) DeleteAllIdentities(ctx context.Context, phone string) error {
 	return n.Error
 }
 
-func (n *NoopStore) DeleteIdentity(address string) error {
+func (n *NoopStore) DeleteIdentity(ctx context.Context, address string) error {
 	return n.Error
 }
 
-func (n *NoopStore) IsTrustedIdentity(address string, key [32]byte) (bool, error) {
+func (n *NoopStore) IsTrustedIdentity(ctx context.Context, address string, key [32]byte) (bool, error) {
 	return false, n.Error
 }
 
-func (n *NoopStore) GetSession(address string) ([]byte, error) {
+func (n *NoopStore) GetSession(ctx context.Context, address string) ([]byte, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) HasSession(address string) (bool, error) {
+func (n *NoopStore) HasSession(ctx context.Context, address string) (bool, error) {
 	return false, n.Error
 }
 
-func (n *NoopStore) PutSession(address string, session []byte) error {
+func (n *NoopStore) PutSession(ctx context.Context, address string, session []byte) error {
 	return n.Error
 }
 
-func (n *NoopStore) DeleteAllSessions(phone string) error {
+func (n *NoopStore) DeleteAllSessions(ctx context.Context, phone string) error {
 	return n.Error
 }
 
-func (n *NoopStore) DeleteSession(address string) error {
+func (n *NoopStore) DeleteSession(ctx context.Context, address string) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetOrGenPreKeys(count uint32) ([]*keys.PreKey, error) {
+func (n *NoopStore) MigratePNToLID(ctx context.Context, pn, lid types.JID) error {
+	return n.Error
+}
+
+func (n *NoopStore) GetOrGenPreKeys(ctx context.Context, count uint32) ([]*keys.PreKey, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) GenOnePreKey() (*keys.PreKey, error) {
+func (n *NoopStore) GenOnePreKey(ctx context.Context) (*keys.PreKey, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) GetPreKey(id uint32) (*keys.PreKey, error) {
+func (n *NoopStore) GetPreKey(ctx context.Context, id uint32) (*keys.PreKey, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) RemovePreKey(id uint32) error {
+func (n *NoopStore) RemovePreKey(ctx context.Context, id uint32) error {
 	return n.Error
 }
 
-func (n *NoopStore) MarkPreKeysAsUploaded(upToID uint32) error {
+func (n *NoopStore) MarkPreKeysAsUploaded(ctx context.Context, upToID uint32) error {
 	return n.Error
 }
 
-func (n *NoopStore) UploadedPreKeyCount() (int, error) {
+func (n *NoopStore) UploadedPreKeyCount(ctx context.Context) (int, error) {
 	return 0, n.Error
 }
 
-func (n *NoopStore) PutSenderKey(group, user string, session []byte) error {
+func (n *NoopStore) PutSenderKey(ctx context.Context, group, user string, session []byte) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetSenderKey(group, user string) ([]byte, error) {
+func (n *NoopStore) GetSenderKey(ctx context.Context, group, user string) ([]byte, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) PutAppStateSyncKey(id []byte, key AppStateSyncKey) error {
+func (n *NoopStore) PutAppStateSyncKey(ctx context.Context, id []byte, key AppStateSyncKey) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetAppStateSyncKey(id []byte) (*AppStateSyncKey, error) {
+func (n *NoopStore) GetAppStateSyncKey(ctx context.Context, id []byte) (*AppStateSyncKey, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) GetLatestAppStateSyncKeyID() ([]byte, error) {
+func (n *NoopStore) GetLatestAppStateSyncKeyID(ctx context.Context) ([]byte, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) PutAppStateVersion(name string, version uint64, hash [128]byte) error {
+func (n *NoopStore) PutAppStateVersion(ctx context.Context, name string, version uint64, hash [128]byte) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetAppStateVersion(name string) (uint64, [128]byte, error) {
+func (n *NoopStore) GetAppStateVersion(ctx context.Context, name string) (uint64, [128]byte, error) {
 	return 0, [128]byte{}, n.Error
 }
 
-func (n *NoopStore) DeleteAppStateVersion(name string) error {
+func (n *NoopStore) DeleteAppStateVersion(ctx context.Context, name string) error {
 	return n.Error
 }
 
-func (n *NoopStore) PutAppStateMutationMACs(name string, version uint64, mutations []AppStateMutationMAC) error {
+func (n *NoopStore) PutAppStateMutationMACs(ctx context.Context, name string, version uint64, mutations []AppStateMutationMAC) error {
 	return n.Error
 }
 
-func (n *NoopStore) DeleteAppStateMutationMACs(name string, indexMACs [][]byte) error {
+func (n *NoopStore) DeleteAppStateMutationMACs(ctx context.Context, name string, indexMACs [][]byte) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetAppStateMutationMAC(name string, indexMAC []byte) (valueMAC []byte, err error) {
+func (n *NoopStore) GetAppStateMutationMAC(ctx context.Context, name string, indexMAC []byte) (valueMAC []byte, err error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) PutPushName(user types.JID, pushName string) (bool, string, error) {
+func (n *NoopStore) PutPushName(ctx context.Context, user types.JID, pushName string) (bool, string, error) {
 	return false, "", n.Error
 }
 
-func (n *NoopStore) PutBusinessName(user types.JID, businessName string) (bool, string, error) {
+func (n *NoopStore) PutBusinessName(ctx context.Context, user types.JID, businessName string) (bool, string, error) {
 	return false, "", n.Error
 }
 
-func (n *NoopStore) PutContactName(user types.JID, fullName, firstName string) error {
+func (n *NoopStore) PutContactName(ctx context.Context, user types.JID, fullName, firstName string) error {
 	return n.Error
 }
 
-func (n *NoopStore) PutAllContactNames(contacts []ContactEntry) error {
+func (n *NoopStore) PutAllContactNames(ctx context.Context, contacts []ContactEntry) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetContact(user types.JID) (types.ContactInfo, error) {
+func (n *NoopStore) GetContact(ctx context.Context, user types.JID) (types.ContactInfo, error) {
 	return types.ContactInfo{}, n.Error
 }
 
-func (n *NoopStore) GetAllContacts() (map[types.JID]types.ContactInfo, error) {
+func (n *NoopStore) GetAllContacts(ctx context.Context) (map[types.JID]types.ContactInfo, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) PutMutedUntil(chat types.JID, mutedUntil time.Time) error {
+func (n *NoopStore) PutMutedUntil(ctx context.Context, chat types.JID, mutedUntil time.Time) error {
 	return n.Error
 }
 
-func (n *NoopStore) PutPinned(chat types.JID, pinned bool) error {
+func (n *NoopStore) PutPinned(ctx context.Context, chat types.JID, pinned bool) error {
 	return n.Error
 }
 
-func (n *NoopStore) PutArchived(chat types.JID, archived bool) error {
+func (n *NoopStore) PutArchived(ctx context.Context, chat types.JID, archived bool) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetChatSettings(chat types.JID) (types.LocalChatSettings, error) {
+func (n *NoopStore) GetChatSettings(ctx context.Context, chat types.JID) (types.LocalChatSettings, error) {
 	return types.LocalChatSettings{}, n.Error
 }
 
-func (n *NoopStore) PutMessageSecrets(inserts []MessageSecretInsert) error {
+func (n *NoopStore) PutMessageSecrets(ctx context.Context, inserts []MessageSecretInsert) error {
 	return n.Error
 }
 
-func (n *NoopStore) PutMessageSecret(chat, sender types.JID, id types.MessageID, secret []byte) error {
+func (n *NoopStore) PutMessageSecret(ctx context.Context, chat, sender types.JID, id types.MessageID, secret []byte) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetMessageSecret(chat, sender types.JID, id types.MessageID) ([]byte, error) {
+func (n *NoopStore) GetMessageSecret(ctx context.Context, chat, sender types.JID, id types.MessageID) ([]byte, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) PutPrivacyTokens(tokens ...PrivacyToken) error {
+func (n *NoopStore) PutPrivacyTokens(ctx context.Context, tokens ...PrivacyToken) error {
 	return n.Error
 }
 
-func (n *NoopStore) GetPrivacyToken(user types.JID) (*PrivacyToken, error) {
+func (n *NoopStore) GetPrivacyToken(ctx context.Context, user types.JID) (*PrivacyToken, error) {
 	return nil, n.Error
 }
 
-func (n *NoopStore) PutDevice(store *Device) error {
+func (n *NoopStore) PutDevice(ctx context.Context, store *Device) error {
+	return n.Error
+}
+
+func (n *NoopStore) DeleteDevice(ctx context.Context, store *Device) error {
+	return n.Error
+}
+
+func (n *NoopStore) GetBufferedEvent(ctx context.Context, ciphertextHash [32]byte) (*BufferedEvent, error) {
+	return nil, nil
+}
+
+func (n *NoopStore) PutBufferedEvent(ctx context.Context, ciphertextHash [32]byte, plaintext []byte, serverTimestamp time.Time) error {
+	return nil
+}
+
+func (n *NoopStore) DoDecryptionTxn(ctx context.Context, fn func(context.Context) error) error {
+	return fn(ctx)
+}
+
+func (n *NoopStore) ClearBufferedEventPlaintext(ctx context.Context, ciphertextHash [32]byte) error {
+	return nil
+}
+
+func (n *NoopStore) DeleteOldBufferedHashes(ctx context.Context) error {
+	return nil
+}
+
+func (n *NoopStore) GetLIDForPN(ctx context.Context, pn types.JID) (types.JID, error) {
+	return types.JID{}, n.Error
+}
+
+func (n *NoopStore) GetPNForLID(ctx context.Context, lid types.JID) (types.JID, error) {
+	return types.JID{}, n.Error
+}
+
+func (n *NoopStore) PutManyLIDMappings(ctx context.Context, mappings []LIDMapping) error {
 	return n.Error
 }
 
-func (n *NoopStore) DeleteDevice(store *Device) error {
+func (n *NoopStore) PutLIDMapping(ctx context.Context, lid types.JID, jid types.JID) error {
 	return n.Error
 }