slidge-whatsapp 0.2.6__cp313-cp313-manylinux_2_36_aarch64.whl → 0.2.7__cp313-cp313-manylinux_2_36_aarch64.whl

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waSyncAction/WASyncAction.proto

@@ -56,6 +56,15 @@ message CallLogRecord {
 	optional CallType callType = 15;
 }
 
+message PaymentTosAction {
+	enum PaymentNotice {
+		BR_PAY_PRIVACY_POLICY = 0;
+	}
+
+	required PaymentNotice paymentNotice = 1;
+	required bool accepted = 2;
+}
+
 message NotificationActivitySettingAction {
 	enum NotificationActivitySetting {
 		DEFAULT_ALL_MESSAGES = 0;
@@ -244,6 +253,13 @@ message SyncActionValue {
 	optional NotificationActivitySettingAction notificationActivitySettingAction = 60;
 	optional LidContactAction lidContactAction = 61;
 	optional CtwaPerCustomerDataSharingAction ctwaPerCustomerDataSharingAction = 62;
+	optional PaymentTosAction paymentTosAction = 63;
+	optional PrivacySettingChannelsPersonalisedRecommendationAction privacySettingChannelsPersonalisedRecommendationAction = 64;
+	optional BusinessBroadcastAssociationAction businessBroadcastAssociationAction = 65;
+}
+
+message BusinessBroadcastAssociationAction {
+	optional bool deleted = 1;
 }
 
 message CtwaPerCustomerDataSharingAction {
@@ -265,6 +281,10 @@ message FavoritesAction {
 	repeated Favorite favorites = 1;
 }
 
+message PrivacySettingChannelsPersonalisedRecommendationAction {
+	optional bool isUserOptedOut = 1;
+}
+
 message PrivacySettingDisableLinkPreviewsAction {
 	optional bool isPreviewsDisabled = 1;
 }

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waWeb/WAWebProtobufsWeb.pb.go

@@ -308,6 +308,8 @@ const (
 	WebMessageInfo_BIZ_CUSTOMER_3PD_DATA_SHARING_OPT_OUT_MESSAGE            WebMessageInfo_StubType = 215
 	WebMessageInfo_CHANGE_LIMIT_SHARING                                     WebMessageInfo_StubType = 216
 	WebMessageInfo_GROUP_MEMBER_LINK_MODE                                   WebMessageInfo_StubType = 217
+	WebMessageInfo_BIZ_AUTOMATICALLY_LABELED_CHAT_SYSTEM_MESSAGE            WebMessageInfo_StubType = 218
+	WebMessageInfo_PHONE_NUMBER_HIDING_CHAT_DEPRECATED_MESSAGE              WebMessageInfo_StubType = 219
 )
 
 // Enum value maps for WebMessageInfo_StubType.
@@ -531,6 +533,8 @@ var (
 		215: "BIZ_CUSTOMER_3PD_DATA_SHARING_OPT_OUT_MESSAGE",
 		216: "CHANGE_LIMIT_SHARING",
 		217: "GROUP_MEMBER_LINK_MODE",
+		218: "BIZ_AUTOMATICALLY_LABELED_CHAT_SYSTEM_MESSAGE",
+		219: "PHONE_NUMBER_HIDING_CHAT_DEPRECATED_MESSAGE",
 	}
 	WebMessageInfo_StubType_value = map[string]int32{
 		"UNKNOWN":                                                  0,
@@ -751,6 +755,8 @@ var (
 		"BIZ_CUSTOMER_3PD_DATA_SHARING_OPT_OUT_MESSAGE":            215,
 		"CHANGE_LIMIT_SHARING":                                     216,
 		"GROUP_MEMBER_LINK_MODE":                                   217,
+		"BIZ_AUTOMATICALLY_LABELED_CHAT_SYSTEM_MESSAGE":            218,
+		"PHONE_NUMBER_HIDING_CHAT_DEPRECATED_MESSAGE":              219,
 	}
 )
 
@@ -3705,7 +3711,7 @@ var File_waWeb_WAWebProtobufsWeb_proto protoreflect.FileDescriptor
 
 const file_waWeb_WAWebProtobufsWeb_proto_rawDesc = "" +
 	"\n" +
-	"\x1dwaWeb/WAWebProtobufsWeb.proto\x12\x11WAWebProtobufsWeb\x1a\x1dwaE2E/WAWebProtobufsE2E.proto\x1a\x17waCommon/WACommon.proto\"\x94V\n" +
+	"\x1dwaWeb/WAWebProtobufsWeb.proto\x12\x11WAWebProtobufsWeb\x1a\x1dwaE2E/WAWebProtobufsE2E.proto\x1a\x17waCommon/WACommon.proto\"\xfaV\n" +
 	"\x0eWebMessageInfo\x12&\n" +
 	"\x03key\x18\x01 \x02(\v2\x14.WACommon.MessageKeyR\x03key\x124\n" +
 	"\amessage\x18\x02 \x01(\v2\x1a.WAWebProtobufsE2E.MessageR\amessage\x12*\n" +
@@ -3778,7 +3784,7 @@ const file_waWeb_WAWebProtobufsWeb_proto_rawDesc = "" +
 	"\x02FB\x10\x02\x12\a\n" +
 	"\x03BSP\x10\x01\x12\x0e\n" +
 	"\n" +
-	"BSP_AND_FB\x10\x03\"\xef9\n" +
+	"BSP_AND_FB\x10\x03\"\xd5:\n" +
 	"\bStubType\x12\v\n" +
 	"\aUNKNOWN\x10\x00\x12\n" +
 	"\n" +
@@ -4001,7 +4007,9 @@ const file_waWeb_WAWebProtobufsWeb_proto_rawDesc = "" +
 	",BIZ_CUSTOMER_3PD_DATA_SHARING_OPT_IN_MESSAGE\x10\xd6\x01\x122\n" +
 	"-BIZ_CUSTOMER_3PD_DATA_SHARING_OPT_OUT_MESSAGE\x10\xd7\x01\x12\x19\n" +
 	"\x14CHANGE_LIMIT_SHARING\x10\xd8\x01\x12\x1b\n" +
-	"\x16GROUP_MEMBER_LINK_MODE\x10\xd9\x01\"X\n" +
+	"\x16GROUP_MEMBER_LINK_MODE\x10\xd9\x01\x122\n" +
+	"-BIZ_AUTOMATICALLY_LABELED_CHAT_SYSTEM_MESSAGE\x10\xda\x01\x120\n" +
+	"+PHONE_NUMBER_HIDING_CHAT_DEPRECATED_MESSAGE\x10\xdb\x01\"X\n" +
 	"\x06Status\x12\t\n" +
 	"\x05ERROR\x10\x00\x12\v\n" +
 	"\aPENDING\x10\x01\x12\x0e\n" +

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waWeb/WAWebProtobufsWeb.proto

@@ -232,6 +232,8 @@ message WebMessageInfo {
 		BIZ_CUSTOMER_3PD_DATA_SHARING_OPT_OUT_MESSAGE = 215;
 		CHANGE_LIMIT_SHARING = 216;
 		GROUP_MEMBER_LINK_MODE = 217;
+		BIZ_AUTOMATICALLY_LABELED_CHAT_SYSTEM_MESSAGE = 218;
+		PHONE_NUMBER_HIDING_CHAT_DEPRECATED_MESSAGE = 219;
 	}
 
 	enum Status {

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

@@ -11,26 +11,29 @@ import (
 	"fmt"
 	"time"
 
+	"go.mau.fi/util/ptr"
+
 	waBinary "go.mau.fi/whatsmeow/binary"
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
 )
 
 func (cli *Client) handleReceipt(node *waBinary.Node) {
-	defer cli.maybeDeferredAck(node)()
+	var cancelled bool
+	defer cli.maybeDeferredAck(cli.BackgroundEventCtx, node)(&cancelled)
 	receipt, err := cli.parseReceipt(node)
 	if err != nil {
 		cli.Log.Warnf("Failed to parse receipt: %v", err)
 	} else if receipt != nil {
 		if receipt.Type == types.ReceiptTypeRetry {
 			go func() {
-				err := cli.handleRetryReceipt(context.TODO(), receipt, node)
+				err := cli.handleRetryReceipt(cli.BackgroundEventCtx, receipt, node)
 				if err != nil {
 					cli.Log.Errorf("Failed to handle retry receipt for %s/%s from %s: %v", receipt.Chat, receipt.MessageIDs[0], receipt.Sender, err)
 				}
 			}()
 		}
-		cli.dispatchEvent(receipt)
+		cancelled = cli.dispatchEvent(receipt)
 	}
 }
 
@@ -50,7 +53,7 @@ func (cli *Client) handleGroupedReceipt(partialReceipt events.Receipt, participa
 			cli.Log.Warnf("Failed to parse user node %s in grouped receipt: %v", child.XMLString(), ag.Error())
 			continue
 		}
-		go cli.dispatchEvent(&receipt)
+		cli.dispatchEvent(&receipt)
 	}
 }
 
@@ -97,14 +100,17 @@ func (cli *Client) parseReceipt(node *waBinary.Node) (*events.Receipt, error) {
 	return &receipt, nil
 }
 
-func (cli *Client) maybeDeferredAck(node *waBinary.Node) func() {
+func (cli *Client) maybeDeferredAck(ctx context.Context, node *waBinary.Node) func(cancelled ...*bool) {
 	if cli.SynchronousAck {
-		return func() {
+		return func(cancelled ...*bool) {
+			if ctx.Err() != nil || (len(cancelled) > 0 && ptr.Val(cancelled[0])) {
+				return
+			}
 			cli.sendAck(node)
 		}
 	} else {
 		go cli.sendAck(node)
-		return func() {}
+		return func(...*bool) {}
 	}
 }
 

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/reportingfields.json

@@ -0,0 +1 @@
+[{"f":1},{"f":3,"s":[{"f":2},{"f":3},{"f":8},{"f":11},{"f":17,"s":[{"f":21},{"f":22}]},{"f":25}]},{"f":4,"s":[{"f":1},{"f":16},{"f":17,"s":[{"f":21},{"f":22}]}]},{"f":5,"s":[{"f":3},{"f":4},{"f":5},{"f":16},{"f":17,"s":[{"f":21},{"f":22}]}]},{"f":6,"s":[{"f":1},{"f":17,"s":[{"f":21},{"f":22}]},{"f":30}]},{"f":7,"s":[{"f":2},{"f":7},{"f":10},{"f":17,"s":[{"f":21},{"f":22}]},{"f":20}]},{"f":8,"s":[{"f":2},{"f":7},{"f":9},{"f":17,"s":[{"f":21},{"f":22}]},{"f":21}]},{"f":9,"s":[{"f":2},{"f":6},{"f":7},{"f":13},{"f":17,"s":[{"f":21},{"f":22}]},{"f":20}]},{"f":12,"s":[{"f":1},{"f":2},{"f":14,"m":true},{"f":15}]},{"f":18,"s":[{"f":6},{"f":16},{"f":17,"s":[{"f":21},{"f":22}]}]},{"f":26,"s":[{"f":4},{"f":5},{"f":8},{"f":13},{"f":17,"s":[{"f":21},{"f":22}]}]},{"f":28,"s":[{"f":1},{"f":2},{"f":4},{"f":5},{"f":6},{"f":7,"s":[{"f":21},{"f":22}]}]},{"f":37,"s":[{"f":1,"m":true}]},{"f":49,"s":[{"f":2},{"f":3,"s":[{"f":1},{"f":2}]},{"f":5,"s":[{"f":21},{"f":22}]},{"f":8,"s":[{"f":1},{"f":2}]}]},{"f":53,"s":[{"f":1,"m":true}]},{"f":55,"s":[{"f":1,"m":true}]},{"f":58,"s":[{"f":1,"m":true}]},{"f":59,"s":[{"f":1,"m":true}]},{"f":60,"s":[{"f":2},{"f":3,"s":[{"f":1},{"f":2}]},{"f":5,"s":[{"f":21},{"f":22}]},{"f":8,"s":[{"f":1},{"f":2}]}]},{"f":64,"s":[{"f":2},{"f":3,"s":[{"f":1},{"f":2}]},{"f":5,"s":[{"f":21},{"f":22}]},{"f":8,"s":[{"f":1},{"f":2}]}]},{"f":66,"s":[{"f":2},{"f":6},{"f":7},{"f":13},{"f":17,"s":[{"f":21},{"f":22}]},{"f":20}]},{"f":74,"s":[{"f":1,"m":true}]},{"f":87,"s":[{"f":1,"m":true}]},{"f":88,"s":[{"f":1},{"f":2,"s":[{"f":1}]},{"f":3,"s":[{"f":21},{"f":22}]}]},{"f":92,"s":[{"f":1,"m":true}]},{"f":93,"s":[{"f":1,"m":true}]},{"f":94,"s":[{"f":1,"m":true}]}]

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

@@ -0,0 +1,176 @@
+// Copyright (c) 2025 Tulir Asokan
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+package whatsmeow
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	_ "embed"
+	"encoding/binary"
+	"encoding/json"
+	"sort"
+	"sync"
+
+	"go.mau.fi/util/exerrors"
+	"go.mau.fi/util/exstrings"
+
+	waBinary "go.mau.fi/whatsmeow/binary"
+	"go.mau.fi/whatsmeow/proto/waE2E"
+	"go.mau.fi/whatsmeow/types"
+)
+
+//go:embed reportingfields.json
+var reportingFieldsJSON string
+var getReportingFields = sync.OnceValue(func() (output []reportingField) {
+	exerrors.PanicIfNotNil(json.Unmarshal(exstrings.UnsafeBytes(reportingFieldsJSON), &output))
+	return
+})
+
+type reportingField struct {
+	FieldNumber int              `json:"f"`
+	IsMessage   bool             `json:"m,omitempty"`
+	Subfields   []reportingField `json:"s,omitempty"`
+}
+
+func (cli *Client) shouldIncludeReportingToken(message *waE2E.Message) bool {
+	if !cli.SendReportingTokens {
+		return false
+	}
+	return message.ReactionMessage == nil &&
+		message.EncReactionMessage == nil &&
+		message.EncEventResponseMessage == nil &&
+		message.PollUpdateMessage == nil
+}
+
+func (cli *Client) getMessageReportingToken(
+	msgProtobuf []byte,
+	msg *waE2E.Message,
+	senderJID, remoteJID types.JID,
+	messageID types.MessageID,
+) waBinary.Node {
+	reportingSecret, _ := generateMsgSecretKey(
+		EncSecretReportToken, senderJID, messageID, remoteJID,
+		msg.GetMessageContextInfo().GetMessageSecret(),
+	)
+	hasher := hmac.New(sha256.New, reportingSecret)
+	hasher.Write(getReportingToken(msgProtobuf))
+	return waBinary.Node{
+		Tag: "reporting",
+		Content: []waBinary.Node{{
+			Tag:     "reporting_token",
+			Attrs:   waBinary.Attrs{"v": "2"},
+			Content: hasher.Sum(nil)[:16],
+		}},
+	}
+}
+
+func getReportingToken(messageProtobuf []byte) []byte {
+	return extractReportingTokenContent(messageProtobuf, getReportingFields())
+}
+
+// Helper to find config for a field number
+func getConfigForField(fields []reportingField, fieldNum int) *reportingField {
+	for i := range fields {
+		if fields[i].FieldNumber == fieldNum {
+			return &fields[i]
+		}
+	}
+	return nil
+}
+
+// Protobuf wire types
+const (
+	wireVarint = 0
+	wire64bit  = 1
+	wireBytes  = 2
+	wire32bit  = 5
+)
+
+// Extracts the reporting token content recursively
+func extractReportingTokenContent(data []byte, config []reportingField) []byte {
+	type field struct {
+		Num   int
+		Bytes []byte
+	}
+	var fields []field
+	i := 0
+	for i < len(data) {
+		// Read tag (varint)
+		tag, tagLen := binary.Uvarint(data[i:])
+		if tagLen <= 0 {
+			break // malformed
+		}
+		fieldNum := int(tag >> 3)
+		wireType := int(tag & 0x7)
+		fieldCfg := getConfigForField(config, fieldNum)
+		fieldStart := i
+		i += tagLen
+		if fieldCfg == nil {
+			// Skip field
+			switch wireType {
+			case wireVarint:
+				_, n := binary.Uvarint(data[i:])
+				i += n
+			case wire64bit:
+				i += 8
+			case wireBytes:
+				l, n := binary.Uvarint(data[i:])
+				i += n + int(l)
+			case wire32bit:
+				i += 4
+			default:
+				return nil
+			}
+			continue
+		}
+		switch wireType {
+		case wireVarint:
+			_, n := binary.Uvarint(data[i:])
+			i += n
+			fields = append(fields, field{Num: fieldNum, Bytes: data[fieldStart:i]})
+		case wire64bit:
+			i += 8
+			fields = append(fields, field{Num: fieldNum, Bytes: data[fieldStart:i]})
+		case wireBytes:
+			l, n := binary.Uvarint(data[i:])
+			valStart := i + n
+			valEnd := valStart + int(l)
+			if fieldCfg.IsMessage || len(fieldCfg.Subfields) > 0 {
+				// Recursively extract subfields
+				sub := extractReportingTokenContent(data[valStart:valEnd], fieldCfg.Subfields)
+				if len(sub) > 0 {
+					// Re-encode tag and length
+					buf := make([]byte, 0, tagLen+n+len(sub))
+					tagBuf := make([]byte, binary.MaxVarintLen64)
+					tagN := binary.PutUvarint(tagBuf, tag)
+					lenBuf := make([]byte, binary.MaxVarintLen64)
+					lenN := binary.PutUvarint(lenBuf, uint64(len(sub)))
+					buf = append(buf, tagBuf[:tagN]...)
+					buf = append(buf, lenBuf[:lenN]...)
+					buf = append(buf, sub...)
+					fields = append(fields, field{Num: fieldNum, Bytes: buf})
+				}
+			} else {
+				fields = append(fields, field{Num: fieldNum, Bytes: data[fieldStart:valEnd]})
+			}
+			i = valEnd
+		case wire32bit:
+			i += 4
+			fields = append(fields, field{Num: fieldNum, Bytes: data[fieldStart:i]})
+		default:
+			return nil
+		}
+	}
+	// Sort by field number
+	sort.Slice(fields, func(i, j int) bool { return fields[i].Num < fields[j].Num })
+	// Concatenate
+	var out []byte
+	for _, f := range fields {
+		out = append(out, f.Bytes...)
+	}
+	return out
+}

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

@@ -334,7 +334,7 @@ func (cli *Client) delayedRequestMessageFromPhone(info *types.MessageInfo) {
 		cli.pendingPhoneRerequestsLock.Unlock()
 		return
 	}
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(cli.BackgroundEventCtx)
 	defer cancel()
 	cli.pendingPhoneRerequests[info.ID] = cancel
 	cli.pendingPhoneRerequestsLock.Unlock()
@@ -350,6 +350,10 @@ func (cli *Client) delayedRequestMessageFromPhone(info *types.MessageInfo) {
 		cli.Log.Debugf("Cancelled delayed request for message %s from phone", info.ID)
 		return
 	}
+	cli.immediateRequestMessageFromPhone(ctx, info)
+}
+
+func (cli *Client) immediateRequestMessageFromPhone(ctx context.Context, info *types.MessageInfo) {
 	_, err := cli.SendMessage(
 		ctx,
 		cli.getOwnID().ToNonAD(),
@@ -395,7 +399,11 @@ func (cli *Client) sendRetryReceipt(ctx context.Context, node *waBinary.Node, in
 		return
 	}
 	if retryCount == 1 {
-		go cli.delayedRequestMessageFromPhone(info)
+		if cli.SynchronousAck {
+			cli.immediateRequestMessageFromPhone(ctx, info)
+		} else {
+			go cli.delayedRequestMessageFromPhone(info)
+		}
 	}
 
 	var registrationIDBytes [4]byte

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

@@ -25,7 +25,6 @@ import (
 	"go.mau.fi/libsignal/protocol"
 	"go.mau.fi/libsignal/session"
 	"go.mau.fi/libsignal/signalerror"
-	"go.mau.fi/util/ptr"
 	"go.mau.fi/util/random"
 	"google.golang.org/protobuf/proto"
 
@@ -224,7 +223,7 @@ func (cli *Client) SendMessage(ctx context.Context, to types.JID, message *waE2E
 	}
 
 	isBotMode := isInlineBotMode || to.IsBot()
-	needsMessageSecret := isBotMode
+	needsMessageSecret := isBotMode || cli.shouldIncludeReportingToken(message)
 	var extraParams nodeExtraParams
 
 	if needsMessageSecret {
@@ -296,10 +295,6 @@ func (cli *Client) SendMessage(ctx context.Context, to types.JID, message *waE2E
 			if cachedData.AddressingMode == types.AddressingModeLID {
 				ownID = cli.getOwnLID()
 				extraParams.addressingMode = types.AddressingModeLID
-				if req.Meta == nil {
-					req.Meta = &types.MsgMetaInfo{}
-				}
-				req.Meta.DeprecatedLIDSession = ptr.Ptr(false)
 			} else if cachedData.CommunityAnnouncementGroup && req.Meta != nil {
 				ownID = cli.getOwnLID()
 				// Why is this set to PN?
@@ -315,11 +310,6 @@ func (cli *Client) SendMessage(ctx context.Context, to types.JID, message *waE2E
 		resp.DebugTimings.GetParticipants = time.Since(start)
 	} else if to.Server == types.HiddenUserServer {
 		ownID = cli.getOwnLID()
-		extraParams.addressingMode = types.AddressingModeLID
-		// if req.Meta == nil {
-		// 	req.Meta = &types.MsgMetaInfo{}
-		// }
-		// req.Meta.DeprecatedLIDSession = ptr.Ptr(false)
 	}
 	if req.Meta != nil {
 		extraParams.metaNode = &waBinary.Node{
@@ -361,8 +351,8 @@ func (cli *Client) SendMessage(ctx context.Context, to types.JID, message *waE2E
 	var data []byte
 	switch to.Server {
 	case types.GroupServer, types.BroadcastServer:
-		phash, data, err = cli.sendGroup(ctx, to, groupParticipants, req.ID, message, &resp.DebugTimings, extraParams)
-	case types.DefaultUserServer, types.BotServer:
+		phash, data, err = cli.sendGroup(ctx, ownID, to, groupParticipants, req.ID, message, &resp.DebugTimings, extraParams)
+	case types.DefaultUserServer, types.BotServer, types.HiddenUserServer:
 		if req.Peer {
 			data, err = cli.sendPeerMessage(ctx, to, req.ID, message, &resp.DebugTimings)
 		} else {
@@ -590,7 +580,7 @@ func ParseDisappearingTimerString(val string) (time.Duration, bool) {
 // In groups, the server will echo the change as a notification, so it'll show up as a *events.GroupInfo update.
 func (cli *Client) SetDisappearingTimer(chat types.JID, timer time.Duration) (err error) {
 	switch chat.Server {
-	case types.DefaultUserServer:
+	case types.DefaultUserServer, types.HiddenUserServer:
 		_, err = cli.SendMessage(context.TODO(), chat, &waE2E.Message{
 			ProtocolMessage: &waE2E.ProtocolMessage{
 				Type:                waE2E.ProtocolMessage_EPHEMERAL_SETTING.Enum(),
@@ -688,6 +678,7 @@ type nodeExtraParams struct {
 
 func (cli *Client) sendGroup(
 	ctx context.Context,
+	ownID,
 	to types.JID,
 	participants []types.JID,
 	id types.MessageID,
@@ -746,6 +737,9 @@ func (cli *Client) sendGroup(
 		skMsg.Attrs["mediatype"] = mediaType
 	}
 	node.Content = append(node.GetChildren(), skMsg)
+	if cli.shouldIncludeReportingToken(message) && message.GetMessageContextInfo().GetMessageSecret() != nil {
+		node.Content = append(node.GetChildren(), cli.getMessageReportingToken(plaintext, message, ownID, to, id))
+	}
 
 	start = time.Now()
 	data, err := cli.sendNodeAndGetData(*node)
@@ -799,6 +793,20 @@ func (cli *Client) sendDM(
 	if err != nil {
 		return nil, err
 	}
+
+	if cli.shouldIncludeReportingToken(message) && message.GetMessageContextInfo().GetMessageSecret() != nil {
+		node.Content = append(node.GetChildren(), cli.getMessageReportingToken(messagePlaintext, message, ownID, to, id))
+	}
+
+	if tcToken, err := cli.Store.PrivacyTokens.GetPrivacyToken(ctx, to); err != nil {
+		cli.Log.Warnf("Failed to get privacy token for %s: %v", to, err)
+	} else if tcToken != nil {
+		node.Content = append(node.GetChildren(), waBinary.Node{
+			Tag:     "tctoken",
+			Content: tcToken.Token,
+		})
+	}
+
 	start = time.Now()
 	data, err := cli.sendNodeAndGetData(*node)
 	timings.Send = time.Since(start)
@@ -983,8 +991,15 @@ func (cli *Client) preparePeerMessageNode(
 		err = fmt.Errorf("failed to marshal message: %w", err)
 		return nil, err
 	}
+	encryptionIdentity := to
+	if to.Server == types.DefaultUserServer {
+		encryptionIdentity, err = cli.Store.LIDs.GetLIDForPN(ctx, to)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get LID for PN %s: %w", to, err)
+		}
+	}
 	start = time.Now()
-	encrypted, isPreKey, err := cli.encryptMessageForDevice(ctx, plaintext, to, nil, nil)
+	encrypted, isPreKey, err := cli.encryptMessageForDevice(ctx, plaintext, encryptionIdentity, nil, nil)
 	timings.PeerEncrypt = time.Since(start)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encrypt peer message for %s: %v", to, err)
@@ -1154,7 +1169,7 @@ func (cli *Client) encryptMessageForDevices(
 	for _, jid := range allDevices {
 		plaintext := msgPlaintext
 		if (jid.User == ownJID.User || jid.User == ownLID.User) && dsmPlaintext != nil {
-			if jid == ownJID {
+			if jid == ownJID || jid == ownLID {
 				continue
 			}
 			plaintext = dsmPlaintext
@@ -1273,7 +1288,7 @@ func (cli *Client) encryptMessageForDevice(
 	} else if contains, err := cli.Store.ContainsSession(ctx, to.SignalAddress()); err != nil {
 		return nil, false, err
 	} else if !contains {
-		return nil, false, ErrNoSession
+		return nil, false, fmt.Errorf("%w with %s", ErrNoSession, to.SignalAddress().String())
 	}
 	cipher := session.NewCipher(builder, to.SignalAddress())
 	ciphertext, err := cipher.Encrypt(ctx, padMessage(plaintext))

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

@@ -36,6 +36,7 @@ import (
 
 const FBMessageVersion = 3
 const FBMessageApplicationVersion = 2
+const IGMessageApplicationVersion = 3
 const FBConsumerMessageVersion = 1
 const FBArmadilloMessageVersion = 1
 

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, 1022781640}
+var waVersion = WAVersionContainer{2, 3000, 1024307498}
 
 // waVersionHash is the md5 hash of a dot-separated waVersion
 var waVersionHash [16]byte

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/sqlstore/container.go

@@ -115,7 +115,7 @@ const getAllDevicesQuery = `
 SELECT jid, lid, registration_id, noise_key, identity_key,
        signed_pre_key, signed_pre_key_id, signed_pre_key_sig,
        adv_key, adv_details, adv_account_sig, adv_account_sig_key, adv_device_sig,
-       platform, business_name, push_name, facebook_uuid
+       platform, business_name, push_name, facebook_uuid, lid_migration_ts
 FROM whatsmeow_device
 `
 
@@ -133,7 +133,7 @@ func (c *Container) scanDevice(row dbutil.Scannable) (*store.Device, error) {
 		&device.ID, &device.LID, &device.RegistrationID, &noisePriv, &identityPriv,
 		&preKeyPriv, &device.SignedPreKey.KeyID, &preKeySig,
 		&device.AdvSecretKey, &account.Details, &account.AccountSignature, &account.AccountSignatureKey, &account.DeviceSignature,
-		&device.Platform, &device.BusinessName, &device.PushName, &fbUUID)
+		&device.Platform, &device.BusinessName, &device.PushName, &fbUUID, &device.LIDMigrationTimestamp)
 	if err != nil {
 		return nil, fmt.Errorf("failed to scan session: %w", err)
 	} else if len(noisePriv) != 32 || len(identityPriv) != 32 || len(preKeyPriv) != 32 || len(preKeySig) != 64 {
@@ -202,13 +202,14 @@ const (
 		INSERT INTO whatsmeow_device (jid, lid, registration_id, noise_key, identity_key,
 									  signed_pre_key, signed_pre_key_id, signed_pre_key_sig,
 									  adv_key, adv_details, adv_account_sig, adv_account_sig_key, adv_device_sig,
-									  platform, business_name, push_name, facebook_uuid)
-		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)
+									  platform, business_name, push_name, facebook_uuid, lid_migration_ts)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)
 		ON CONFLICT (jid) DO UPDATE
 			SET lid=excluded.lid,
 				platform=excluded.platform,
 				business_name=excluded.business_name,
-				push_name=excluded.push_name
+				push_name=excluded.push_name,
+				lid_migration_ts=excluded.lid_migration_ts
 	`
 	deleteDeviceQuery = `DELETE FROM whatsmeow_device WHERE jid=$1`
 )
@@ -252,7 +253,9 @@ func (c *Container) PutDevice(ctx context.Context, device *store.Device) error {
 		device.ID, device.LID, device.RegistrationID, device.NoiseKey.Priv[:], device.IdentityKey.Priv[:],
 		device.SignedPreKey.Priv[:], device.SignedPreKey.KeyID, device.SignedPreKey.Signature[:],
 		device.AdvSecretKey, device.Account.Details, device.Account.AccountSignature, device.Account.AccountSignatureKey, device.Account.DeviceSignature,
-		device.Platform, device.BusinessName, device.PushName, uuid.NullUUID{UUID: device.FacebookUUID, Valid: device.FacebookUUID != uuid.Nil})
+		device.Platform, device.BusinessName, device.PushName, uuid.NullUUID{UUID: device.FacebookUUID, Valid: device.FacebookUUID != uuid.Nil},
+		device.LIDMigrationTimestamp,
+	)
 
 	if !device.Initialized {
 		c.initializeDevice(device)

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/sqlstore/upgrades/00-latest-schema.sql

@@ -1,4 +1,4 @@
--- v0 -> v9 (compatible with v8+): Latest schema
+-- v0 -> v10 (compatible with v8+): Latest schema
 CREATE TABLE whatsmeow_device (
 	jid TEXT PRIMARY KEY,
 	lid TEXT,
@@ -22,7 +22,9 @@ CREATE TABLE whatsmeow_device (
 
 	platform      TEXT NOT NULL DEFAULT '',
 	business_name TEXT NOT NULL DEFAULT '',
-	push_name     TEXT NOT NULL DEFAULT ''
+	push_name     TEXT NOT NULL DEFAULT '',
+
+	lid_migration_ts BIGINT NOT NULL DEFAULT 0
 );
 
 CREATE TABLE whatsmeow_identity_keys (

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/sqlstore/upgrades/10-chat-db-lid-migration-ts.sql

@@ -0,0 +1,2 @@
+-- v10 (compatible with v8+): Add lid migration timestamp to device table
+ALTER TABLE whatsmeow_device ADD COLUMN lid_migration_ts BIGINT NOT NULL DEFAULT 0;

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

@@ -192,6 +192,8 @@ type Device struct {
 	BusinessName string
 	PushName     string
 
+	LIDMigrationTimestamp int64
+
 	FacebookUUID uuid.UUID
 
 	Initialized   bool

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/types/events/events.go

@@ -14,6 +14,7 @@ import (
 
 	waBinary "go.mau.fi/whatsmeow/binary"
 	armadillo "go.mau.fi/whatsmeow/proto"
+	"go.mau.fi/whatsmeow/proto/instamadilloTransportPayload"
 	"go.mau.fi/whatsmeow/proto/waArmadilloApplication"
 	"go.mau.fi/whatsmeow/proto/waConsumerApplication"
 	"go.mau.fi/whatsmeow/proto/waE2E"
@@ -319,8 +320,10 @@ type FBMessage struct {
 	// If the message was re-requested from the sender, this is the number of retries it took.
 	RetryCount int
 
-	Transport   *waMsgTransport.MessageTransport     // The first level of wrapping the message was in
-	Application *waMsgApplication.MessageApplication // The second level of wrapping the message was in
+	Transport *waMsgTransport.MessageTransport // The first level of wrapping the message was in
+
+	FBApplication *waMsgApplication.MessageApplication           // The second level of wrapping the message was in, for FB messages
+	IGTransport   *instamadilloTransportPayload.TransportPayload // The second level of wrapping the message was in, for IG messages
 }
 
 func (evt *FBMessage) GetConsumerApplication() *waConsumerApplication.ConsumerApplication {

slidge_whatsapp/vendor/go.mau.fi/whatsmeow/types/message.go

@@ -78,6 +78,7 @@ type MsgMetaInfo struct {
 	// Bot things
 	TargetID     MessageID
 	TargetSender JID
+	TargetChat   JID
 
 	DeprecatedLIDSession *bool
 

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

@@ -561,6 +561,8 @@ func (cli *Client) GetProfilePictureInfo(jid types.JID, params *GetProfilePictur
 	ag := picture.AttrGetter()
 	if ag.OptionalInt("status") == 304 {
 		return nil, nil
+	} else if ag.OptionalInt("status") == 204 {
+		return nil, ErrProfilePictureNotSet
 	}
 	info.ID = ag.String("id")
 	info.URL = ag.String("url")