fix(status): use LID addressing, skip unresolvable recipients

src/client/lid_pn.rs

@@ -305,6 +305,35 @@ impl Client {
         self.lid_pn_cache.add(&entry).await;
         Ok(Some(entry))
     }
+
+    /// Resolve any user JID to its bare LID form, or `None` when no LID is
+    /// available. Mirrors WA Web's `WAWebLidMigrationUtils.toUserLid`
+    /// (`docs/captured-js/WAWeb/Lid/MigrationUtils.js:17-20`): LID passes
+    /// through, PN goes through the cache-aside mapping, anything else and
+    /// any lookup failure returns `None`.
+    ///
+    /// Used by `send_status_message` to replicate WA Web's
+    /// `compactMap(list, toUserLid)` skip-on-unresolvable semantics.
+    pub(crate) async fn resolve_recipient_to_lid(&self, jid: &Jid) -> Option<Jid> {
+        if jid.is_lid() {
+            return Some(jid.to_non_ad());
+        }
+        if !jid.is_pn() {
+            return None;
+        }
+        match self.get_lid_pn_entry(jid).await {
+            Ok(Some(entry)) => Some(Jid::new(entry.lid, wacore_binary::Server::Lid)),
+            Ok(None) => None,
+            Err(e) => {
+                log::warn!(
+                    "resolve_recipient_to_lid: LID lookup for {} failed: {:?}",
+                    jid,
+                    e
+                );
+                None
+            }
+        }
+    }
 }
 
 #[cfg(test)]

src/send.rs

@@ -290,10 +290,15 @@ impl Client {
         Ok(result)
     }
 
-    /// Send a status/story update to the given recipients using sender key encryption.
+    /// Send a status/story update using sender-key encryption.
     ///
-    /// This builds a `GroupInfo` from the provided recipients (always PN addressing mode),
-    /// then reuses the group encryption pipeline with `to = status@broadcast`.
+    /// Status uses LID addressing (matches `WAWebEncryptAndSendStatusMsg`):
+    /// LID recipients pass through, PN recipients are resolved to LID via
+    /// `Client::get_lid_pn_entry` (cache-aside), and unresolvable recipients
+    /// are skipped silently. The resulting `GroupInfo` carries
+    /// `AddressingMode::Lid`; `prepare_group_stanza` signs with `own_lid`
+    /// and emits `addressing_mode="lid"` on the stanza. Errors only if no
+    /// recipient could be resolved.
     pub(crate) async fn send_status_message(
         &self,
         message: wa::Message,
@@ -316,58 +321,39 @@ impl Client {
             .pn
             .take()
             .ok_or(crate::client::ClientError::NotLoggedIn)?;
-        let own_lid = device_snapshot
-            .lid
-            .take()
-            .unwrap_or_else(|| own_jid.clone());
-
-        // Status always uses PN addressing. Resolve any LID recipients to their
-        // phone numbers so we don't end up with duplicate PN+LID entries for the
-        // same user (which causes server error 400).
-        // Reject non-user JIDs (groups, broadcasts, etc.) to prevent invalid
-        // <participants> entries that cause server errors.
-        let mut resolved_recipients = Vec::with_capacity(recipients.len());
+        // Status is LID-addressed (matches WA Web post-LID-migration). Without
+        // a real device LID we can't sign or fan out correctly; refuse rather
+        // than silently emit `addressing_mode="lid"` with a PN sender.
+        let own_lid = device_snapshot.lid.take().ok_or_else(|| {
+            anyhow!(
+                "Cannot send status: device has no LID yet. Finish pairing / LID \
+                 migration before posting status."
+            )
+        })?;
+
+        // Fail fast for any JID that isn't a user (PN or LID). Mirrors WA
+        // Web's `asUserWidOrThrow` inside `toUserLid`: non-user inputs are a
+        // programming bug, not something to silently drop during resolution.
         for jid in recipients {
-            if jid.is_group() || jid.is_status_broadcast() || jid.is_broadcast_list() {
+            if !(jid.is_pn() || jid.is_lid()) {
                 return Err(anyhow!(
-                    "Invalid status recipient {}: must be a user JID, not a group/broadcast",
+                    "Invalid status recipient {}: must be a user JID (PN or LID), \
+                     not a group/broadcast/newsletter/hosted/etc.",
                     jid
                 ));
             }
-            if jid.is_lid() {
-                if let Some(pn) = self.lid_pn_cache.get_phone_number(&jid.user).await {
-                    resolved_recipients.push(Jid::new(&pn, Server::Pn));
-                } else {
-                    return Err(anyhow!(
-                        "No PN mapping for LID {}. Ensure the recipient has been \
-                         contacted previously.",
-                        jid
-                    ));
-                }
-            } else {
-                resolved_recipients.push(jid.clone());
-            }
         }
 
-        if resolved_recipients.is_empty() {
-            return Err(anyhow!("No valid PN recipients after LID resolution"));
+        // Resolve every user JID to its LID form (LID passes through; PN goes
+        // through the cache-aside lookup; `None` means no mapping — dropped
+        // silently to match WA Web `compactMap(list, toUserLid)`).
+        let mut resolved: Vec<Option<Jid>> = Vec::with_capacity(recipients.len());
+        for jid in recipients {
+            resolved.push(self.resolve_recipient_to_lid(jid).await);
         }
 
-        // Deduplicate by user (in case both LID and PN were provided for the same user)
-        let mut seen_users = std::collections::HashSet::new();
-        resolved_recipients.retain(|jid| seen_users.insert(jid.user.clone()));
-
-        let mut group_info = GroupInfo::new(resolved_recipients, AddressingMode::Pn);
-
-        // Ensure we're in the participant list
-        let own_base = own_jid.to_non_ad();
-        if !group_info
-            .participants
-            .iter()
-            .any(|p| p.is_same_user_as(&own_base))
-        {
-            group_info.participants.push(own_base);
-        }
+        let participants = wacore::send::assemble_status_participants(resolved, &own_lid)?;
+        let mut group_info = GroupInfo::new(participants, AddressingMode::Lid);
 
         self.add_recent_message(&to, &request_id, &message).await;
 
@@ -376,7 +362,11 @@ impl Client {
 
         let force_skdm = {
             use wacore::libsignal::store::sender_key_name::SenderKeyName;
-            let sender_address = own_jid.to_protocol_address();
+            // Sender key name tracks the addressing mode of the group stanza.
+            // Since status now uses LID addressing (see send_status_message
+            // header), the key is stored under own_lid, matching the address
+            // prepare_group_stanza derives internally.
+            let sender_address = own_lid.to_protocol_address();
             let sender_key_name = SenderKeyName::from_parts(&to_str, sender_address.as_str());
 
             let device_guard = device_store_arc.read().await;
@@ -396,7 +386,7 @@ impl Client {
         let skdm_target_devices: Option<Vec<Jid>> = if force_skdm {
             None
         } else {
-            self.resolve_skdm_targets(&to_str, &group_info.participants, &own_jid)
+            self.resolve_skdm_targets(&to_str, &group_info.participants, &own_lid)
                 .await
         };
 

wacore/src/send.rs

@@ -1424,6 +1424,36 @@ pub fn ensure_status_participants(
     stanza
 }
 
+/// Dedup a pre-resolved status recipient list by user, then anchor the sender's
+/// own LID. Errors when no recipient was resolvable (matches WA Web's
+/// `WAWebLidMigrationUtils.toUserLid` + `compactMap` dropping unresolvable
+/// entries; an empty result means "nothing to send to").
+///
+/// Pure function: no allocations besides the returned `Vec` and (when needed)
+/// the own-LID push. Dedup is a linear Vec scan — status lists stay small
+/// enough that a HashSet is not worth its allocation.
+pub fn assemble_status_participants<I>(resolved: I, own_lid: &Jid) -> anyhow::Result<Vec<Jid>>
+where
+    I: IntoIterator<Item = Option<Jid>>,
+{
+    let iter = resolved.into_iter();
+    let (lower, _upper) = iter.size_hint();
+    let mut out: Vec<Jid> = Vec::with_capacity(lower.saturating_add(1));
+    for jid in iter.flatten() {
+        if !out.iter().any(|r| r.user == jid.user) {
+            out.push(jid);
+        }
+    }
+    if out.is_empty() {
+        anyhow::bail!("No valid status recipients after LID resolution");
+    }
+    let own_base = own_lid.to_non_ad();
+    if !out.iter().any(|r| r.user == own_base.user) {
+        out.push(own_base);
+    }
+    Ok(out)
+}
+
 /// Build a `Message.ProtocolMessage` for `GROUP_MEMBER_LABEL_CHANGE`.
 ///
 /// Sent via the standard E2EE fanout, not an IQ. Empty `label` clears.
@@ -1450,6 +1480,91 @@ mod tests {
     use std::collections::HashMap;
     use wacore_binary::Jid;
 
+    mod assemble_status_participants {
+        use super::*;
+
+        fn lid(u: &str) -> Jid {
+            u.parse().expect("parse LID jid")
+        }
+
+        #[test]
+        fn dedup_keeps_first_entry_per_user_and_anchors_own() {
+            let own = lid("99999999999999@lid");
+            let out = assemble_status_participants(
+                vec![
+                    Some(lid("111@lid")),
+                    Some(lid("222@lid")),
+                    Some(lid("111@lid")),
+                    Some(lid("333@lid")),
+                ],
+                &own,
+            )
+            .expect("should succeed");
+            let users: Vec<&str> = out.iter().map(|j| j.user.as_str()).collect();
+            assert_eq!(users, ["111", "222", "333", "99999999999999"]);
+        }
+
+        #[test]
+        fn skips_none_entries_matching_wa_web_compactmap() {
+            // Unresolvable recipients arrive as `None` and must be silently
+            // dropped — mirrors WA Web's `compactMap(list, toUserLid)`.
+            let own = lid("me@lid");
+            let out = assemble_status_participants(
+                vec![None, Some(lid("111@lid")), None, Some(lid("222@lid"))],
+                &own,
+            )
+            .expect("should succeed");
+            let users: Vec<&str> = out.iter().map(|j| j.user.as_str()).collect();
+            assert_eq!(users, ["111", "222", "me"]);
+        }
+
+        #[test]
+        fn does_not_duplicate_own_when_already_in_list() {
+            let own = lid("me@lid");
+            let out =
+                assemble_status_participants(vec![Some(lid("111@lid")), Some(lid("me@lid"))], &own)
+                    .expect("should succeed");
+            let users: Vec<&str> = out.iter().map(|j| j.user.as_str()).collect();
+            assert_eq!(users, ["111", "me"]);
+        }
+
+        #[test]
+        fn errors_when_every_recipient_is_unresolvable() {
+            // Regression guard for the original bug: a single LID-only
+            // contact used to hard-abort the send with
+            // `No PN mapping for LID ...`. The new contract is softer —
+            // individual unresolvable entries are dropped — but we still
+            // refuse to send when the entire list came back empty, rather
+            // than silently broadcasting to own devices only.
+            let own = lid("me@lid");
+            let err = assemble_status_participants(vec![None, None, None], &own)
+                .expect_err("all-None list must error");
+            assert!(err.to_string().contains("No valid status recipients"));
+        }
+
+        #[test]
+        fn errors_when_list_is_empty() {
+            let own = lid("me@lid");
+            let err = assemble_status_participants(Vec::<Option<Jid>>::new(), &own)
+                .expect_err("empty list must error");
+            assert!(err.to_string().contains("No valid status recipients"));
+        }
+
+        #[test]
+        fn strips_device_suffix_from_own_lid() {
+            // Snapshot lid from the device store carries a device id; the
+            // participant list uses bare USER JIDs.
+            let own: Jid = "me:5@lid".parse().unwrap();
+            let out = assemble_status_participants(vec![Some(lid("111@lid"))], &own)
+                .expect("should succeed");
+            let me = out
+                .iter()
+                .find(|j| j.user.as_str() == "me")
+                .expect("own LID should be present");
+            assert_eq!(me.device, 0, "own LID should be non-ad (device=0)");
+        }
+    }
+
     #[test]
     fn build_member_label_message_sets_fields() {
         let msg = build_member_label_message("VIP".to_string(), 1_766_847_151);