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

slidge_whatsapp-0.2.6/PKG-INFO

@@ -0,0 +1,63 @@
+Metadata-Version: 2.3
+Name: slidge-whatsapp
+Version: 0.2.6
+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.6/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.6/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.6/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.6"
+
+[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.6/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.6/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.4 → slidge_whatsapp-0.2.6}/slidge_whatsapp/config.py

@@ -21,6 +21,9 @@ DB_PATH__DOC = (
     "${SLIDGE_HOME_DIR}/whatsapp/whatsapp.db"
 )
 
+DB_PARAMS = "?_foreign_keys=true"
+DB_PARAMS__DOC = "Additional parameters to pass to database connection string."
+
 ALWAYS_SYNC_ROSTER = False
 ALWAYS_SYNC_ROSTER__DOC = (
     "Whether or not to perform a full sync of the WhatsApp roster on startup."

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

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"mime"
+	"slices"
 	"strings"
 
 	// Internal packages.
@@ -255,6 +256,7 @@ type Album struct {
 func newMessageEvent(client *whatsmeow.Client, evt *events.Message) (EventKind, *EventPayload) {
 	// Set basic data for message, to be potentially amended depending on the concrete version of
 	// the underlying message.
+	var ctx = context.Background()
 	var message = Message{
 		Kind:      MessagePlain,
 		ID:        evt.Info.ID,
@@ -358,7 +360,7 @@ func newMessageEvent(client *whatsmeow.Client, evt *events.Message) (EventKind,
 	}
 
 	// Handle message attachments, if any.
-	if attach, context, err := getMessageAttachments(client, evt.Message); err != nil {
+	if attach, context, err := getMessageAttachments(ctx, client, evt.Message); err != nil {
 		client.Log.Errorf("Failed getting message attachments: %s", err)
 		return EventUnknown, nil
 	} else if len(attach) > 0 {
@@ -412,7 +414,7 @@ func getMessageWithContext(message Message, info *waE2E.ContextInfo) Message {
 
 // GetMessageAttachments fetches and decrypts attachments (images, audio, video, or documents) sent
 // via WhatsApp. Any failures in retrieving any attachment will return an error immediately.
-func getMessageAttachments(client *whatsmeow.Client, message *waE2E.Message) ([]Attachment, *waE2E.ContextInfo, error) {
+func getMessageAttachments(ctx context.Context, client *whatsmeow.Client, message *waE2E.Message) ([]Attachment, *waE2E.ContextInfo, error) {
 	var result []Attachment
 	var info *waE2E.ContextInfo
 	var convertSpec *media.Spec
@@ -450,7 +452,7 @@ func getMessageAttachments(client *whatsmeow.Client, message *waE2E.Message) ([]
 		}
 
 		// Attempt to download and decrypt raw attachment data, if any.
-		data, err := client.Download(msg)
+		data, err := client.Download(ctx, msg)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -459,7 +461,7 @@ func getMessageAttachments(client *whatsmeow.Client, message *waE2E.Message) ([]
 
 		// Convert incoming data if a specification has been given, ignoring any errors that occur.
 		if convertSpec != nil {
-			data, err = media.Convert(context.Background(), a.Data, convertSpec)
+			data, err = media.Convert(ctx, a.Data, convertSpec)
 			if err == nil {
 				a.Data, a.MIME = data, string(convertSpec.MIME)
 			}
@@ -557,7 +559,7 @@ var (
 //
 // If the input MIME type is unknown, or conversion is impossible, the given attachment is not
 // changed.
-func convertAttachment(attach *Attachment) error {
+func convertAttachment(ctx context.Context, attach *Attachment) error {
 	var detectedMIME media.MIMEType
 	if t := media.DetectMIMEType(attach.Data); t != media.TypeUnknown {
 		detectedMIME = t
@@ -567,8 +569,6 @@ func convertAttachment(attach *Attachment) error {
 	}
 
 	var spec media.Spec
-	var ctx = context.Background()
-
 	switch detectedMIME {
 	case media.TypePNG, media.TypeWebP:
 		// Convert common image formats to JPEG for inline preview.
@@ -666,11 +666,9 @@ var knownMediaTypes = map[string]whatsmeow.MediaType{
 // type specified within. Attachments are handled as generic file uploads unless they're of a
 // specific format; in addition, certain MIME types may be automatically converted to a
 // well-supported type via FFmpeg (if available).
-func uploadAttachment(client *whatsmeow.Client, attach *Attachment) (*waE2E.Message, error) {
-	var ctx = context.Background()
+func uploadAttachment(ctx context.Context, client *whatsmeow.Client, attach *Attachment) (*waE2E.Message, error) {
 	var originalMIME = attach.MIME
-
-	if err := convertAttachment(attach); err != nil {
+	if err := convertAttachment(ctx, attach); err != nil {
 		client.Log.Warnf("failed to auto-convert attachment: %s", err)
 	}
 
@@ -836,6 +834,7 @@ func getBaseMediaType(typ string) string {
 func newEventFromHistory(client *whatsmeow.Client, info *waWeb.WebMessageInfo) (EventKind, *EventPayload) {
 	// Handle message as group message is remote JID is a group JID in the absence of any other,
 	// specific signal, or don't handle at all if no group JID is found.
+	var ctx = context.Background()
 	var jid = info.GetKey().GetRemoteJID()
 	if j, _ := types.ParseJID(jid); j.Server != types.GroupServer {
 		return EventUnknown, nil
@@ -898,7 +897,7 @@ func newEventFromHistory(client *whatsmeow.Client, info *waWeb.WebMessageInfo) (
 	}
 
 	// Handle message attachments, if any.
-	if attach, context, err := getMessageAttachments(client, info.GetMessage()); err != nil {
+	if attach, context, err := getMessageAttachments(ctx, client, info.GetMessage()); err != nil {
 		client.Log.Errorf("Failed getting message attachments: %s", err)
 		return EventUnknown, nil
 	} else if len(attach) > 0 {
@@ -967,9 +966,9 @@ type ChatState struct {
 // NewChatStateEvent returns event data meant for [Session.propagateEvent] for the primitive
 // chat-state event given.
 func newChatStateEvent(evt *events.ChatPresence) (EventKind, *EventPayload) {
-	var state = ChatState{JID: evt.MessageSource.Sender.ToNonAD().String()}
-	if evt.MessageSource.IsGroup {
-		state.GroupJID = evt.MessageSource.Chat.ToNonAD().String()
+	var state = ChatState{JID: evt.Sender.ToNonAD().String()}
+	if evt.IsGroup {
+		state.GroupJID = evt.Chat.ToNonAD().String()
 	}
 	switch evt.State {
 	case types.ChatPresenceComposing:
@@ -1006,22 +1005,22 @@ type Receipt struct {
 // event given. Unknown or invalid receipts will return an [EventUnknown] event with nil data.
 func newReceiptEvent(evt *events.Receipt) (EventKind, *EventPayload) {
 	var receipt = Receipt{
-		MessageIDs: append([]string{}, evt.MessageIDs...),
-		JID:        evt.MessageSource.Sender.ToNonAD().String(),
+		MessageIDs: slices.Clone(evt.MessageIDs),
+		JID:        evt.Sender.ToNonAD().String(),
 		Timestamp:  evt.Timestamp.Unix(),
-		IsCarbon:   evt.MessageSource.IsFromMe,
+		IsCarbon:   evt.IsFromMe,
 	}
 
 	if len(receipt.MessageIDs) == 0 {
 		return EventUnknown, nil
 	}
 
-	if evt.MessageSource.Chat.Server == types.BroadcastServer {
-		receipt.JID = evt.MessageSource.BroadcastListOwner.ToNonAD().String()
-	} else if evt.MessageSource.IsGroup {
-		receipt.GroupJID = evt.MessageSource.Chat.ToNonAD().String()
+	if evt.Chat.Server == types.BroadcastServer {
+		receipt.JID = evt.BroadcastListOwner.ToNonAD().String()
+	} else if evt.IsGroup {
+		receipt.GroupJID = evt.Chat.ToNonAD().String()
 	} else if receipt.IsCarbon {
-		receipt.JID = evt.MessageSource.Chat.ToNonAD().String()
+		receipt.JID = evt.Chat.ToNonAD().String()
 	}
 
 	switch evt.Type {
@@ -1176,7 +1175,7 @@ func newGroup(client *whatsmeow.Client, info *types.GroupInfo) Group {
 	}
 	return Group{
 		JID:  info.JID.ToNonAD().String(),
-		Name: info.GroupName.Name,
+		Name: info.Name,
 		Subject: GroupSubject{
 			Subject:  info.Topic,
 			SetAt:    info.TopicSetAt.Unix(),

{slidge_whatsapp-0.2.4 → slidge_whatsapp-0.2.6}/slidge_whatsapp/gateway.go

@@ -2,6 +2,7 @@ package whatsapp
 
 import (
 	// Standard library.
+	"context"
 	"fmt"
 	"log/slog"
 	"os"
@@ -69,7 +70,7 @@ func (w *Gateway) Init() error {
 		),
 	}
 
-	container, err := sqlstore.New("sqlite3", w.DBPath, w.logger)
+	container, err := sqlstore.New(context.Background(), "sqlite3", w.DBPath, w.logger)
 	if err != nil {
 		return err
 	}
@@ -79,7 +80,9 @@ func (w *Gateway) Init() error {
 	}
 
 	if w.TempDir != "" {
-		media.SetTempDirectory(w.TempDir)
+		if err := media.SetTempDirectory(w.TempDir); err != nil {
+			return err
+		}
 	}
 
 	w.callChan = make(chan func(), maxConcurrentGatewayCalls)
@@ -107,7 +110,8 @@ func (w *Gateway) NewSession(device LinkedDevice) *Session {
 // CleanupSession will remove all invalid and obsolete references to the given device, and should be
 // used when pairing a new device or unregistering from the Gateway.
 func (w *Gateway) CleanupSession(device LinkedDevice) error {
-	devices, err := w.container.GetAllDevices()
+	ctx := context.Background()
+	devices, err := w.container.GetAllDevices(ctx)
 	if err != nil {
 		return err
 	}
@@ -115,11 +119,11 @@ func (w *Gateway) CleanupSession(device LinkedDevice) error {
 	for _, d := range devices {
 		if d.ID == nil {
 			w.logger.Infof("Removing invalid device %s from database", d.ID.String())
-			_ = d.Delete()
+			_ = d.Delete(ctx)
 		} else if device.ID != "" {
 			if jid := device.JID(); d.ID.ToNonAD() == jid.ToNonAD() && *d.ID != jid {
 				w.logger.Infof("Removing obsolete device %s from database", d.ID.String())
-				_ = d.Delete()
+				_ = d.Delete(ctx)
 			}
 		}
 	}
@@ -156,22 +160,22 @@ type logger struct {
 var _ walog.Logger = logger{}
 
 // Errorf handles the given message as representing a (typically) fatal error.
-func (l logger) Errorf(msg string, args ...interface{}) {
+func (l logger) Errorf(msg string, args ...any) {
 	l.logger.Error(fmt.Sprintf(msg, args...))
 }
 
 // Warn handles the given message as representing a non-fatal error or warning thereof.
-func (l logger) Warnf(msg string, args ...interface{}) {
+func (l logger) Warnf(msg string, args ...any) {
 	l.logger.Warn(fmt.Sprintf(msg, args...))
 }
 
 // Infof handles the given message as representing an informational notice.
-func (l logger) Infof(msg string, args ...interface{}) {
+func (l logger) Infof(msg string, args ...any) {
 	l.logger.Info(fmt.Sprintf(msg, args...))
 }
 
 // Debugf handles the given message as representing an internal-only debug message.
-func (l logger) Debugf(msg string, args ...interface{}) {
+func (l logger) Debugf(msg string, args ...any) {
 	l.logger.Debug(fmt.Sprintf(msg, args...))
 }
 

{slidge_whatsapp-0.2.4 → slidge_whatsapp-0.2.6}/slidge_whatsapp/gateway.py

@@ -13,7 +13,7 @@ if TYPE_CHECKING:
 REGISTRATION_INSTRUCTIONS = (
     "Continue and scan the resulting QR codes on your main device, or alternatively, "
     "use the 'pair-phone' command to complete registration. More information at "
-    "https://slidge.im/slidge-whatsapp/user.html"
+    "https://slidge.im/docs/slidge-whatsapp/main/user/registration.html"
 )
 
 WELCOME_MESSAGE = (
@@ -49,7 +49,7 @@ class Gateway(BaseGateway):
 
         assert config.DB_PATH is not None
         Path(config.DB_PATH.parent).mkdir(exist_ok=True)
-        self.whatsapp.DBPath = str(config.DB_PATH)
+        self.whatsapp.DBPath = str(config.DB_PATH) + config.DB_PARAMS
 
         (global_config.HOME_DIR / "tmp").mkdir(exist_ok=True)
         self.whatsapp.TempDir = str(global_config.HOME_DIR / "tmp")