slidge-whatsapp 0.3.6__tar.gz → 0.3.7__tar.gz

{slidge_whatsapp-0.3.6 → slidge_whatsapp-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge-whatsapp
-Version: 0.3.6
+Version: 0.3.7
 Summary: A WhatsApp/XMPP gateway
 License-Expression: AGPL-3.0-or-later
 License-File: LICENSE
@@ -10,8 +10,7 @@ Author-email: alex@deuill.org
 Requires-Python: >= 3.11
 Classifier: Topic :: Internet :: XMPP
 Requires-Dist: linkpreview (>=0.11.0)
-Requires-Dist: slidge (>=0.3.0beta2,<0.4)
-Requires-Dist: slixmpp (==1.11.0)
+Requires-Dist: slidge (>=0.3.0,<0.4)
 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

{slidge_whatsapp-0.3.6 → slidge_whatsapp-0.3.7}/pyproject.toml

@@ -17,10 +17,9 @@ keywords = ["xmpp", "gateway", "bridge", "instant messaging", "chat", "whatsapp"
 dynamic = []
 dependencies = [
     "linkpreview>=0.11.0",
-    "slidge>=0.3.0beta2,<0.4",
-    "slixmpp==1.11.0",
+    "slidge>=0.3.0,<0.4",
 ]
-version = "0.3.6"
+version = "0.3.7"
 
 [project.urls]
 Homepage = "https://codeberg.org/slidge/slidge-whatsapp"

{slidge_whatsapp-0.3.6 → slidge_whatsapp-0.3.7}/slidge_whatsapp/contact.py

@@ -31,9 +31,13 @@ class Contact(LegacyContact[str]):
 
     async def update_info(self) -> None:
         if whatsapp.IsAnonymousJID(self.legacy_id):
-            self.log.error(
-                "Contact for anonymous participant added: %s", self.legacy_id
+            raise XMPPError(
+                "item-not-found", f"LIDs are not valid contact IDs: {self.legacy_id}"
             )
+        # If we receive presences, the status will be updated accordingly. But presences do not
+        # work reliably, and having contacts offline has annoying side effects, such as contacts not
+        # appearing in the participant list of groups.
+        self.online()
 
 
 class Roster(LegacyRoster[str, Contact]):

{slidge_whatsapp-0.3.6 → slidge_whatsapp-0.3.7}/slidge_whatsapp/event.go

@@ -141,13 +141,14 @@ type Presence struct {
 
 // NewPresenceEvent returns event data meant for [Session.propagateEvent] for the primitive presence
 // event given.
-func newPresenceEvent(evt *events.Presence) (EventKind, *EventPayload) {
-	if evt.From.Server == types.HiddenUserServer {
+func newPresenceEvent(ctx context.Context, client *whatsmeow.Client, evt *events.Presence) (EventKind, *EventPayload) {
+	var jid = getPreferredJID(ctx, client, evt.From)
+	if jid.Server == types.HiddenUserServer {
 		return EventUnknown, nil
 	}
 
 	var presence = Presence{
-		JID:      evt.From.ToNonAD().String(),
+		JID:      jid.ToNonAD().String(),
 		Kind:     PresenceAvailable,
 		LastSeen: evt.LastSeen.Unix(),
 	}
@@ -300,7 +301,7 @@ func newMessageEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 	} else if evt.Info.IsGroup {
 		message.GroupJID = evt.Info.Chat.ToNonAD().String()
 	} else if message.IsCarbon {
-		message.JID = evt.Info.Chat.ToNonAD().String()
+		message.JID = getPreferredJID(ctx, client, evt.Info.Chat).ToNonAD().String()
 	}
 
 	// Handle handle protocol messages (such as message deletion or editing).
@@ -315,9 +316,13 @@ func newMessageEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 				return EventUnknown, nil
 			}
 		case waE2E.ProtocolMessage_REVOKE:
+			originJID, err := types.ParseJID(p.Key.GetParticipant())
+			if err != nil {
+				return EventUnknown, nil
+			}
 			message.Kind = MessageRevoke
 			message.ID = p.Key.GetID()
-			message.OriginJID = p.Key.GetParticipant()
+			message.OriginJID = getPreferredJID(ctx, client, originJID).ToNonAD().String()
 			return EventMessage, &EventPayload{Message: message}
 		}
 	}
@@ -1103,11 +1108,11 @@ func newReceiptEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 	}
 
 	if evt.Chat.Server == types.BroadcastServer {
-		receipt.JID = evt.BroadcastListOwner.ToNonAD().String()
+		receipt.JID = getPreferredJID(ctx, client, evt.BroadcastListOwner).ToNonAD().String()
 	} else if evt.IsGroup {
 		receipt.GroupJID = evt.Chat.ToNonAD().String()
 	} else if receipt.IsCarbon {
-		receipt.JID = evt.Chat.ToNonAD().String()
+		receipt.JID = getPreferredJID(ctx, client, evt.Chat).ToNonAD().String()
 	}
 
 	switch evt.Type {

{slidge_whatsapp-0.3.6 → slidge_whatsapp-0.3.7}/slidge_whatsapp/session.go

@@ -785,7 +785,7 @@ func (s *Session) handleEvent(evt any) {
 		case waHistorySync.HistorySync_PUSH_NAME:
 			for _, n := range evt.Data.GetPushnames() {
 				jid, err := types.ParseJID(n.GetID())
-				if err != nil {
+				if err != nil || jid.Server == types.HiddenUserServer {
 					continue
 				}
 				s.propagateEvent(newContactEvent(jid, types.ContactInfo{FullName: n.GetPushname()}))
@@ -805,7 +805,7 @@ func (s *Session) handleEvent(evt any) {
 	case *events.Receipt:
 		s.propagateEvent(newReceiptEvent(ctx, s.client, evt))
 	case *events.Presence:
-		s.propagateEvent(newPresenceEvent(evt))
+		s.propagateEvent(newPresenceEvent(ctx, s.client, evt))
 	case *events.PushName:
 		s.propagateEvent(newContactEvent(evt.JID, types.ContactInfo{FullName: evt.NewPushName}))
 	case *events.JoinedGroup:

{slidge_whatsapp-0.3.6 → slidge_whatsapp-0.3.7}/slidge_whatsapp/session.py

@@ -171,12 +171,8 @@ class Session(BaseSession[str, Recipient]):
         elif event == whatsapp.EventGroup:
             await self.bookmarks.add_whatsapp_group(data.Group)
         elif event == whatsapp.EventPresence:
-            if not whatsapp.IsAnonymousJID(data.Presence.JID):
-                contact = await self.contacts.by_legacy_id(data.Presence.JID)
-                if contact is not None:
-                    await contact.update_presence(
-                        data.Presence.Kind, data.Presence.LastSeen
-                    )
+            contact = await self.contacts.by_legacy_id(data.Presence.JID)
+            await contact.update_presence(data.Presence.Kind, data.Presence.LastSeen)
         elif event == whatsapp.EventChatState:
             await self.handle_chat_state(data.ChatState)
         elif event == whatsapp.EventReceipt: