slidge-whatsapp 0.2.3__tar.gz → 0.2.4__tar.gz

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: slidge-whatsapp
-Version: 0.2.3
+Version: 0.2.4
 Summary: A Whatsapp/XMPP gateway.
 License: GNU AFFERO GENERAL PUBLIC LICENSE
                                 Version 3, 19 November 2007
@@ -669,8 +669,7 @@ Author-email: nicoco@nicoco.fr
 Requires-Python: >= 3.11
 Classifier: Topic :: Internet :: XMPP
 Requires-Dist: linkpreview (>=0.11.0)
-Requires-Dist: pybindgen (>=0.22.1)
-Requires-Dist: slidge (>=0.2.4)
+Requires-Dist: slidge (>=0.2.4,<0.3)
 Project-URL: Chat room, https://conference.nicoco.fr:5281/muc_log/slidge/
 Project-URL: Documentation, https://slidge.im/docs/slidge-whatsapp/main
 Project-URL: Homepage, https://codeberg.org/slidge/slidge-whatsapp

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "slidge-whatsapp"
-version = "v0.2.3"
+version = "v0.2.4"
 description = "A Whatsapp/XMPP gateway."
 authors = [
     {name = "nicoco", email = "nicoco@nicoco.fr"},
@@ -15,8 +15,7 @@ requires-python = ">= 3.11"
 keywords = ["xmpp", "gateway", "bridge", "instant messaging", "whatsapp"]
 dependencies = [
     "linkpreview>=0.11.0",
-    "pybindgen>=0.22.1",
-    "slidge>=0.2.4",
+    "slidge>=0.2.4,<0.3",
 ]
 
 [project.urls]

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/slidge_whatsapp/__init__.py

@@ -13,5 +13,5 @@ def main():
     entrypoint("slidge_whatsapp")
 
 
-__version__ = "v0.2.3"
+__version__ = "v0.2.4"
 __all__ = "Gateway", "session", "command", "contact", "config", "group", "main"

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/slidge_whatsapp/event.go

@@ -145,6 +145,7 @@ const (
 	MessageRevoke
 	MessageReaction
 	MessageAttachment
+	MessagePoll
 )
 
 // A Message represents one of many kinds of bidirectional communication payloads, for example, a
@@ -165,6 +166,8 @@ type Message struct {
 	Attachments []Attachment // The list of file (image, video, etc.) attachments contained in this message.
 	Preview     Preview      // A short description for the URL provided in the message body, if any.
 	Location    Location     // The location metadata for messages, if any.
+	Poll        Poll         // The multiple-choice poll contained in the message, if any.
+	Album       Album        // The image album message, if any.
 	MentionJIDs []string     // A list of JIDs mentioned in this message, if any.
 	Receipts    []Receipt    // The receipt statuses for the message, typically provided alongside historical messages.
 	Reactions   []Message    // Reactions attached to message, typically provided alongside historical messages.
@@ -228,6 +231,25 @@ type Location struct {
 	URL     string
 }
 
+// A Poll represents a multiple-choice question, on which each choice might be voted for one or more
+// times.
+type Poll struct {
+	Title   string       // The human-readable name of this poll.
+	Options []PollOption // The list of choices to vote on in the poll.
+}
+
+// A PollOption represents an individual choice within a broader poll.
+type PollOption struct {
+	Title string // The human-readable name for the poll option.
+}
+
+// A Album message represents a collection of media files, typically images and videos.
+type Album struct {
+	IsAlbum    bool // Whether or not the message is an album, regardless of calculated media counts.
+	ImageCount int  // The calculated amount of images in the album, might not be accurate.
+	VideoCount int  // The calculated amount of videos in the album, might not be accurate.
+}
+
 // NewMessageEvent returns event data meant for [Session.propagateEvent] for the primive message
 // event given. Unknown or invalid messages will return an [EventUnknown] event with nil data.
 func newMessageEvent(client *whatsmeow.Client, evt *events.Message) (EventKind, *EventPayload) {
@@ -306,6 +328,35 @@ func newMessageEvent(client *whatsmeow.Client, evt *events.Message) (EventKind,
 		return EventMessage, &EventPayload{Message: message}
 	}
 
+	// Handle poll messages.
+	for _, p := range []*waE2E.PollCreationMessage{
+		evt.Message.GetPollCreationMessageV3(),
+		evt.Message.GetPollCreationMessageV2(),
+		evt.Message.GetPollCreationMessage(),
+	} {
+		if p == nil {
+			continue
+		}
+		message.Kind = MessagePoll
+		message.Poll = Poll{Title: p.GetName()}
+		for _, o := range p.GetOptions() {
+			message.Poll.Options = append(message.Poll.Options, PollOption{
+				Title: o.GetOptionName(),
+			})
+		}
+		return EventMessage, &EventPayload{Message: message}
+	}
+
+	// Handle "album" messages, denoting a grouping of media messages to follow.
+	if a := evt.Message.GetAlbumMessage(); a != nil {
+		message.Album = Album{
+			IsAlbum:    true,
+			ImageCount: int(a.GetExpectedImageCount()),
+			VideoCount: int(a.GetExpectedVideoCount()),
+		}
+		return EventMessage, &EventPayload{Message: message}
+	}
+
 	// Handle message attachments, if any.
 	if attach, context, err := getMessageAttachments(client, evt.Message); err != nil {
 		client.Log.Errorf("Failed getting message attachments: %s", err)

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/slidge_whatsapp/go.mod

@@ -1,15 +1,17 @@
 module codeberg.org/slidge/slidge-whatsapp/slidge_whatsapp
 
-go 1.22.0
+go 1.23.0
+
+toolchain go1.24.1
 
 require (
 	github.com/gen2brain/go-fitz v1.24.14
 	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.24
-	go.mau.fi/libsignal v0.1.1
-	go.mau.fi/whatsmeow v0.0.0-20250104105216-918c879fcd19
-	golang.org/x/image v0.23.0
+	go.mau.fi/libsignal v0.1.2
+	go.mau.fi/whatsmeow v0.0.0-20250307203951-daf102be9698
+	golang.org/x/image v0.25.0
 )
 
 require (
@@ -21,9 +23,9 @@ require (
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/rs/zerolog v1.33.0 // indirect
-	go.mau.fi/util v0.8.4 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	google.golang.org/protobuf v1.36.4 // indirect
+	go.mau.fi/util v0.8.5 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/slidge_whatsapp/go.sum

@@ -37,26 +37,26 @@ github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
 github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.mau.fi/libsignal v0.1.1 h1:m/0PGBh4QKP/I1MQ44ti4C0fMbLMuHb95cmDw01FIpI=
-go.mau.fi/libsignal v0.1.1/go.mod h1:QLs89F/OA3ThdSL2Wz2p+o+fi8uuQUz0e1BRa6ExdBw=
-go.mau.fi/util v0.8.4 h1:mVKlJcXWfVo8ZW3f4vqtjGpqtZqJvX4ETekxawt2vnQ=
-go.mau.fi/util v0.8.4/go.mod h1:MOfGTs1CBuK6ERTcSL4lb5YU7/ujz09eOPVEDckuazY=
-go.mau.fi/whatsmeow v0.0.0-20250104105216-918c879fcd19 h1:uVS+Zct5fF8rSXV9lfs87zoXdge0JXTzVGNkjmZ61UU=
-go.mau.fi/whatsmeow v0.0.0-20250104105216-918c879fcd19/go.mod h1:TLzm2XkwgufONEmiVAsFny+9uBqyEZnUoPrQAfMyuSU=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+go.mau.fi/libsignal v0.1.2 h1:Vs16DXWxSKyzVtI+EEXLCSy5pVWzzCzp/2eqFGvLyP0=
+go.mau.fi/libsignal v0.1.2/go.mod h1:JpnLSSJptn/s1sv7I56uEMywvz8x4YzxeF5OzdPb6PE=
+go.mau.fi/util v0.8.5 h1:PwCAAtcfK0XxZ4sdErJyfBMkTEWoQU33aB7QqDDzQRI=
+go.mau.fi/util v0.8.5/go.mod h1:Ycug9mrbztlahHPEJ6H5r8Nu/xqZaWbE5vPHVWmfz6M=
+go.mau.fi/whatsmeow v0.0.0-20250307203951-daf102be9698 h1:JRng1Qa5ZyOx59Cprle+DNf8LN0MAT2WJZis38hwuHQ=
+go.mau.fi/whatsmeow v0.0.0-20250307203951-daf102be9698/go.mod h1:6hRrUtDWI2wTRClOd6m17GwrFE2a8/p5R4pjJsIVn+U=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
+golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 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.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/slidge_whatsapp/session.go

@@ -305,7 +305,6 @@ func (s *Session) getMessagePayload(message Message) *waE2E.Message {
 		}
 
 		payload.ExtendedTextMessage.MatchedText = &message.Preview.URL
-		payload.ExtendedTextMessage.CanonicalURL = &message.Preview.URL
 		payload.ExtendedTextMessage.Title = &message.Preview.Title
 		payload.ExtendedTextMessage.Description = &message.Preview.Description
 

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.4}/slidge_whatsapp/session.py

@@ -138,12 +138,12 @@ class Session(BaseSession[str, Recipient]):
             # not updated.
             if self.__connected.done():
                 if data.Connect.Error != "":
+                    self.send_gateway_status("Connection error", show="dnd")
+                    self.send_gateway_message(data.Connect.Error)
+                else:
                     self.send_gateway_status(
                         self.__get_connected_status_message(), show="chat"
                     )
-                else:
-                    self.send_gateway_status("Connection error", show="dnd")
-                    self.send_gateway_message(data.Connect.Error)
             elif data.Connect.Error != "":
                 self.xmpp.loop.call_soon_threadsafe(
                     self.__connected.set_exception,
@@ -160,7 +160,9 @@ class Session(BaseSession[str, Recipient]):
             self.send_gateway_message(MESSAGE_LOGGED_OUT)
             self.send_gateway_status("Logged out", show="away")
         elif event == whatsapp.EventContact:
-            await self.contacts.add_whatsapp_contact(data.Contact)
+            contact = await self.contacts.add_whatsapp_contact(data.Contact)
+            if contact is not None:
+                await contact.add_to_roster()
         elif event == whatsapp.EventGroup:
             await self.bookmarks.add_whatsapp_group(data.Group)
         elif event == whatsapp.EventPresence:
@@ -263,6 +265,17 @@ class Session(BaseSession[str, Recipient]):
             contact.react(
                 legacy_msg_id=message.ID, emojis=emojis, carbon=message.IsCarbon
             )
+        elif message.Kind == whatsapp.MessagePoll:
+            body = "🗳 %s" % message.Poll.Title
+            for option in message.Poll.Options:
+                body = body + "\n☐ %s" % option.Title
+            contact.send_text(
+                body=body,
+                legacy_msg_id=message.ID,
+                when=message_timestamp,
+                reply_to=reply_to,
+                carbon=message.IsCarbon,
+            )
         for receipt in message.Receipts:
             await self.handle_receipt(receipt)
         for reaction in message.Reactions:
@@ -560,6 +573,13 @@ class Session(BaseSession[str, Recipient]):
                 body = body + ";u=%d" % message.Location.Accuracy
         if message.IsForwarded:
             body = "↱ Forwarded message:\n " + add_quote_prefix(body)
+        if message.Album.IsAlbum:
+            body = body + "Album: "
+            if message.Album.ImageCount > 0:
+                body = body + "%d photos, " % message.Album.ImageCount
+            if message.Album.VideoCount > 0:
+                body = body + "%d videos" % message.Album.VideoCount
+            body = body.rstrip(" ,:")
         return body
 
     async def __get_reply_to(