slidge-whatsapp 0.2.5__cp311-cp311-manylinux_2_36_aarch64.whl → 0.3.0__cp311-cp311-manylinux_2_36_aarch64.whl

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

@@ -0,0 +1,210 @@
+package types
+
+var BotJIDMap = map[JID]JID{
+	NewJID("867051314767696", BotServer):   NewJID("13135550002", DefaultUserServer),
+	NewJID("1061492271844689", BotServer):  NewJID("13135550005", DefaultUserServer),
+	NewJID("245886058483988", BotServer):   NewJID("13135550009", DefaultUserServer),
+	NewJID("3509905702656130", BotServer):  NewJID("13135550012", DefaultUserServer),
+	NewJID("1059680132034576", BotServer):  NewJID("13135550013", DefaultUserServer),
+	NewJID("715681030623646", BotServer):   NewJID("13135550014", DefaultUserServer),
+	NewJID("1644971366323052", BotServer):  NewJID("13135550015", DefaultUserServer),
+	NewJID("582497970646566", BotServer):   NewJID("13135550019", DefaultUserServer),
+	NewJID("645459357769306", BotServer):   NewJID("13135550022", DefaultUserServer),
+	NewJID("294997126699143", BotServer):   NewJID("13135550023", DefaultUserServer),
+	NewJID("1522631578502677", BotServer):  NewJID("13135550027", DefaultUserServer),
+	NewJID("719421926276396", BotServer):   NewJID("13135550030", DefaultUserServer),
+	NewJID("1788488635002167", BotServer):  NewJID("13135550031", DefaultUserServer),
+	NewJID("24232338603080193", BotServer): NewJID("13135550033", DefaultUserServer),
+	NewJID("689289903143209", BotServer):   NewJID("13135550035", DefaultUserServer),
+	NewJID("871626054177096", BotServer):   NewJID("13135550039", DefaultUserServer),
+	NewJID("362351902849370", BotServer):   NewJID("13135550042", DefaultUserServer),
+	NewJID("1744617646041527", BotServer):  NewJID("13135550043", DefaultUserServer),
+	NewJID("893887762270570", BotServer):   NewJID("13135550046", DefaultUserServer),
+	NewJID("1155032702135830", BotServer):  NewJID("13135550047", DefaultUserServer),
+	NewJID("333931965993883", BotServer):   NewJID("13135550048", DefaultUserServer),
+	NewJID("853748013058752", BotServer):   NewJID("13135550049", DefaultUserServer),
+	NewJID("1559068611564819", BotServer):  NewJID("13135550053", DefaultUserServer),
+	NewJID("890487432705716", BotServer):   NewJID("13135550054", DefaultUserServer),
+	NewJID("240254602395494", BotServer):   NewJID("13135550055", DefaultUserServer),
+	NewJID("1578420349663261", BotServer):  NewJID("13135550062", DefaultUserServer),
+	NewJID("322908887140421", BotServer):   NewJID("13135550065", DefaultUserServer),
+	NewJID("3713961535514771", BotServer):  NewJID("13135550067", DefaultUserServer),
+	NewJID("997884654811738", BotServer):   NewJID("13135550070", DefaultUserServer),
+	NewJID("403157239387035", BotServer):   NewJID("13135550081", DefaultUserServer),
+	NewJID("535242369074963", BotServer):   NewJID("13135550082", DefaultUserServer),
+	NewJID("946293427247659", BotServer):   NewJID("13135550083", DefaultUserServer),
+	NewJID("3664707673802291", BotServer):  NewJID("13135550084", DefaultUserServer),
+	NewJID("1821827464894892", BotServer):  NewJID("13135550085", DefaultUserServer),
+	NewJID("1760312477828757", BotServer):  NewJID("13135550086", DefaultUserServer),
+	NewJID("439480398712216", BotServer):   NewJID("13135550087", DefaultUserServer),
+	NewJID("1876735582800984", BotServer):  NewJID("13135550088", DefaultUserServer),
+	NewJID("984025089825661", BotServer):   NewJID("13135550089", DefaultUserServer),
+	NewJID("1001336351558186", BotServer):  NewJID("13135550090", DefaultUserServer),
+	NewJID("3739346336347061", BotServer):  NewJID("13135550091", DefaultUserServer),
+	NewJID("3632749426974980", BotServer):  NewJID("13135550092", DefaultUserServer),
+	NewJID("427864203481615", BotServer):   NewJID("13135550093", DefaultUserServer),
+	NewJID("1434734570493055", BotServer):  NewJID("13135550094", DefaultUserServer),
+	NewJID("992873449225921", BotServer):   NewJID("13135550095", DefaultUserServer),
+	NewJID("813087747426445", BotServer):   NewJID("13135550096", DefaultUserServer),
+	NewJID("806369104931434", BotServer):   NewJID("13135550098", DefaultUserServer),
+	NewJID("1220982902403148", BotServer):  NewJID("13135550099", DefaultUserServer),
+	NewJID("1365893374104393", BotServer):  NewJID("13135550100", DefaultUserServer),
+	NewJID("686482033622048", BotServer):   NewJID("13135550200", DefaultUserServer),
+	NewJID("1454999838411253", BotServer):  NewJID("13135550201", DefaultUserServer),
+	NewJID("718584497008509", BotServer):   NewJID("13135550202", DefaultUserServer),
+	NewJID("743520384213443", BotServer):   NewJID("13135550301", DefaultUserServer),
+	NewJID("1147715789823789", BotServer):  NewJID("13135550302", DefaultUserServer),
+	NewJID("1173034540372201", BotServer):  NewJID("13135550303", DefaultUserServer),
+	NewJID("974785541030953", BotServer):   NewJID("13135550304", DefaultUserServer),
+	NewJID("1122200255531507", BotServer):  NewJID("13135550305", DefaultUserServer),
+	NewJID("899669714813162", BotServer):   NewJID("13135550306", DefaultUserServer),
+	NewJID("631880108970650", BotServer):   NewJID("13135550307", DefaultUserServer),
+	NewJID("435816149330026", BotServer):   NewJID("13135550308", DefaultUserServer),
+	NewJID("1368717161184556", BotServer):  NewJID("13135550309", DefaultUserServer),
+	NewJID("7849963461784891", BotServer):  NewJID("13135550310", DefaultUserServer),
+	NewJID("3609617065968984", BotServer):  NewJID("13135550312", DefaultUserServer),
+	NewJID("356273980574602", BotServer):   NewJID("13135550313", DefaultUserServer),
+	NewJID("1043447920539760", BotServer):  NewJID("13135550314", DefaultUserServer),
+	NewJID("1052764336525346", BotServer):  NewJID("13135550315", DefaultUserServer),
+	NewJID("2631118843732685", BotServer):  NewJID("13135550316", DefaultUserServer),
+	NewJID("510505411332176", BotServer):   NewJID("13135550317", DefaultUserServer),
+	NewJID("1945664239227513", BotServer):  NewJID("13135550318", DefaultUserServer),
+	NewJID("1518594378764656", BotServer):  NewJID("13135550319", DefaultUserServer),
+	NewJID("1378821579456138", BotServer):  NewJID("13135550320", DefaultUserServer),
+	NewJID("490214716896013", BotServer):   NewJID("13135550321", DefaultUserServer),
+	NewJID("1028577858870699", BotServer):  NewJID("13135550322", DefaultUserServer),
+	NewJID("308915665545959", BotServer):   NewJID("13135550323", DefaultUserServer),
+	NewJID("845884253678900", BotServer):   NewJID("13135550324", DefaultUserServer),
+	NewJID("995031308616442", BotServer):   NewJID("13135550325", DefaultUserServer),
+	NewJID("2787365464763437", BotServer):  NewJID("13135550326", DefaultUserServer),
+	NewJID("1532790990671645", BotServer):  NewJID("13135550327", DefaultUserServer),
+	NewJID("302617036180485", BotServer):   NewJID("13135550328", DefaultUserServer),
+	NewJID("723376723197227", BotServer):   NewJID("13135550329", DefaultUserServer),
+	NewJID("8393570407377966", BotServer):  NewJID("13135550330", DefaultUserServer),
+	NewJID("1931159970680725", BotServer):  NewJID("13135550331", DefaultUserServer),
+	NewJID("401073885688605", BotServer):   NewJID("13135550332", DefaultUserServer),
+	NewJID("2234478453565422", BotServer):  NewJID("13135550334", DefaultUserServer),
+	NewJID("814748673882312", BotServer):   NewJID("13135550335", DefaultUserServer),
+	NewJID("26133635056281592", BotServer): NewJID("13135550336", DefaultUserServer),
+	NewJID("1439804456676119", BotServer):  NewJID("13135550337", DefaultUserServer),
+	NewJID("889851503172161", BotServer):   NewJID("13135550338", DefaultUserServer),
+	NewJID("1018283232836879", BotServer):  NewJID("13135550339", DefaultUserServer),
+	NewJID("1012781386779537", BotServer):  NewJID("13135559000", DefaultUserServer),
+	NewJID("823280953239532", BotServer):   NewJID("13135559001", DefaultUserServer),
+	NewJID("1597090934573334", BotServer):  NewJID("13135559002", DefaultUserServer),
+	NewJID("485965054020343", BotServer):   NewJID("13135559003", DefaultUserServer),
+	NewJID("1033381648363446", BotServer):  NewJID("13135559004", DefaultUserServer),
+	NewJID("491802010206446", BotServer):   NewJID("13135559005", DefaultUserServer),
+	NewJID("1017139033184870", BotServer):  NewJID("13135559006", DefaultUserServer),
+	NewJID("499638325922174", BotServer):   NewJID("13135559008", DefaultUserServer),
+	NewJID("468946335863664", BotServer):   NewJID("13135559009", DefaultUserServer),
+	NewJID("1570389776875816", BotServer):  NewJID("13135559010", DefaultUserServer),
+	NewJID("1004342694328995", BotServer):  NewJID("13135559011", DefaultUserServer),
+	NewJID("1012240323971229", BotServer):  NewJID("13135559012", DefaultUserServer),
+	NewJID("392171787222419", BotServer):   NewJID("13135559013", DefaultUserServer),
+	NewJID("952081212945019", BotServer):   NewJID("13135559016", DefaultUserServer),
+	NewJID("444507875070178", BotServer):   NewJID("13135559017", DefaultUserServer),
+	NewJID("1274819440594668", BotServer):  NewJID("13135559018", DefaultUserServer),
+	NewJID("1397041101147050", BotServer):  NewJID("13135559019", DefaultUserServer),
+	NewJID("425657699872640", BotServer):   NewJID("13135559020", DefaultUserServer),
+	NewJID("532292852562549", BotServer):   NewJID("13135559021", DefaultUserServer),
+	NewJID("705863241720292", BotServer):   NewJID("13135559022", DefaultUserServer),
+	NewJID("476449815183959", BotServer):   NewJID("13135559023", DefaultUserServer),
+	NewJID("488071553854222", BotServer):   NewJID("13135559024", DefaultUserServer),
+	NewJID("468693832665397", BotServer):   NewJID("13135559025", DefaultUserServer),
+	NewJID("517422564037340", BotServer):   NewJID("13135559026", DefaultUserServer),
+	NewJID("819805466613825", BotServer):   NewJID("13135559027", DefaultUserServer),
+	NewJID("1847708235641382", BotServer):  NewJID("13135559028", DefaultUserServer),
+	NewJID("716282970644228", BotServer):   NewJID("13135559029", DefaultUserServer),
+	NewJID("521655380527741", BotServer):   NewJID("13135559030", DefaultUserServer),
+	NewJID("476193631941905", BotServer):   NewJID("13135559031", DefaultUserServer),
+	NewJID("485600497445562", BotServer):   NewJID("13135559032", DefaultUserServer),
+	NewJID("440217235683910", BotServer):   NewJID("13135559033", DefaultUserServer),
+	NewJID("523342446758478", BotServer):   NewJID("13135559034", DefaultUserServer),
+	NewJID("514784864360240", BotServer):   NewJID("13135559035", DefaultUserServer),
+	NewJID("505790121814530", BotServer):   NewJID("13135559036", DefaultUserServer),
+	NewJID("420008964419580", BotServer):   NewJID("13135559037", DefaultUserServer),
+	NewJID("492141680204555", BotServer):   NewJID("13135559038", DefaultUserServer),
+	NewJID("388462787271952", BotServer):   NewJID("13135559039", DefaultUserServer),
+	NewJID("423473920752072", BotServer):   NewJID("13135559040", DefaultUserServer),
+	NewJID("489574180468229", BotServer):   NewJID("13135559041", DefaultUserServer),
+	NewJID("432360635854105", BotServer):   NewJID("13135559042", DefaultUserServer),
+	NewJID("477878201669248", BotServer):   NewJID("13135559043", DefaultUserServer),
+	NewJID("351656951234045", BotServer):   NewJID("13135559044", DefaultUserServer),
+	NewJID("430178036732582", BotServer):   NewJID("13135559045", DefaultUserServer),
+	NewJID("434537312944552", BotServer):   NewJID("13135559046", DefaultUserServer),
+	NewJID("1240614300631808", BotServer):  NewJID("13135559047", DefaultUserServer),
+	NewJID("473135945605128", BotServer):   NewJID("13135559048", DefaultUserServer),
+	NewJID("423669800729310", BotServer):   NewJID("13135559049", DefaultUserServer),
+	NewJID("3685666705015792", BotServer):  NewJID("13135559050", DefaultUserServer),
+	NewJID("504196509016638", BotServer):   NewJID("13135559051", DefaultUserServer),
+	NewJID("346844785189449", BotServer):   NewJID("13135559052", DefaultUserServer),
+	NewJID("504823088911074", BotServer):   NewJID("13135559053", DefaultUserServer),
+	NewJID("402669415797083", BotServer):   NewJID("13135559054", DefaultUserServer),
+	NewJID("490939640234431", BotServer):   NewJID("13135559055", DefaultUserServer),
+	NewJID("875124128063715", BotServer):   NewJID("13135559056", DefaultUserServer),
+	NewJID("468788962654605", BotServer):   NewJID("13135559057", DefaultUserServer),
+	NewJID("562386196354570", BotServer):   NewJID("13135559058", DefaultUserServer),
+	NewJID("372159285928791", BotServer):   NewJID("13135559059", DefaultUserServer),
+	NewJID("531017479591050", BotServer):   NewJID("13135559060", DefaultUserServer),
+	NewJID("1328873881401826", BotServer):  NewJID("13135559061", DefaultUserServer),
+	NewJID("1608363646390484", BotServer):  NewJID("13135559062", DefaultUserServer),
+	NewJID("1229628561554232", BotServer):  NewJID("13135559063", DefaultUserServer),
+	NewJID("348802211530364", BotServer):   NewJID("13135559064", DefaultUserServer),
+	NewJID("3708535859420184", BotServer):  NewJID("13135559065", DefaultUserServer),
+	NewJID("415517767742187", BotServer):   NewJID("13135559066", DefaultUserServer),
+	NewJID("479330341612638", BotServer):   NewJID("13135559067", DefaultUserServer),
+	NewJID("480785414723083", BotServer):   NewJID("13135559068", DefaultUserServer),
+	NewJID("387299107507991", BotServer):   NewJID("13135559069", DefaultUserServer),
+	NewJID("333389813188944", BotServer):   NewJID("13135559070", DefaultUserServer),
+	NewJID("391794130316996", BotServer):   NewJID("13135559071", DefaultUserServer),
+	NewJID("457893470576314", BotServer):   NewJID("13135559072", DefaultUserServer),
+	NewJID("435550496166469", BotServer):   NewJID("13135559073", DefaultUserServer),
+	NewJID("1620162702100689", BotServer):  NewJID("13135559074", DefaultUserServer),
+	NewJID("867491058616043", BotServer):   NewJID("13135559075", DefaultUserServer),
+	NewJID("816224117357759", BotServer):   NewJID("13135559076", DefaultUserServer),
+	NewJID("334065176362830", BotServer):   NewJID("13135559077", DefaultUserServer),
+	NewJID("489973170554709", BotServer):   NewJID("13135559078", DefaultUserServer),
+	NewJID("473060669049665", BotServer):   NewJID("13135559079", DefaultUserServer),
+	NewJID("1221505815643060", BotServer):  NewJID("13135559080", DefaultUserServer),
+	NewJID("889000703096359", BotServer):   NewJID("13135559081", DefaultUserServer),
+	NewJID("475235961979883", BotServer):   NewJID("13135559082", DefaultUserServer),
+	NewJID("3434445653519934", BotServer):  NewJID("13135559084", DefaultUserServer),
+	NewJID("524503026827421", BotServer):   NewJID("13135559085", DefaultUserServer),
+	NewJID("1179639046403856", BotServer):  NewJID("13135559086", DefaultUserServer),
+	NewJID("471563305859144", BotServer):   NewJID("13135559087", DefaultUserServer),
+	NewJID("533896609192881", BotServer):   NewJID("13135559088", DefaultUserServer),
+	NewJID("365443583168041", BotServer):   NewJID("13135559089", DefaultUserServer),
+	NewJID("836082305329393", BotServer):   NewJID("13135559090", DefaultUserServer),
+	NewJID("1056787705969916", BotServer):  NewJID("13135559091", DefaultUserServer),
+	NewJID("503312598958357", BotServer):   NewJID("13135559092", DefaultUserServer),
+	NewJID("3718606738453460", BotServer):  NewJID("13135559093", DefaultUserServer),
+	NewJID("826066052850902", BotServer):   NewJID("13135559094", DefaultUserServer),
+	NewJID("1033611345091888", BotServer):  NewJID("13135559095", DefaultUserServer),
+	NewJID("3868390816783240", BotServer):  NewJID("13135559096", DefaultUserServer),
+	NewJID("7462677740498860", BotServer):  NewJID("13135559097", DefaultUserServer),
+	NewJID("436288576108573", BotServer):   NewJID("13135559098", DefaultUserServer),
+	NewJID("1047559746718900", BotServer):  NewJID("13135559099", DefaultUserServer),
+	NewJID("1099299455255491", BotServer):  NewJID("13135559100", DefaultUserServer),
+	NewJID("1202037301040633", BotServer):  NewJID("13135559101", DefaultUserServer),
+	NewJID("1720619402074074", BotServer):  NewJID("13135559102", DefaultUserServer),
+	NewJID("1030422235101467", BotServer):  NewJID("13135559103", DefaultUserServer),
+	NewJID("827238979523502", BotServer):   NewJID("13135559104", DefaultUserServer),
+	NewJID("1516443722284921", BotServer):  NewJID("13135559105", DefaultUserServer),
+	NewJID("1174442747196709", BotServer):  NewJID("13135559106", DefaultUserServer),
+	NewJID("1653165225503842", BotServer):  NewJID("13135559107", DefaultUserServer),
+	NewJID("1037648777635013", BotServer):  NewJID("13135559108", DefaultUserServer),
+	NewJID("551617757299900", BotServer):   NewJID("13135559109", DefaultUserServer),
+	NewJID("1158813558718726", BotServer):  NewJID("13135559110", DefaultUserServer),
+	NewJID("2463236450542262", BotServer):  NewJID("13135559111", DefaultUserServer),
+	NewJID("1550393252501466", BotServer):  NewJID("13135559112", DefaultUserServer),
+	NewJID("2057065188042796", BotServer):  NewJID("13135559113", DefaultUserServer),
+	NewJID("506163028760735", BotServer):   NewJID("13135559114", DefaultUserServer),
+	NewJID("2065249100538481", BotServer):  NewJID("13135559115", DefaultUserServer),
+	NewJID("1041382867195858", BotServer):  NewJID("13135559116", DefaultUserServer),
+	NewJID("886500209499603", BotServer):   NewJID("13135559117", DefaultUserServer),
+	NewJID("1491615624892655", BotServer):  NewJID("13135559118", DefaultUserServer),
+	NewJID("486563697299617", BotServer):   NewJID("13135559119", DefaultUserServer),
+	NewJID("1175736513679463", BotServer):  NewJID("13135559120", DefaultUserServer),
+	NewJID("491811473512352", BotServer):   NewJID("13165550064", DefaultUserServer),
+}

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

@@ -13,6 +13,7 @@ type BasicCallMeta struct {
 	Timestamp   time.Time
 	CallCreator JID
 	CallID      string
+	GroupJID    JID
 }
 
 type CallRemoteMeta struct {

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"
@@ -42,6 +43,7 @@ type QR struct {
 // wait for the Connected before trying to send anything.
 type PairSuccess struct {
 	ID           types.JID
+	LID          types.JID
 	BusinessName string
 	Platform     string
 }
@@ -49,6 +51,7 @@ type PairSuccess struct {
 // PairError is emitted when a pair-success event is received from the server, but finishing the pairing locally fails.
 type PairError struct {
 	ID           types.JID
+	LID          types.JID
 	BusinessName string
 	Platform     string
 	Error        error
@@ -294,6 +297,7 @@ type Message struct {
 	IsViewOnceV2Extension bool // True if the message was unwrapped from a ViewOnceMessageV2Extension
 	IsDocumentWithCaption bool // True if the message was unwrapped from a DocumentWithCaptionMessage
 	IsLottieSticker       bool // True if the message was unwrapped from a LottieStickerMessage
+	IsBotInvoke           bool // True if the message was unwrapped from a BotInvokeMessage
 	IsEdit                bool // True if the message was unwrapped from an EditedMessage
 
 	// If this event was parsed from a WebMessageInfo (i.e. from a history sync or unavailable message request), the source data is here.
@@ -317,8 +321,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 {
@@ -345,6 +351,10 @@ func (evt *Message) UnwrapRaw() *Message {
 		}
 		evt.Message = evt.Message.GetDeviceSentMessage().GetMessage()
 	}
+	if evt.Message.GetBotInvokeMessage().GetMessage() != nil {
+		evt.Message = evt.Message.GetBotInvokeMessage().GetMessage()
+		evt.IsBotInvoke = true
+	}
 	if evt.Message.GetEphemeralMessage().GetMessage() != nil {
 		evt.Message = evt.Message.GetEphemeralMessage().GetMessage()
 		evt.IsEphemeral = true
@@ -376,6 +386,9 @@ func (evt *Message) UnwrapRaw() *Message {
 		evt.Message = evt.Message.GetEditedMessage().GetMessage()
 		evt.IsEdit = true
 	}
+	if evt.Message != nil && evt.RawMessage != nil && evt.Message.MessageContextInfo == nil && evt.RawMessage.MessageContextInfo != nil {
+		evt.Message.MessageContextInfo = evt.RawMessage.MessageContextInfo
+	}
 	return evt
 }
 
@@ -436,6 +449,11 @@ type JoinedGroup struct {
 	Reason    string          // If the event was triggered by you using an invite link, this will be "invite".
 	Type      string          // "new" if it's a newly created group.
 	CreateKey types.MessageID // If you created the group, this is the same message ID you passed to CreateGroup.
+	// For type new, the user who created the group and added you to it
+	Sender   *types.JID
+	SenderPN *types.JID
+	Notify   string
+
 	types.GroupInfo
 }
 
@@ -444,6 +462,7 @@ type GroupInfo struct {
 	JID       types.JID  // The group ID in question
 	Notify    string     // Seems like a top-level type for the invite
 	Sender    *types.JID // The user who made the change. Doesn't seem to be present when notify=invite
+	SenderPN  *types.JID // The phone number of the user who made the change, if Sender is a LID.
 	Timestamp time.Time  // The time when the change occurred
 
 	Name      *types.GroupName      // Group name change

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

@@ -21,6 +21,7 @@ const (
 type GroupInfo struct {
 	JID      JID
 	OwnerJID JID
+	OwnerPN  JID
 
 	GroupName
 	GroupTopic
@@ -34,7 +35,9 @@ type GroupInfo struct {
 	GroupIsDefaultSub
 	GroupMembershipApprovalMode
 
-	GroupCreated time.Time
+	AddressingMode     AddressingMode
+	GroupCreated       time.Time
+	CreatorCountryCode string
 
 	ParticipantVersionID string
 	Participants         []GroupParticipant
@@ -61,9 +64,10 @@ type GroupIsDefaultSub struct {
 
 // GroupName contains the name of a group along with metadata of who set it and when.
 type GroupName struct {
-	Name      string
-	NameSetAt time.Time
-	NameSetBy JID
+	Name        string
+	NameSetAt   time.Time
+	NameSetBy   JID
+	NameSetByPN JID
 }
 
 // GroupTopic contains the topic (description) of a group along with metadata of who set it and when.
@@ -72,6 +76,7 @@ type GroupTopic struct {
 	TopicID      string
 	TopicSetAt   time.Time
 	TopicSetBy   JID
+	TopicSetByPN JID
 	TopicDeleted bool
 }
 
@@ -92,8 +97,12 @@ type GroupIncognito struct {
 
 // GroupParticipant contains info about a participant of a WhatsApp group chat.
 type GroupParticipant struct {
-	JID          JID
-	LID          JID
+	// The primary JID that should be used to send messages to this participant.
+	// Always equals either the LID or phone number.
+	JID         JID
+	PhoneNumber JID
+	LID         JID
+
 	IsAdmin      bool
 	IsSuperAdmin bool
 

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

@@ -39,9 +39,11 @@ var (
 	ServerJID           = NewJID("", DefaultUserServer)
 	BroadcastServerJID  = NewJID("", BroadcastServer)
 	StatusBroadcastJID  = NewJID("status", BroadcastServer)
-	PSAJID              = NewJID("0", LegacyUserServer)
+	LegacyPSAJID        = NewJID("0", LegacyUserServer)
+	PSAJID              = NewJID("0", DefaultUserServer)
 	OfficialBusinessJID = NewJID("16505361212", LegacyUserServer)
 	MetaAIJID           = NewJID("13135550002", DefaultUserServer)
+	NewMetaAIJID        = NewJID("867051314767696", BotServer)
 )
 
 // MessageID is the internal ID of a WhatsApp message.
@@ -91,18 +93,16 @@ func (jid JID) ToNonAD() JID {
 
 // SignalAddress returns the Signal protocol address for the user.
 func (jid JID) SignalAddress() *signalProtocol.SignalAddress {
+	return signalProtocol.NewSignalAddress(jid.SignalAddressUser(), uint32(jid.Device))
+}
+
+func (jid JID) SignalAddressUser() string {
 	user := jid.User
 	agent := jid.ActualAgent()
 	if agent != 0 {
 		user = fmt.Sprintf("%s_%d", jid.User, agent)
 	}
-	return signalProtocol.NewSignalAddress(user, uint32(jid.Device))
-	// TODO use @lid suffix instead of agent?
-	//suffix := ""
-	//if jid.Server == HiddenUserServer {
-	//	suffix = "@lid"
-	//}
-	//return signalProtocol.NewSignalAddress(user, uint32(jid.Device), suffix)
+	return user
 }
 
 // IsBroadcastList returns true if the JID is a broadcast list, but not the status broadcast.
@@ -113,7 +113,7 @@ func (jid JID) IsBroadcastList() bool {
 var botUserRegex = regexp.MustCompile(`^1313555\d{4}$|^131655500\d{2}$`)
 
 func (jid JID) IsBot() bool {
-	return jid.Server == DefaultUserServer && botUserRegex.MatchString(jid.User) && jid.Device == 0
+	return (jid.Server == DefaultUserServer && botUserRegex.MatchString(jid.User) && jid.Device == 0) || jid.Server == BotServer
 }
 
 // NewADJID creates a new AD JID.

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

@@ -11,6 +11,13 @@ import (
 	"time"
 )
 
+type AddressingMode string
+
+const (
+	AddressingModePN  AddressingMode = "pn"
+	AddressingModeLID AddressingMode = "lid"
+)
+
 // MessageSource contains basic sender and chat information about a message.
 type MessageSource struct {
 	Chat     JID  // The chat where the message was sent.
@@ -18,6 +25,10 @@ type MessageSource struct {
 	IsFromMe bool // Whether the message was sent by the current user instead of someone else.
 	IsGroup  bool // Whether the chat is a group chat or broadcast list.
 
+	AddressingMode AddressingMode // The addressing mode of the message (phone number or LID)
+	SenderAlt      JID            // The alternative address of the user who sent the message
+	RecipientAlt   JID            // The alternative address of the recipient of the message for DMs.
+
 	// When sending a read receipt to a broadcast list message, the Chat is the broadcast list
 	// and Sender is you, so this field contains the recipient of the read receipt.
 	BroadcastListOwner JID
@@ -64,8 +75,15 @@ type MsgBotInfo struct {
 
 // MsgMetaInfo targets <meta>
 type MsgMetaInfo struct {
+	// Bot things
 	TargetID     MessageID
 	TargetSender JID
+	TargetChat   JID
+
+	DeprecatedLIDSession *bool
+
+	ThreadMessageID        MessageID
+	ThreadMessageSenderJID JID
 }
 
 // MessageInfo contains metadata about an incoming message.

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

@@ -56,6 +56,8 @@ type ProfilePictureInfo struct {
 	Type string `json:"type"` // The type of image. Known types include "image" (full res) and "preview" (thumbnail).
 
 	DirectPath string `json:"direct_path"` // The path to the image, probably not very useful
+
+	Hash []byte `json:"hash"` // Some kind of hash (format is unknown)
 }
 
 // ContactInfo contains the cached names of a WhatsApp user.

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

@@ -7,6 +7,7 @@
 package whatsmeow
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net/http"
@@ -28,8 +29,8 @@ var clientVersionRegex = regexp.MustCompile(`"client_revision":(\d+),`)
 //		return err
 //	}
 //	store.SetWAVersion(*latestVer)
-func GetLatestVersion(httpClient *http.Client) (*store.WAVersionContainer, error) {
-	req, err := http.NewRequest(http.MethodGet, socket.Origin, nil)
+func GetLatestVersion(ctx context.Context, httpClient *http.Client) (*store.WAVersionContainer, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, socket.Origin, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to prepare request: %w", err)
 	}

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

@@ -189,7 +189,7 @@ func (cli *Client) UploadNewsletterReader(ctx context.Context, data io.ReadSeeke
 }
 
 func (cli *Client) rawUpload(ctx context.Context, dataToUpload io.Reader, uploadSize uint64, fileHash []byte, appInfo MediaType, newsletter bool, resp *UploadResponse) error {
-	mediaConn, err := cli.refreshMediaConn(false)
+	mediaConn, err := cli.refreshMediaConn(ctx, false)
 	if err != nil {
 		return fmt.Errorf("failed to refresh media connections: %w", err)
 	}