slidge-whatsapp 0.3.0b0__cp311-cp311-manylinux_2_36_aarch64.whl → 0.3.4__cp311-cp311-manylinux_2_36_aarch64.whl

slidge_whatsapp/contact.py

@@ -77,6 +77,8 @@ class Roster(LegacyRoster[str, Contact]):
         return contact
 
     async def legacy_id_to_jid_username(self, legacy_id: str) -> str:
+        if not "@" in legacy_id:
+            raise XMPPError("item-not-found", "Invalid contact ID, not a JID")
         return "+" + legacy_id[: legacy_id.find("@")]
 
     async def jid_username_to_legacy_id(self, jid_username: str) -> str:

slidge_whatsapp/event.go

@@ -142,6 +142,10 @@ 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 {
+		return EventUnknown, nil
+	}
+
 	var presence = Presence{
 		JID:      evt.From.ToNonAD().String(),
 		Kind:     PresenceAvailable,
@@ -388,7 +392,7 @@ func newMessageEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 		message.Attachments = append(message.Attachments, attach...)
 		message.Kind = MessageAttachment
 		if context != nil {
-			message = getMessageWithContext(message, context)
+			message = getMessageWithContext(ctx, client, message, context)
 		}
 	}
 
@@ -409,7 +413,7 @@ func newMessageEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 				message.GroupInvite = newGroup(ctx, client, info)
 			}
 		} else {
-			message = getMessageWithContext(message, e.GetContextInfo())
+			message = getMessageWithContext(ctx, client, message, e.GetContextInfo())
 		}
 	}
 
@@ -424,15 +428,21 @@ func newMessageEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 // GetMessageWithContext processes the given [Message] and applies any context metadata might be
 // useful; examples of context include messages being quoted. If no context is found, the original
 // message is returned unchanged.
-func getMessageWithContext(message Message, info *waE2E.ContextInfo) Message {
+func getMessageWithContext(ctx context.Context, client *whatsmeow.Client, message Message, info *waE2E.ContextInfo) Message {
 	if info == nil {
 		return message
 	}
 
+	originJID, err := types.ParseJID(info.GetParticipant())
+	if err != nil {
+		return message
+	}
+
 	message.ReplyID = info.GetStanzaID()
-	message.OriginJID = info.GetParticipant()
+	message.OriginJID = getPreferredJID(ctx, client, originJID).ToNonAD().String()
 	message.IsForwarded = info.GetIsForwarded()
 
+	// Handle reply messages.
 	if q := info.GetQuotedMessage(); q != nil {
 		if qe := q.GetExtendedTextMessage(); qe != nil {
 			message.ReplyBody = qe.GetText()
@@ -441,6 +451,23 @@ func getMessageWithContext(message Message, info *waE2E.ContextInfo) Message {
 		}
 	}
 
+	// Replace LIDs with JIDs in message mentions, if possible.
+	if m := info.GetMentionedJID(); len(m) > 0 {
+		for i := range m {
+			mentionLID, err := types.ParseJID(m[i])
+			if err != nil || mentionLID.Server != types.HiddenUserServer {
+				continue
+			}
+
+			mentionJID := getPreferredJID(ctx, client, mentionLID)
+			if mentionLID == mentionJID {
+				continue
+			}
+
+			message.Body = strings.ReplaceAll(message.Body, "@"+mentionLID.User, "@"+mentionJID.User)
+		}
+	}
+
 	return message
 }
 
@@ -891,7 +918,11 @@ func newEventFromHistory(ctx context.Context, client *whatsmeow.Client, info *wa
 	}
 
 	if info.Participant != nil {
-		message.JID = info.GetParticipant()
+		jid, err := types.ParseJID(info.GetParticipant())
+		if err != nil {
+			return EventUnknown, nil
+		}
+		message.JID = getPreferredJID(ctx, client, jid).ToNonAD().String()
 	} else if info.GetKey().GetFromMe() {
 		message.JID = client.Store.ID.ToNonAD().String()
 	} else {
@@ -906,9 +937,13 @@ func newEventFromHistory(ctx context.Context, client *whatsmeow.Client, info *wa
 	case waWeb.WebMessageInfo_CIPHERTEXT:
 		return EventUnknown, nil
 	case waWeb.WebMessageInfo_CALL_MISSED_VOICE, waWeb.WebMessageInfo_CALL_MISSED_VIDEO:
+		jid, err := types.ParseJID(info.GetKey().GetParticipant())
+		if err != nil {
+			return EventUnknown, nil
+		}
 		return EventCall, &EventPayload{Call: Call{
 			State:     CallMissed,
-			JID:       info.GetKey().GetRemoteJID(),
+			JID:       getPreferredJID(ctx, client, jid).ToNonAD().String(),
 			Timestamp: int64(info.GetMessageTimestamp()),
 		}}
 	case waWeb.WebMessageInfo_REVOKE:
@@ -924,10 +959,14 @@ func newEventFromHistory(ctx context.Context, client *whatsmeow.Client, info *wa
 	// Handle emoji reaction to existing message.
 	for _, r := range info.GetReactions() {
 		if r.GetText() != "" {
+			jid, err := types.ParseJID(r.GetKey().GetParticipant())
+			if err != nil {
+				continue
+			}
 			message.Reactions = append(message.Reactions, Message{
 				Kind:      MessageReaction,
 				ID:        r.GetKey().GetID(),
-				JID:       r.GetKey().GetRemoteJID(),
+				JID:       getPreferredJID(ctx, client, jid).ToNonAD().String(),
 				Body:      r.GetText(),
 				Timestamp: r.GetSenderTimestampMS() / 1000,
 				IsCarbon:  r.GetKey().GetFromMe(),
@@ -943,7 +982,7 @@ func newEventFromHistory(ctx context.Context, client *whatsmeow.Client, info *wa
 		message.Attachments = append(message.Attachments, attach...)
 		message.Kind = MessageAttachment
 		if context != nil {
-			message = getMessageWithContext(message, context)
+			message = getMessageWithContext(ctx, client, message, context)
 		}
 	}
 
@@ -953,7 +992,15 @@ func newEventFromHistory(ctx context.Context, client *whatsmeow.Client, info *wa
 		if client.Store.ID.ToNonAD().String() == r.GetUserJID() {
 			continue
 		}
-		var receipt = Receipt{MessageIDs: []string{message.ID}, JID: r.GetUserJID(), GroupJID: message.GroupJID}
+		jid, err := types.ParseJID(r.GetUserJID())
+		if err != nil {
+			continue
+		}
+		var receipt = Receipt{
+			JID:        getPreferredJID(ctx, client, jid).ToNonAD().String(),
+			GroupJID:   message.GroupJID,
+			MessageIDs: []string{message.ID},
+		}
 		switch info.GetStatus() {
 		case waWeb.WebMessageInfo_DELIVERY_ACK:
 			receipt.Kind = ReceiptDelivered
@@ -971,8 +1018,7 @@ func newEventFromHistory(ctx context.Context, client *whatsmeow.Client, info *wa
 		if message.Body == "" {
 			message.Body = e.GetText()
 		}
-
-		message = getMessageWithContext(message, e.GetContextInfo())
+		message = getMessageWithContext(ctx, client, message, e.GetContextInfo())
 	}
 
 	// Ignore obviously invalid messages.
@@ -1004,8 +1050,10 @@ 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.Sender.ToNonAD().String()}
+func newChatStateEvent(ctx context.Context, client *whatsmeow.Client, evt *events.ChatPresence) (EventKind, *EventPayload) {
+	var state = ChatState{
+		JID: getPreferredJID(ctx, client, evt.Sender, evt.SenderAlt).ToNonAD().String(),
+	}
 	if evt.IsGroup {
 		state.GroupJID = evt.Chat.ToNonAD().String()
 	}
@@ -1146,8 +1194,9 @@ func newGroupParticipant(ctx context.Context, client *whatsmeow.Client, particip
 	if participant.Error > 0 {
 		return GroupParticipant{}
 	}
+	var jid = getPreferredJID(ctx, client, participant.JID, participant.PhoneNumber)
 	var p = GroupParticipant{
-		JID: participant.JID.ToNonAD().String(),
+		JID: jid.ToNonAD().String(),
 	}
 	if participant.IsSuperAdmin {
 		p.Affiliation = GroupAffiliationOwner
@@ -1182,26 +1231,26 @@ func newGroupEvent(ctx context.Context, client *whatsmeow.Client, evt *events.Gr
 	}
 	for _, p := range evt.Join {
 		group.Participants = append(group.Participants, GroupParticipant{
-			JID:    p.ToNonAD().String(),
+			JID:    getPreferredJID(ctx, client, p).ToNonAD().String(),
 			Action: GroupParticipantActionAdd,
 		})
 	}
 	for _, p := range evt.Leave {
 		group.Participants = append(group.Participants, GroupParticipant{
-			JID:    p.ToNonAD().String(),
+			JID:    getPreferredJID(ctx, client, p).ToNonAD().String(),
 			Action: GroupParticipantActionRemove,
 		})
 	}
 	for _, p := range evt.Promote {
 		group.Participants = append(group.Participants, GroupParticipant{
-			JID:         p.ToNonAD().String(),
+			JID:         getPreferredJID(ctx, client, p).ToNonAD().String(),
 			Action:      GroupParticipantActionPromote,
 			Affiliation: GroupAffiliationAdmin,
 		})
 	}
 	for _, p := range evt.Demote {
 		group.Participants = append(group.Participants, GroupParticipant{
-			JID:         p.ToNonAD().String(),
+			JID:         getPreferredJID(ctx, client, p).ToNonAD().String(),
 			Action:      GroupParticipantActionDemote,
 			Affiliation: GroupAffiliationNone,
 		})
@@ -1271,14 +1320,15 @@ 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() {
+func newCallEvent(ctx context.Context, client *whatsmeow.Client, state CallState, meta types.BasicCallMeta) (EventKind, *EventPayload) {
+	if state == CallUnknown {
 		return EventUnknown, nil
 	}
 
+	jid := getPreferredJID(ctx, client, meta.From, meta.CallCreator, meta.CallCreatorAlt)
 	return EventCall, &EventPayload{Call: Call{
 		State:     state,
-		JID:       meta.From.ToNonAD().String(),
+		JID:       jid.ToNonAD().String(),
 		Timestamp: meta.Timestamp.Unix(),
 	}}
 }
@@ -1296,7 +1346,7 @@ func getPreferredJID(ctx context.Context, client *whatsmeow.Client, def types.JI
 
 	for _, s := range jids {
 		if !s.IsEmpty() && s.Server == types.HiddenUserServer {
-			if p, err := client.Store.LIDs.GetPNForLID(ctx, s); err == nil {
+			if p, _ := client.Store.LIDs.GetPNForLID(ctx, s); !p.IsEmpty() {
 				return p
 			}
 		}