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

slidge_whatsapp-0.2.5/PKG-INFO

@@ -0,0 +1,63 @@
+Metadata-Version: 2.3
+Name: slidge-whatsapp
+Version: 0.2.5
+Summary: A WhatsApp/XMPP gateway
+License: AGPL-3.0-or-later
+Keywords: xmpp,gateway,bridge,instant messaging,chat,whatsapp
+Author: deuill
+Author-email: alex@deuill.org
+Requires-Python: >= 3.11
+Classifier: Topic :: Internet :: XMPP
+Requires-Dist: linkpreview (>=0.11.0)
+Requires-Dist: slidge (>=0.2.4,<0.3)
+Project-URL: Chat room, https://slidge.im/xmpp-web/#/guest?join=slidge@conference.nicoco.fr
+Project-URL: Documentation, https://slidge.im/docs/slidge-whatsapp/main
+Project-URL: Homepage, https://codeberg.org/slidge/slidge-whatsapp
+Project-URL: Issues, https://codeberg.org/slidge/slidge-whatsapp/issues
+Project-URL: Repository, https://codeberg.org/slidge/slidge-whatsapp
+Project-URL: changelog, https://codeberg.org/slidge/slidge-whatsapp/releases
+Description-Content-Type: text/markdown
+
+# slidge-whatsapp
+
+A
+[feature-rich](https://slidge.im/docs/slidge-whatsapp/main/user/features.html)
+[WhatsApp](https://whatsapp.com) to
+[XMPP](https://xmpp.org/) puppeteering
+[gateway](https://xmpp.org/extensions/xep-0100.html), based on
+[slidge](https://slidge.im) and
+[whatsmeow](https://github.com/tulir/whatsmeow).
+
+[![CI pipeline status](https://ci.codeberg.org/api/badges/14066/status.svg)](https://ci.codeberg.org/repos/14066)
+[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://slidge.im/xmpp-web/#/guest?join=slidge@conference.nicoco.fr)
+[![PyPI package version](https://badge.fury.io/py/slidge-whatsapp.svg)](https://pypi.org/project/slidge-whatsapp/)
+
+
+
+
+slidge-whatsapp lets you chat with users of WhatsApp without leaving your favorite XMPP client.
+
+## Quickstart
+
+```sh
+docker run codeberg.org/slidge/slidge-whatsapp \  # works with podman too
+    --jid whatsapp.example.org \  # can be whatever you want it to be
+    --secret some-secret \  # must match your XMPP server config
+    --home-dir /somewhere/writeable  # for data persistence
+```
+
+Use the `:latest-amd64` tag for the latest release, `:vX.X.X-amd64` for release X.X.X, and `:main-amd64`
+for the bleeding edge.`-arm64` images are also available.
+
+If you do not like containers, other installation methods are detailed
+[in the docs](https://slidge.im/docs/slidge-whatsapp/main/admin/install.html).
+
+## Documentation
+
+Hosted on [codeberg pages](https://slidge.im/docs/slidge-whatsapp/main/).
+
+## Contributing
+
+Contributions are **very** welcome, and we tried our best to make it easy
+to start hacking on slidge-whatsapp. See [CONTRIBUTING.md](./CONTRIBUTING.md).
+

slidge_whatsapp-0.2.5/README.md

@@ -0,0 +1,42 @@
+# slidge-whatsapp
+
+A
+[feature-rich](https://slidge.im/docs/slidge-whatsapp/main/user/features.html)
+[WhatsApp](https://whatsapp.com) to
+[XMPP](https://xmpp.org/) puppeteering
+[gateway](https://xmpp.org/extensions/xep-0100.html), based on
+[slidge](https://slidge.im) and
+[whatsmeow](https://github.com/tulir/whatsmeow).
+
+[![CI pipeline status](https://ci.codeberg.org/api/badges/14066/status.svg)](https://ci.codeberg.org/repos/14066)
+[![Chat](https://conference.nicoco.fr:5281/muc_badge/slidge@conference.nicoco.fr)](https://slidge.im/xmpp-web/#/guest?join=slidge@conference.nicoco.fr)
+[![PyPI package version](https://badge.fury.io/py/slidge-whatsapp.svg)](https://pypi.org/project/slidge-whatsapp/)
+
+
+
+
+slidge-whatsapp lets you chat with users of WhatsApp without leaving your favorite XMPP client.
+
+## Quickstart
+
+```sh
+docker run codeberg.org/slidge/slidge-whatsapp \  # works with podman too
+    --jid whatsapp.example.org \  # can be whatever you want it to be
+    --secret some-secret \  # must match your XMPP server config
+    --home-dir /somewhere/writeable  # for data persistence
+```
+
+Use the `:latest-amd64` tag for the latest release, `:vX.X.X-amd64` for release X.X.X, and `:main-amd64`
+for the bleeding edge.`-arm64` images are also available.
+
+If you do not like containers, other installation methods are detailed
+[in the docs](https://slidge.im/docs/slidge-whatsapp/main/admin/install.html).
+
+## Documentation
+
+Hosted on [codeberg pages](https://slidge.im/docs/slidge-whatsapp/main/).
+
+## Contributing
+
+Contributions are **very** welcome, and we tried our best to make it easy
+to start hacking on slidge-whatsapp. See [CONTRIBUTING.md](./CONTRIBUTING.md).

slidge_whatsapp-0.2.5/build.py

@@ -0,0 +1,66 @@
+# build script for whatsapp extensions
+
+import os
+import platform
+import shutil
+import subprocess
+from pathlib import Path
+
+from packaging.tags import sys_tags
+
+
+def is_musl():
+    # taken from https://stackoverflow.com/a/75172415/5902284
+    tags = list(sys_tags())
+    return "musllinux" in tags[0].platform
+
+
+def get_correct_lib_suffix():
+    system = platform.system().lower()
+    machine = platform.machine().lower()
+    suffix = "_musl" if is_musl() else ""
+    if machine in ("aarch64", "aarch64_be", "armv8b", "armv8l"):
+        return system + "_arm64" + suffix
+    if machine in ("x86_64", "amd64", "i386", "i686"):
+        return system + "_amd64" + suffix
+    return None
+
+
+def main():
+    if not shutil.which("go"):
+        raise RuntimeError(
+            "Cannot find the go executable in $PATH. "
+            "Make you sure install golang, via your package manager or https://go.dev/dl/"
+        )
+    os.environ["PATH"] = os.path.expanduser("~/go/bin") + ":" + os.environ["PATH"]
+    os.environ["CGO_LDFLAGS"] = (
+        "-lgumbo -lfreetype -ljbig2dec -lharfbuzz -ljpeg -lmujs -lopenjp2"
+    )
+    subprocess.run(["go", "install", "github.com/go-python/gopy@master"], check=True)
+    subprocess.run(
+        ["go", "install", "golang.org/x/tools/cmd/goimports@latest"], check=True
+    )
+    src_path = Path(".") / "slidge_whatsapp"
+    subprocess.run(
+        [
+            "gopy",
+            "build",
+            "-output=generated",
+            "-no-make=true",
+            '-build-tags="mupdf extlib static"',
+            ".",
+        ],
+        cwd=src_path,
+        check=True,
+    )
+    suffix = get_correct_lib_suffix()
+    if suffix is None:
+        return
+    # remove the useless prebuilt libmupdf libs for other platforms
+    for path in src_path.glob("**/*.a"):
+        if not path.stem.endswith(suffix):
+            path.unlink()
+
+
+if __name__ == "__main__":
+    main()

slidge_whatsapp-0.2.5/pyproject.toml

@@ -0,0 +1,178 @@
+# DO NOT EDIT
+# This file is automatically generated with copier using https://codeberg.org/slidge/legacy-module-template
+[project]
+name = "slidge-whatsapp"
+description = "A WhatsApp/XMPP gateway"
+authors = [
+    {name = "deuill", email = "alex@deuill.org"},
+    {name = "nicoco", email = "nicoco@nicoco.fr"},
+]
+readme = "README.md"
+license = "AGPL-3.0-or-later"
+classifiers = [
+    "Topic :: Internet :: XMPP",
+]
+requires-python = ">= 3.11"
+keywords = ["xmpp", "gateway", "bridge", "instant messaging", "chat", "whatsapp"]
+dynamic = []
+dependencies = [
+    "linkpreview>=0.11.0",
+    "slidge>=0.2.4,<0.3",
+]
+version = "0.2.5"
+
+[project.urls]
+Homepage = "https://codeberg.org/slidge/slidge-whatsapp"
+Issues = "https://codeberg.org/slidge/slidge-whatsapp/issues"
+Repository = "https://codeberg.org/slidge/slidge-whatsapp"
+"Chat room" = "https://slidge.im/xmpp-web/#/guest?join=slidge@conference.nicoco.fr"
+Documentation = "https://slidge.im/docs/slidge-whatsapp/main"
+changelog = "https://codeberg.org/slidge/slidge-whatsapp/releases"
+
+[project.scripts]
+slidge-whatsapp = "slidge_whatsapp:main"
+
+[dependency-groups]
+dev = [
+    "furo>=2024.8.6",
+    "mypy>=1.14.1",
+    "pytest>=8.3.4",
+    "pytest-asyncio>=0.25.3",
+    "ruff>=0.9.1",
+    "slidge-sphinx-extensions>=0.1.0",
+    "sphinx-autoapi>=3.4.0",
+    "sphinx-mdinclude>=0.6.2",
+    "pybindgen",
+]
+
+[tool.pytest.ini_options]
+asyncio_default_fixture_loop_scope = "session"
+
+[tool.poetry]
+
+[[tool.poetry.include]]
+path = "slidge_whatsapp"
+
+[[tool.poetry.include]]
+path = "slidge_whatsapp/generated/*.py"
+format = ["wheel"]
+
+[[tool.poetry.include]]
+path = "slidge_whatsapp/generated/*.so"
+format = ["wheel"]
+
+[tool.poetry.build]
+script = "build.py"
+
+[build-system]
+requires = ["poetry-core", "pybindgen", "packaging", "poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+build-backend = "poetry_dynamic_versioning.backend"
+
+[tool.poetry.requires-plugins]
+poetry-dynamic-versioning = { version = ">=1.0.0,<2.0.0", extras = ["plugin"] }
+
+[tool.poetry-dynamic-versioning]
+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.mypy]
+files = ["slidge_whatsapp"]
+exclude = [
+    "tests",
+    "slidge_whatsapp/generated",
+]
+check_untyped_defs = true
+strict = false
+
+[[tool.mypy.overrides]]
+module = [
+    "slidge_style_parser.*",
+    "linkpreview",
+    "slidge_whatsapp.generated",
+]
+ignore_missing_imports = true
+
+[tool.ruff]
+line-length = 88
+exclude = [
+    "tests",
+]
+
+[tool.ruff.lint]
+select = ["I"]
+
+[tool.git-cliff.remote.gitea]
+owner = "slidge"
+repo = "slidge-whatsapp"
+
+[tool.git-cliff.changelog]
+header = """
+<!-- write something cool about the release here! -->
+
+# Changes
+"""
+body = """
+{% for group, all_commits in commits | group_by(attribute="group") %}
+    {%- if group == "cfix" %}{% continue %}{%- endif %}
+    ## {{ group | striptags | trim | upper_first }}
+    {% for commit in all_commits %}
+        - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\
+            {% if commit.breaking %}[**breaking**] {% endif %}\
+            {{ commit.message | split(pat="\n") | first | upper_first | trim }} \
+            ([`{{ commit.id | truncate(length=7, end="") }}`](./commit/{{ commit.id -}})\
+            {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif -%}
+            {%- for cfix_commit in commits | filter(attribute="group", value="cfix") -%}
+                {%- if cfix_commit.scope and commit.id is starting_with(cfix_commit.scope) -%}
+                    , [`{{ cfix_commit.id | truncate(length=7, end="") }}`](./commit/{{ cfix_commit.id }}){% if cfix_commit.remote.username %} by @{{ cfix_commit.remote.username }}{%- endif -%}
+                {%- endif -%}
+            {%- endfor -%})\
+    {% endfor %}
+{% endfor %}\n
+"""
+footer = """
+<!-- generated by git-cliff -->
+"""
+
+[tool.git-cliff.git]
+conventional_commits = true
+filter_unconventional = false
+commit_parsers = [
+  { message = "^feat", group = "<!-- 0 -->🚀 Features" },
+  { message = "^imprv", group = "<!-- 01 -->✨ Improvements" },
+  { message = "^fix", group = "<!-- 02 -->🐛 Bug Fixes" },
+  { message = "^compat", group = "<!-- 03 -->💑 Compatibility" },
+  { message = "^refactor", group = "<!-- 04 -->🚜 Refactor" },
+  { message = "^doc", group = "<!-- 05 -->📚 Documentation" },
+  { message = "^perf", group = "<!-- 06 -->⚡ Performance" },
+  { message = "^style", group = "<!-- 07 -->🎨 Styling" },
+  { message = "^test", group = "<!-- 08 -->🧪 Testing" },
+  { message = "^chore\\(release\\): prepare for", skip = true },
+  { message = "^chore\\(deps.*\\)", skip = true },
+  { message = "^chore\\(pr\\)", skip = true },
+  { message = "^chore\\(pull\\)", skip = true },
+  { message = "^build\\(lockfile\\)", skip = true },
+  { message = "^chore\\(lockfile\\)", skip = true },
+  { message = "^chore|^ci", group = "<!-- 09 -->⚙️ Miscellaneous Tasks" },
+  { body = ".*security", group = "<!-- 10 -->🛡️ Security" },
+  { message = "^revert", group = "<!-- 11 -->◀️ Revert" },
+  { message = "^cfix", group = "cfix" },
+  { message = ".*", group = "<!-- 13 -->💼 Other" },
+]

slidge_whatsapp-0.2.5/slidge_whatsapp/__init__.py

@@ -0,0 +1,35 @@
+# DO NOT EDIT
+# Generated from .copier-answers.yml
+
+import sys
+from importlib.metadata import PackageNotFoundError, version
+
+from slidge import entrypoint
+
+# import everything for automatic subclasses discovery by slidge core
+from . import command, config, contact, gateway, group, session
+
+try:
+    __version__ = version("slidge-whatsapp")
+except PackageNotFoundError:
+    # package is not installed
+    __version__ = "dev"
+
+
+def main():
+    if len(sys.argv) == 2 and sys.argv[1] == "--version":
+        print("slidge-whatsapp version", __version__)
+        exit(0)
+    entrypoint("slidge_whatsapp")
+
+
+__all__ = (
+    "__version__",
+    "command",
+    "config",
+    "contact",
+    "gateway",
+    "group",
+    "main",
+    "session",
+)

slidge_whatsapp-0.2.5/slidge_whatsapp/__main__.py

@@ -0,0 +1,6 @@
+# DO NOT EDIT
+# Generated from .copier-answers.yml
+
+from slidge_whatsapp import main
+
+main()

{slidge_whatsapp-0.2.3 → slidge_whatsapp-0.2.5}/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.5}/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.5}/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.5}/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.5}/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(

slidge_whatsapp-0.2.5/slidge_whatsapp/vendor/filippo.io/edwards25519/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.