slidge-whatsapp 0.3.1__tar.gz → 0.3.3__tar.gz

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge-whatsapp
-Version: 0.3.1
+Version: 0.3.3
 Summary: A WhatsApp/XMPP gateway
 License-Expression: AGPL-3.0-or-later
 License-File: LICENSE

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "linkpreview>=0.11.0",
     "slidge>=0.3.0beta2,<0.4",
 ]
-version = "0.3.1"
+version = "0.3.3"
 
 [project.urls]
 Homepage = "https://codeberg.org/slidge/slidge-whatsapp"
@@ -76,23 +76,18 @@ enable = false
 [tool.poetry-dynamic-versioning.substitution]
 files = []
 
-# this should not be any problem and fixes compatibility with pycharm
-# when installing anything (such as slidge core) in editable mode
-[tool.uv]
-config-settings = { editable_mode = "compat" }
-
 [tool.uv.sources]
 slidge-sphinx-extensions = { index = "codeberg" }
 
-[[tool.uv.index]]
-name = "pypi"
-url = "https://pypi.org/simple"
-
 [[tool.uv.index]]
 name = "codeberg"
 url = "https://codeberg.org/api/packages/slidge/pypi/simple"
 publish-url = "https://codeberg.org/api/packages/slidge/pypi"
 
+[[tool.uv.index]]
+name = "pypi"
+url = "https://pypi.org/simple"
+
 [tool.mypy]
 files = ["slidge_whatsapp"]
 exclude = [

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/go.mod

@@ -9,9 +9,9 @@ require (
 	github.com/go-python/gopy v0.4.11-0.20241206185020-5f285b890023
 	github.com/h2non/filetype v1.1.3
 	github.com/mattn/go-sqlite3 v1.14.32
-	go.mau.fi/libsignal v0.2.0
-	go.mau.fi/whatsmeow v0.0.0-20251003154939-d562355c4d82
-	golang.org/x/image v0.31.0
+	go.mau.fi/libsignal v0.2.1
+	go.mau.fi/whatsmeow v0.0.0-20251016095441-02c50743e601
+	golang.org/x/image v0.32.0
 )
 
 require (
@@ -27,11 +27,11 @@ require (
 	github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 // indirect
 	github.com/rs/zerolog v1.34.0 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.30 // indirect
-	go.mau.fi/util v0.9.1 // indirect
-	golang.org/x/crypto v0.42.0 // indirect
-	golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
-	golang.org/x/net v0.44.0 // indirect
-	golang.org/x/sys v0.36.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
+	go.mau.fi/util v0.9.2 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/exp v0.0.0-20251017212417-90e834f514db // indirect
+	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 )

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/go.sum

@@ -53,27 +53,27 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE=
 github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
-go.mau.fi/libsignal v0.2.0 h1:oRXj3OHhEJq51BFEM8/50UZblmWiTYH93hsNTPcbk90=
-go.mau.fi/libsignal v0.2.0/go.mod h1:tvjoDsMejgT38CXTXwqaYu8itBiY8O2Mb6biWvZBb9k=
-go.mau.fi/util v0.9.1 h1:A+XKHRsjKkFi2qOm4RriR1HqY2hoOXNS3WFHaC89r2Y=
-go.mau.fi/util v0.9.1/go.mod h1:M0bM9SyaOWJniaHs9hxEzz91r5ql6gYq6o1q5O1SsjQ=
-go.mau.fi/whatsmeow v0.0.0-20251003154939-d562355c4d82 h1:sLwBH2Q70EoOt8uCZb1gCKGwp2hdZG+ObqpXHWJ4sNk=
-go.mau.fi/whatsmeow v0.0.0-20251003154939-d562355c4d82/go.mod h1:dvltpCF0rOHbbur25DHbQ3Ovi747z2Pm11S2M7p1T74=
-golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
-golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
-golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 h1:TQwNpfvNkxAVlItJf6Cr5JTsVZoC/Sj7K3OZv2Pc14A=
-golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
-golang.org/x/image v0.31.0 h1:mLChjE2MV6g1S7oqbXC0/UcKijjm5fnJLUYKIYrLESA=
-golang.org/x/image v0.31.0/go.mod h1:R9ec5Lcp96v9FTF+ajwaH3uGxPH4fKfHHAVbUILxghA=
-golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
-golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
+go.mau.fi/libsignal v0.2.1 h1:vRZG4EzTn70XY6Oh/pVKrQGuMHBkAWlGRC22/85m9L0=
+go.mau.fi/libsignal v0.2.1/go.mod h1:iVvjrHyfQqWajOUaMEsIfo3IqgVMrhWcPiiEzk7NgoU=
+go.mau.fi/util v0.9.2 h1:+S4Z03iCsGqU2WY8X2gySFsFjaLlUHFRDVCYvVwynKM=
+go.mau.fi/util v0.9.2/go.mod h1:055elBBCJSdhRsmub7ci9hXZPgGr1U6dYg44cSgRgoU=
+go.mau.fi/whatsmeow v0.0.0-20251016095441-02c50743e601 h1:6tytDOaqizeBVG3OdEojIiJtZXY3DWMvFKNkjbxq4tI=
+go.mau.fi/whatsmeow v0.0.0-20251016095441-02c50743e601/go.mod h1:VJq+D05Fe5EroZxs2StEYD/AsWJO2aQ7Niucz7lCvao=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/exp v0.0.0-20251017212417-90e834f514db h1:by6IehL4BH5k3e3SJmcoNbOobMey2SLpAF79iPOEBvw=
+golang.org/x/exp v0.0.0-20251017212417-90e834f514db/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
+golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ=
+golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
 google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/libsignal/session/SessionCipher.go

@@ -2,6 +2,7 @@ package session
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"go.mau.fi/libsignal/cipher"
@@ -253,12 +254,16 @@ func (d *Cipher) DecryptWithRecord(ctx context.Context, sessionRecord *record.Se
 
 	// If we received an error using the current session state, loop
 	// through all previous states.
-	if err != nil {
+	if errors.Is(err, signalerror.ErrOldCounter) {
+		return nil, nil, err
+	} else if err != nil {
 		logger.Warning(err)
 		for i, state := range previousStates {
 			// Try decrypting the message with previous states
 			plaintext, messageKeys, err = d.DecryptWithState(ctx, state, ciphertext)
-			if err != nil {
+			if errors.Is(err, signalerror.ErrOldCounter) {
+				return nil, nil, err
+			} else if err != nil {
 				continue
 			}
 

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/util/dbutil/module.go

@@ -114,5 +114,6 @@
 // whole file is limited to that dialect.
 //
 // If the filter ends with `(lines commented)`, then ALL lines chosen
-// by the filter will be uncommented.
+// by the filter will be uncommented. The `--` comment prefix must be
+// at the beginning of the line with no whitespace ahead of it.
 package dbutil

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/util/dbutil/upgradetable.go

@@ -173,6 +173,9 @@ func (db *Database) filterSQLUpgrade(lines [][]byte) (string, error) {
 				}
 				if dialect == db.Dialect {
 					if uncomment {
+						if !bytes.HasPrefix(lines[i], []byte("--")) {
+							return "", fmt.Errorf("line %d isn't commented even though the dialect filter claimed it is (-- must be at beginning of line)", i+1)
+						}
 						output = append(output, bytes.TrimPrefix(lines[i], []byte("--")))
 					} else {
 						output = append(output, lines[i])

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/util/exsync/syncmap.go

@@ -6,7 +6,11 @@
 
 package exsync
 
-import "sync"
+import (
+	"iter"
+	"maps"
+	"sync"
+)
 
 // Map is a simple map with a built-in mutex.
 type Map[Key comparable, Value any] struct {
@@ -15,8 +19,13 @@ type Map[Key comparable, Value any] struct {
 }
 
 func NewMap[Key comparable, Value any]() *Map[Key, Value] {
+	return NewMapWithData(make(map[Key]Value))
+}
+
+// NewMapWithData constructs a Map with the given map as data. Accessing the map directly after passing it here is not safe.
+func NewMapWithData[Key comparable, Value any](data map[Key]Value) *Map[Key, Value] {
 	return &Map[Key, Value]{
-		data: make(map[Key]Value),
+		data: data,
 	}
 }
 
@@ -77,18 +86,50 @@ func (sm *Map[Key, Value]) GetOrSet(key Key, value Value) (actual Value, wasGet
 	return
 }
 
+// Clear removes all items from the map.
+func (sm *Map[Key, Value]) Clear() {
+	sm.lock.Lock()
+	clear(sm.data)
+	sm.lock.Unlock()
+}
+
+// Len returns the number of items in the map.
+func (sm *Map[Key, Value]) Len() int {
+	sm.lock.RLock()
+	l := len(sm.data)
+	sm.lock.RUnlock()
+	return l
+}
+
+// CopyFrom copies all key/value pairs from the given map into this map, overriding any existing keys.
+// Keys present in this map but not in the given map are not removed.
+func (sm *Map[Key, Value]) CopyFrom(other map[Key]Value) {
+	sm.lock.Lock()
+	maps.Copy(sm.data, other)
+	sm.lock.Unlock()
+}
+
 // Clone returns a copy of the map.
 func (sm *Map[Key, Value]) Clone() *Map[Key, Value] {
-	return &Map[Key, Value]{data: sm.CopyData()}
+	return NewMapWithData(sm.CopyData())
 }
 
 // CopyData returns a copy of the data in the map as a normal (non-atomic) map.
 func (sm *Map[Key, Value]) CopyData() map[Key]Value {
 	sm.lock.RLock()
-	copied := make(map[Key]Value, len(sm.data))
-	for key, value := range sm.data {
-		copied[key] = value
-	}
+	copied := maps.Clone(sm.data)
 	sm.lock.RUnlock()
 	return copied
 }
+
+func (sm *Map[Key, Value]) Iter() iter.Seq2[Key, Value] {
+	return func(yield func(Key, Value) bool) {
+		sm.lock.RLock()
+		defer sm.lock.RUnlock()
+		for k, v := range sm.data {
+			if !yield(k, v) {
+				return
+			}
+		}
+	}
+}

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/util/exsync/syncset.go

@@ -7,6 +7,7 @@
 package exsync
 
 import (
+	"iter"
 	"sync"
 )
 
@@ -134,3 +135,15 @@ func (s *Set[T]) AsList() []T {
 	s.l.RUnlock()
 	return list
 }
+
+func (s *Set[T]) Iter() iter.Seq[T] {
+	return func(yield func(T) bool) {
+		s.l.RLock()
+		defer s.l.RUnlock()
+		for item := range s.m {
+			if !yield(item) {
+				return
+			}
+		}
+	}
+}

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/util/jsontime/helpers.go

@@ -10,12 +10,19 @@ import (
 	"time"
 )
 
+func zeroSafeUnixToTime(val int64, fn func(int64) time.Time) time.Time {
+	if val == 0 {
+		return time.Time{}
+	}
+	return fn(val)
+}
+
 func UM(time time.Time) UnixMilli {
 	return UnixMilli{Time: time}
 }
 
 func UMInt(ts int64) UnixMilli {
-	return UM(time.UnixMilli(ts))
+	return UM(zeroSafeUnixToTime(ts, time.UnixMilli))
 }
 
 func UnixMilliNow() UnixMilli {
@@ -26,8 +33,8 @@ func UMicro(time time.Time) UnixMicro {
 	return UnixMicro{Time: time}
 }
 
-func UMicroInto(ts int64) UnixMicro {
-	return UMicro(time.UnixMicro(ts))
+func UMicroInt(ts int64) UnixMicro {
+	return UMicro(zeroSafeUnixToTime(ts, time.UnixMicro))
 }
 
 func UnixMicroNow() UnixMicro {
@@ -39,7 +46,9 @@ func UN(time time.Time) UnixNano {
 }
 
 func UNInt(ts int64) UnixNano {
-	return UN(time.Unix(0, ts))
+	return UN(zeroSafeUnixToTime(ts, func(i int64) time.Time {
+		return time.Unix(0, i)
+	}))
 }
 
 func UnixNanoNow() UnixNano {
@@ -51,7 +60,9 @@ func U(time time.Time) Unix {
 }
 
 func UInt(ts int64) Unix {
-	return U(time.Unix(ts, 0))
+	return U(zeroSafeUnixToTime(ts, func(i int64) time.Time {
+		return time.Unix(i, 0)
+	}))
 }
 
 func UnixNow() Unix {

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/util/jsontime/integer.go

@@ -57,6 +57,13 @@ func anyIntegerToTime(src any, unixConv func(int64) time.Time, into *time.Time)
 	return nil
 }
 
+func zeroSafeUnix(t time.Time, method func(time.Time) int64) int64 {
+	if t.IsZero() {
+		return 0
+	}
+	return method(t)
+}
+
 var _ sql.Scanner = &UnixMilli{}
 var _ driver.Valuer = UnixMilli{}
 
@@ -65,9 +72,6 @@ type UnixMilli struct {
 }
 
 func (um UnixMilli) MarshalJSON() ([]byte, error) {
-	if um.IsZero() {
-		return []byte{'0'}, nil
-	}
 	return json.Marshal(um.UnixMilli())
 }
 
@@ -83,6 +87,11 @@ func (um *UnixMilli) Scan(src any) error {
 	return anyIntegerToTime(src, time.UnixMilli, &um.Time)
 }
 
+func (um UnixMilli) Unix() int64      { return zeroSafeUnix(um.Time, time.Time.Unix) }
+func (um UnixMilli) UnixMilli() int64 { return zeroSafeUnix(um.Time, time.Time.UnixMilli) }
+func (um UnixMilli) UnixMicro() int64 { return zeroSafeUnix(um.Time, time.Time.UnixMicro) }
+func (um UnixMilli) UnixNano() int64  { return zeroSafeUnix(um.Time, time.Time.UnixNano) }
+
 var _ sql.Scanner = &UnixMicro{}
 var _ driver.Valuer = UnixMicro{}
 
@@ -91,9 +100,6 @@ type UnixMicro struct {
 }
 
 func (um UnixMicro) MarshalJSON() ([]byte, error) {
-	if um.IsZero() {
-		return []byte{'0'}, nil
-	}
 	return json.Marshal(um.UnixMicro())
 }
 
@@ -109,6 +115,11 @@ func (um *UnixMicro) Scan(src any) error {
 	return anyIntegerToTime(src, time.UnixMicro, &um.Time)
 }
 
+func (um UnixMicro) Unix() int64      { return zeroSafeUnix(um.Time, time.Time.Unix) }
+func (um UnixMicro) UnixMilli() int64 { return zeroSafeUnix(um.Time, time.Time.UnixMilli) }
+func (um UnixMicro) UnixMicro() int64 { return zeroSafeUnix(um.Time, time.Time.UnixMicro) }
+func (um UnixMicro) UnixNano() int64  { return zeroSafeUnix(um.Time, time.Time.UnixNano) }
+
 var _ sql.Scanner = &UnixNano{}
 var _ driver.Valuer = UnixNano{}
 
@@ -117,9 +128,6 @@ type UnixNano struct {
 }
 
 func (un UnixNano) MarshalJSON() ([]byte, error) {
-	if un.IsZero() {
-		return []byte{'0'}, nil
-	}
 	return json.Marshal(un.UnixNano())
 }
 
@@ -139,14 +147,16 @@ func (un *UnixNano) Scan(src any) error {
 	}, &un.Time)
 }
 
+func (un UnixNano) Unix() int64      { return zeroSafeUnix(un.Time, time.Time.Unix) }
+func (un UnixNano) UnixMilli() int64 { return zeroSafeUnix(un.Time, time.Time.UnixMilli) }
+func (un UnixNano) UnixMicro() int64 { return zeroSafeUnix(un.Time, time.Time.UnixMicro) }
+func (un UnixNano) UnixNano() int64  { return zeroSafeUnix(un.Time, time.Time.UnixNano) }
+
 type Unix struct {
 	time.Time
 }
 
 func (u Unix) MarshalJSON() ([]byte, error) {
-	if u.IsZero() {
-		return []byte{'0'}, nil
-	}
 	return json.Marshal(u.Unix())
 }
 
@@ -168,3 +178,8 @@ func (u *Unix) Scan(src any) error {
 		return time.Unix(i, 0)
 	}, &u.Time)
 }
+
+func (u Unix) Unix() int64      { return zeroSafeUnix(u.Time, time.Time.Unix) }
+func (u Unix) UnixMilli() int64 { return zeroSafeUnix(u.Time, time.Time.UnixMilli) }
+func (u Unix) UnixMicro() int64 { return zeroSafeUnix(u.Time, time.Time.UnixMicro) }
+func (u Unix) UnixNano() int64  { return zeroSafeUnix(u.Time, time.Time.UnixNano) }

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/whatsmeow/appstate/encode.go

@@ -93,30 +93,18 @@ func BuildPin(target types.JID, pin bool) PatchInfo {
 //
 // Archiving a chat will also unpin it automatically.
 func BuildArchive(target types.JID, archive bool, lastMessageTimestamp time.Time, lastMessageKey *waCommon.MessageKey) PatchInfo {
-	if lastMessageTimestamp.IsZero() {
-		lastMessageTimestamp = time.Now()
-	}
 	archiveMutationInfo := MutationInfo{
 		Index:   []string{IndexArchive, target.String()},
 		Version: 3,
 		Value: &waSyncAction.SyncActionValue{
 			ArchiveChatAction: &waSyncAction.ArchiveChatAction{
-				Archived: &archive,
-				MessageRange: &waSyncAction.SyncActionMessageRange{
-					LastMessageTimestamp: proto.Int64(lastMessageTimestamp.Unix()),
-					// TODO set LastSystemMessageTimestamp?
-				},
+				Archived:     &archive,
+				MessageRange: newMessageRange(lastMessageTimestamp, lastMessageKey),
+				// TODO set LastSystemMessageTimestamp?
 			},
 		},
 	}
 
-	if lastMessageKey != nil {
-		archiveMutationInfo.Value.ArchiveChatAction.MessageRange.Messages = []*waSyncAction.SyncActionMessage{{
-			Key:       lastMessageKey,
-			Timestamp: proto.Int64(lastMessageTimestamp.Unix()),
-		}}
-	}
-
 	mutations := []MutationInfo{archiveMutationInfo}
 	if archive {
 		mutations = append(mutations, newPinMutationInfo(target, false))
@@ -132,20 +120,9 @@ func BuildArchive(target types.JID, archive bool, lastMessageTimestamp time.Time
 
 // BuildMarkChatAsRead builds an app state patch for marking a chat as read or unread.
 func BuildMarkChatAsRead(target types.JID, read bool, lastMessageTimestamp time.Time, lastMessageKey *waCommon.MessageKey) PatchInfo {
-	if lastMessageTimestamp.IsZero() {
-		lastMessageTimestamp = time.Now()
-	}
 	action := &waSyncAction.MarkChatAsReadAction{
-		Read: proto.Bool(read),
-		MessageRange: &waSyncAction.SyncActionMessageRange{
-			LastMessageTimestamp: proto.Int64(lastMessageTimestamp.Unix()),
-		},
-	}
-	if lastMessageKey != nil {
-		action.MessageRange.Messages = []*waSyncAction.SyncActionMessage{{
-			Key:       lastMessageKey,
-			Timestamp: proto.Int64(lastMessageTimestamp.Unix()),
-		}}
+		Read:         proto.Bool(read),
+		MessageRange: newMessageRange(lastMessageTimestamp, lastMessageKey),
 	}
 
 	return PatchInfo{
@@ -355,3 +332,37 @@ func (proc *Processor) EncodePatch(ctx context.Context, keyID []byte, state Hash
 
 	return result, nil
 }
+
+// BuildDeleteChat builds an app state patch for deleting a chat.
+func BuildDeleteChat(target types.JID, lastMessageTimestamp time.Time, lastMessageKey *waCommon.MessageKey) PatchInfo {
+	action := &waSyncAction.DeleteChatAction{
+		MessageRange: newMessageRange(lastMessageTimestamp, lastMessageKey),
+	}
+
+	return PatchInfo{
+		Type: WAPatchRegular,
+		Mutations: []MutationInfo{{
+			Index:   []string{IndexDeleteChat, target.String()},
+			Version: 6,
+			Value: &waSyncAction.SyncActionValue{
+				DeleteChatAction: action,
+			},
+		}},
+	}
+}
+
+func newMessageRange(lastMessageTimestamp time.Time, lastMessageKey *waCommon.MessageKey) *waSyncAction.SyncActionMessageRange {
+	if lastMessageTimestamp.IsZero() {
+		lastMessageTimestamp = time.Now()
+	}
+	messageRange := &waSyncAction.SyncActionMessageRange{
+		LastMessageTimestamp: proto.Int64(lastMessageTimestamp.Unix()),
+	}
+	if lastMessageKey != nil {
+		messageRange.Messages = []*waSyncAction.SyncActionMessage{{
+			Key:       lastMessageKey,
+			Timestamp: proto.Int64(lastMessageTimestamp.Unix()),
+		}}
+	}
+	return messageRange
+}

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/whatsmeow/appstate.go

@@ -351,13 +351,17 @@ func (cli *Client) requestAppStateKeys(ctx context.Context, rawKeyIDs [][]byte)
 	}
 }
 
-// SendAppState sends the given app state patch, then resyncs that app state type from the server
+// SendAppState sends the given app state patch, then triggers a background resync of that app state type
 // to update local caches and send events for the updates.
 //
 // You can use the Build methods in the appstate package to build the parameter for this method, e.g.
 //
 //	cli.SendAppState(ctx, appstate.BuildMute(targetJID, true, 24 * time.Hour))
 func (cli *Client) SendAppState(ctx context.Context, patch appstate.PatchInfo) error {
+	return cli.sendAppState(ctx, patch, false)
+}
+
+func (cli *Client) sendAppState(ctx context.Context, patch appstate.PatchInfo, waitForSync bool) error {
 	if cli == nil {
 		return ErrClientIsNil
 	}
@@ -412,5 +416,16 @@ func (cli *Client) SendAppState(ctx context.Context, patch appstate.PatchInfo) e
 		return fmt.Errorf("%w: %s", ErrAppStateUpdate, respCollection.XMLString())
 	}
 
-	return cli.FetchAppState(ctx, patch.Type, false, false)
+	if waitForSync {
+		return cli.FetchAppState(ctx, patch.Type, false, false)
+	}
+
+	go func() {
+		err := cli.FetchAppState(ctx, patch.Type, false, false)
+		if err != nil {
+			cli.Log.Errorf("Failed to resync app state %s after sending update: %v", patch.Type, err)
+		}
+	}()
+
+	return nil
 }

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/whatsmeow/armadillomessage.go

@@ -22,10 +22,11 @@ import (
 	"go.mau.fi/whatsmeow/types/events"
 )
 
-func (cli *Client) handleDecryptedArmadillo(ctx context.Context, info *types.MessageInfo, decrypted []byte, retryCount int) (handlerFailed bool) {
+func (cli *Client) handleDecryptedArmadillo(ctx context.Context, info *types.MessageInfo, decrypted []byte, retryCount int) (handlerFailed, protobufFailed bool) {
 	dec, err := decodeArmadillo(decrypted)
 	if err != nil {
 		cli.Log.Warnf("Failed to decode armadillo message from %s: %v", info.SourceString(), err)
+		protobufFailed = true
 		return
 	}
 	dec.Info = *info

{slidge_whatsapp-0.3.1 → slidge_whatsapp-0.3.3}/slidge_whatsapp/vendor/go.mau.fi/whatsmeow/internals.go

@@ -67,7 +67,11 @@ func (int *DangerousInternalClient) RequestAppStateKeys(ctx context.Context, raw
 	int.c.requestAppStateKeys(ctx, rawKeyIDs)
 }
 
-func (int *DangerousInternalClient) HandleDecryptedArmadillo(ctx context.Context, info *types.MessageInfo, decrypted []byte, retryCount int) (handlerFailed bool) {
+func (int *DangerousInternalClient) SendAppState(ctx context.Context, patch appstate.PatchInfo, waitForSync bool) error {
+	return int.c.sendAppState(ctx, patch, waitForSync)
+}
+
+func (int *DangerousInternalClient) HandleDecryptedArmadillo(ctx context.Context, info *types.MessageInfo, decrypted []byte, retryCount int) (handlerFailed, protobufFailed bool) {
 	return int.c.handleDecryptedArmadillo(ctx, info, decrypted, retryCount)
 }
 
@@ -479,6 +483,10 @@ func (int *DangerousInternalClient) UploadPreKeys(ctx context.Context) {
 	int.c.uploadPreKeys(ctx)
 }
 
+func (int *DangerousInternalClient) FetchPreKeysNoError(ctx context.Context, retryDevices []types.JID) map[types.JID]*prekey.Bundle {
+	return int.c.fetchPreKeysNoError(ctx, retryDevices)
+}
+
 func (int *DangerousInternalClient) FetchPreKeys(ctx context.Context, users []types.JID) (map[types.JID]preKeyResp, error) {
 	return int.c.fetchPreKeys(ctx, users)
 }
@@ -511,16 +519,20 @@ func (int *DangerousInternalClient) ParseReceipt(node *waBinary.Node) (*events.R
 	return int.c.parseReceipt(node)
 }
 
+func (int *DangerousInternalClient) BackgroundIfAsyncAck(fn func()) {
+	int.c.backgroundIfAsyncAck(fn)
+}
+
 func (int *DangerousInternalClient) MaybeDeferredAck(ctx context.Context, node *waBinary.Node) func(...*bool) {
 	return int.c.maybeDeferredAck(ctx, node)
 }
 
-func (int *DangerousInternalClient) SendAck(node *waBinary.Node) {
-	int.c.sendAck(node)
+func (int *DangerousInternalClient) SendAck(node *waBinary.Node, error int) {
+	int.c.sendAck(node, error)
 }
 
-func (int *DangerousInternalClient) SendMessageReceipt(info *types.MessageInfo) {
-	int.c.sendMessageReceipt(info)
+func (int *DangerousInternalClient) SendMessageReceipt(info *types.MessageInfo, node *waBinary.Node) {
+	int.c.sendMessageReceipt(info, node)
 }
 
 func (int *DangerousInternalClient) GenerateRequestID() string {
@@ -611,7 +623,7 @@ func (int *DangerousInternalClient) PrepareMessageNodeV3(ctx context.Context, to
 	return int.c.prepareMessageNodeV3(ctx, to, ownID, id, payload, skdm, msgAttrs, frankingTag, participants, timings)
 }
 
-func (int *DangerousInternalClient) EncryptMessageForDevicesV3(ctx context.Context, allDevices []types.JID, ownID types.JID, id string, payload *waMsgTransport.MessageTransport_Payload, skdm *waMsgTransport.MessageTransport_Protocol_Ancillary_SenderKeyDistributionMessage, dsm *waMsgTransport.MessageTransport_Protocol_Integral_DeviceSentMessage, encAttrs waBinary.Attrs) []waBinary.Node {
+func (int *DangerousInternalClient) EncryptMessageForDevicesV3(ctx context.Context, allDevices []types.JID, ownID types.JID, id string, payload *waMsgTransport.MessageTransport_Payload, skdm *waMsgTransport.MessageTransport_Protocol_Ancillary_SenderKeyDistributionMessage, dsm *waMsgTransport.MessageTransport_Protocol_Integral_DeviceSentMessage, encAttrs waBinary.Attrs) ([]waBinary.Node, error) {
 	return int.c.encryptMessageForDevicesV3(ctx, allDevices, ownID, id, payload, skdm, dsm, encAttrs)
 }