slidge-whatsapp 0.2.0a0__tar.gz → 0.2.0b0__tar.gz

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slidge-whatsapp
-Version: 0.2.0a0
+Version: 0.2.0b0
 Summary: A Whatsapp/XMPP gateway.
 Author: deuill
 Author-email: alex@deuill.org
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: linkpreview (>=0.6.5,<0.7.0)
 Requires-Dist: pybindgen (>=0.22.1,<0.23.0)
-Requires-Dist: slidge (>=0.2.0alpha4,<0.3.0)
+Requires-Dist: slidge (>=0.2.0beta0,<0.3.0)
 Description-Content-Type: text/markdown
 
 # slidge-whatsapp
@@ -57,9 +57,13 @@ With [pipx](https://pypa.github.io/pipx/):
 pipx install slidge-whatsapp
 
 # for the bleeding edge
-pipx install slidge-whatsapp \
+pipx install slidge-whatsapp==0.0.0.dev0 \
     --pip-args='--extra-index-url https://slidge.im/repo'
 
+# to update bleeding edge installs
+pipx install slidge-whatsapp==0.0.0.dev0 \
+    --pip-args='--extra-index-url https://slidge.im/repo' --force
+
 slidge-whatsapp --help
 ```
 

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/README.md

@@ -42,9 +42,13 @@ With [pipx](https://pypa.github.io/pipx/):
 pipx install slidge-whatsapp
 
 # for the bleeding edge
-pipx install slidge-whatsapp \
+pipx install slidge-whatsapp==0.0.0.dev0 \
     --pip-args='--extra-index-url https://slidge.im/repo'
 
+# to update bleeding edge installs
+pipx install slidge-whatsapp==0.0.0.dev0 \
+    --pip-args='--extra-index-url https://slidge.im/repo' --force
+
 slidge-whatsapp --help
 ```
 

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "slidge-whatsapp"
-version = "0.2.0alpha0"
+version = "0.2.0beta"
 description = "A Whatsapp/XMPP gateway."
 authors = ["deuill <alex@deuill.org>", "Nicoco <nicoco@nicoco.fr>"]
 readme = "README.md"
@@ -23,7 +23,7 @@ script = "build.py"
 python = "^3.11"
 linkpreview = "^0.6.5"
 pybindgen = "^0.22.1"
-slidge = "^0.2.0alpha4"
+slidge = "^0.2.0beta0"
 
 [tool.poetry.group.dev.dependencies]
 pytest-asyncio = "^0.21.0"
@@ -48,7 +48,7 @@ requires = ["poetry-core", "pybindgen"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-slidge-whatsapp = 'slidge_whatsapp.__main__:main'
+slidge-whatsapp = 'slidge_whatsapp:main'
 
 [tool.mypy]
 files = ["slidge_whatsapp"]

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/slidge_whatsapp/__init__.py

@@ -2,10 +2,16 @@
 WhatsApp gateway using the multi-device API.
 """
 
+from slidge import entrypoint
 from slidge.util.util import get_version  # noqa: F401
 
 from . import command, config, contact, group, session
 from .gateway import Gateway
 
-__version__ = "0.2.0alpha0"
-__all__ = "Gateway", "session", "command", "contact", "config", "group"
+
+def main():
+    entrypoint("slidge_whatsapp")
+
+
+__version__ = "0.2.0beta"
+__all__ = "Gateway", "session", "command", "contact", "config", "group", "main"

slidge_whatsapp-0.2.0b0/slidge_whatsapp/__main__.py

@@ -0,0 +1,3 @@
+from slidge_whatsapp import main
+
+main()

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/slidge_whatsapp/event.go

@@ -834,9 +834,22 @@ type CallState int
 
 // The call states handled by the overarching session event handler.
 const (
-	CallMissed CallState = 1 + iota
+	CallUnknown CallState = iota
+	CallIncoming
+	CallMissed
 )
 
+// CallStateFromReason converts the given (internal) reason string to a public [CallState]. Calls
+// given invalid or unknown reasons will return the [CallUnknown] state.
+func callStateFromReason(reason string) CallState {
+	switch reason {
+	case "", "timeout":
+		return CallMissed
+	default:
+		return CallUnknown
+	}
+}
+
 // A Call represents an incoming or outgoing voice/video call made over WhatsApp. Full support for
 // calls is currently not implemented, and this structure contains the bare minimum data required
 // for notifying on missed calls.
@@ -848,6 +861,10 @@ type Call struct {
 
 // NewCallEvent returns event data meant for [Session.propagateEvent] for the call metadata given.
 func newCallEvent(state CallState, meta types.BasicCallMeta) (EventKind, *EventPayload) {
+	if state == CallUnknown || meta.From.IsEmpty() {
+		return EventUnknown, nil
+	}
+
 	return EventCall, &EventPayload{Call: Call{
 		State:     state,
 		JID:       meta.From.ToNonAD().String(),

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/slidge_whatsapp/group.py

@@ -1,6 +1,6 @@
 import re
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, AsyncIterator, Optional
 
 from slidge.group import LegacyBookmarks, LegacyMUC, LegacyParticipant, MucType
 from slidge.util.archive_msg import HistoryMessage
@@ -94,7 +94,16 @@ class MUC(LegacyMUC[str, str, Participant, str]):
                 )
                 if name := participant.nickname:
                     self.subject_setter = name
-        for data in info.Participants:
+        self.session.wa_participants[self.legacy_id] = info.Participants
+
+    async def fill_participants(self) -> AsyncIterator[Participant]:
+        await self.session.bookmarks.ready
+        try:
+            participants = self.session.wa_participants.pop(self.legacy_id)
+        except KeyError:
+            self.log.warning("No participants!")
+            return
+        for data in participants:
             participant = await self.get_participant_by_legacy_id(data.JID)
             if data.Action == whatsapp.GroupParticipantActionRemove:
                 self.remove_participant(participant)
@@ -114,6 +123,7 @@ class MUC(LegacyMUC[str, str, Participant, str]):
                 else:
                     participant.affiliation = "member"
                     participant.role = "participant"
+                yield participant
 
     async def replace_mentions(self, t: str):
         return replace_whatsapp_mentions(

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/slidge_whatsapp/session.go

@@ -15,8 +15,8 @@ import (
 	"go.mau.fi/whatsmeow"
 	"go.mau.fi/whatsmeow/appstate"
 	"go.mau.fi/whatsmeow/proto/waCommon"
-	"go.mau.fi/whatsmeow/proto/waHistorySync"
 	"go.mau.fi/whatsmeow/proto/waE2E"
+	"go.mau.fi/whatsmeow/proto/waHistorySync"
 	"go.mau.fi/whatsmeow/store"
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
@@ -574,6 +574,7 @@ func (s *Session) SetGroupTopic(resourceID, topic string) error {
 	}
 
 	return s.client.SetGroupTopic(jid, "", "", topic)
+
 }
 
 func (s *Session) SetAffiliation(groupID, participantID string, change whatsmeow.ParticipantChange) ([]types.GroupParticipant, error) {
@@ -699,7 +700,7 @@ func (s *Session) handleEvent(evt interface{}) {
 		switch evt.Data.GetSyncType() {
 		case waHistorySync.HistorySync_PUSH_NAME:
 			for _, n := range evt.Data.GetPushnames() {
-				jid, err := types.ParseJID(n.GetId())
+				jid, err := types.ParseJID(n.GetID())
 				if err != nil {
 					continue
 				}
@@ -729,10 +730,10 @@ func (s *Session) handleEvent(evt interface{}) {
 		s.propagateEvent(newGroupEvent(evt))
 	case *events.ChatPresence:
 		s.propagateEvent(newChatStateEvent(evt))
+	case *events.CallOffer:
+		s.propagateEvent(newCallEvent(CallIncoming, evt.BasicCallMeta))
 	case *events.CallTerminate:
-		if evt.Reason == "timeout" {
-			s.propagateEvent(newCallEvent(CallMissed, evt.BasicCallMeta))
-		}
+		s.propagateEvent(newCallEvent(callStateFromReason(evt.Reason), evt.BasicCallMeta))
 	case *events.LoggedOut:
 		s.client.Disconnect()
 		if err := s.client.Store.Delete(); err != nil {

{slidge_whatsapp-0.2.0a0 → slidge_whatsapp-0.2.0b0}/slidge_whatsapp/session.py

@@ -1,3 +1,4 @@
+import asyncio
 from asyncio import iscoroutine, run_coroutine_threadsafe
 from datetime import datetime, timezone
 from functools import wraps
@@ -71,10 +72,11 @@ class Session(BaseSession[str, Recipient]):
         self.whatsapp = self.xmpp.whatsapp.NewSession(device)
         self._handle_event = make_sync(self.handle_event, self.xmpp.loop)
         self.whatsapp.SetEventHandler(self._handle_event)
-        self._connected = self.xmpp.loop.create_future()
+        self.__reset_connected()
         self.user_phone: Optional[str] = None
         self._presence_status: str = ""
         self._lock = Lock()
+        self.wa_participants = dict[str, list[whatsapp.GroupParticipant]]()
 
     def migrate(self):
         user_shelf_path = (
@@ -96,14 +98,20 @@ class Session(BaseSession[str, Recipient]):
                 self.legacy_module_data_set({"device_id": device_id})
         user_shelf_path.unlink()
 
+    def __reset_connected(self):
+        if hasattr(self, "_connected"):
+            if not self._connected.done():
+                self.xmpp.loop.call_soon_threadsafe(self._connected.cancel)
+        self._connected: asyncio.Future[str] = self.xmpp.loop.create_future()
+
     async def login(self):
         """
         Initiate login process and connect session to WhatsApp. Depending on existing state, login
         might either return having initiated the Linked Device registration process in the background,
         or will re-connect to a previously existing Linked Device session.
         """
+        self.__reset_connected()
         self.whatsapp.Login()
-        self._connected = self.xmpp.loop.create_future()
         return await self._connected
 
     async def logout(self):
@@ -137,7 +145,9 @@ class Session(BaseSession[str, Recipient]):
             else:
                 self.contacts.user_legacy_id = data.ConnectedJID
                 self.user_phone = "+" + data.ConnectedJID.split("@")[0]
-                self._connected.set_result(self.__get_connected_status_message())
+                self.xmpp.loop.call_soon_threadsafe(
+                    self._connected.set_result, self.__get_connected_status_message()
+                )
         elif event == whatsapp.EventLoggedOut:
             self.logged = False
             self.send_gateway_message(MESSAGE_LOGGED_OUT)
@@ -180,14 +190,13 @@ class Session(BaseSession[str, Recipient]):
 
     async def handle_call(self, call: whatsapp.Call):
         contact = await self.contacts.by_legacy_id(call.JID)
-        if call.State == whatsapp.CallMissed:
-            text = "Missed call"
+        text = f"from {contact.name or 'tel:' + str(contact.jid.local)} (xmpp:{contact.jid.bare})"
+        if call.State == whatsapp.CallIncoming:
+            text = "Incoming call " + text
+        elif call.State == whatsapp.CallMissed:
+            text = "Missed call " + text
         else:
-            text = "Call"
-        text = (
-            text
-            + f" from {contact.name or 'tel:' + str(contact.jid.local)} (xmpp:{contact.jid.bare})"
-        )
+            text = "Call " + text
         if call.Timestamp > 0:
             call_at = datetime.fromtimestamp(call.Timestamp, tz=timezone.utc)
             text = text + f" at {call_at}"

slidge_whatsapp-0.2.0a0/slidge_whatsapp/__main__.py

@@ -1,9 +0,0 @@
-from slidge import entrypoint
-
-
-def main():
-    entrypoint("slidge_whatsapp")
-
-
-if __name__ == "__main__":
-    main()