whalibmob 5.5.89 → 5.5.90

package/README.md

@@ -1495,6 +1495,9 @@ await client.changeGroupPicture('120363000000000000@g.us', fs.readFileSync('./gr
 const blocked = await client.blockContact('919634847671@s.whatsapp.net')
 await client.unblockContact('919634847671@s.whatsapp.net')
 
+// the block list is addressed by LID; a phone number is resolved to one first,
+// looking it up if it is not already known
+
 // blocking done from the phone arrives as an event
 client.on('blocklist', ({ changes }) => console.log(changes))
 ```

package/lib/Client.js

@@ -3509,27 +3509,71 @@ class WhalibmobClient extends EventEmitter {
     return this._updateBlocklist(jid, 'unblock');
   }
 
-  // The one IQ behind both, as whatsmeow's UpdateBlocklist sends it:
+  // Work out the LID a block list item has to be addressed with, and the phone
+  // JID that goes beside it.
+  //
+  // The server only accepts LID-addressed items on a LID account: a phone JID
+  // comes back as <error code="400" text="bad-request" addressing_mode="lid"/>,
+  // the attribute being the server saying which addressing it wanted. When the
+  // mapping is not known yet a contact usync fetches it.
+  async _resolveBlockTarget(jid) {
+    const norm = toNonAdJid(makeJid(jid));
+    const user = norm.split('@')[0];
+
+    if (norm.endsWith('@lid')) {
+      const pn = this._lidToPn.get(user);
+      return { lid: norm, pn: pn ? pn + '@s.whatsapp.net' : null };
+    }
+
+    let lidUser = this._pnToLid.get(user);
+    if (!lidUser && this._devMgr) {
+      _whaDbg('[DBG] BLOCK_LID_LOOKUP ' + user);
+      try { await this._devMgr._doContactUsync([user]); } catch (_) {}
+      lidUser = this._pnToLid.get(user);
+    }
+    return { lid: lidUser ? lidUser + '@lid' : null, pn: norm };
+  }
+
+  // The one IQ behind both:
   //
   //   <iq xmlns="blocklist" type="set" to="s.whatsapp.net">
-  //     <item jid="<JID>" action="block|unblock"/>
+  //     <item action="block" jid="<LID>" pn_jid="<phone JID>"/>
   //   </iq>
   //
-  // Three things were wrong with the pair this replaces. The jid went out as a
-  // raw string rather than a binary JID. It was not reduced to its bare user
-  // first, so blocking a contact you happened to name with a device suffix sent
-  // the server a device JID it has nothing to block. And the reply was thrown
-  // away without being looked at — including a type="error" reply — so a block
-  // the server refused came back looking exactly like one that worked.
+  // The item is addressed by LID, and a block carries the phone number beside
+  // it; an unblock carries only the LID. That is the shape Baileys'
+  // updateBlockStatus builds, and the one this server accepts — whatsmeow's
+  // UpdateBlocklist still sends the plain JID it was handed, which is what this
+  // used to do and what the server answered with 400 bad-request.
+  //
+  // Three other things were wrong with the pair this replaces. The jid went out
+  // as a raw string rather than a binary JID. It was not reduced to its bare
+  // user first, so naming a contact with a device suffix sent a device JID
+  // there is nothing to block. And the reply was thrown away without being
+  // looked at, so a refusal came back looking exactly like a success.
   async _updateBlocklist(jid, action) {
-    const target = toNonAdJid(makeJid(jid));
+    const { lid, pn } = await this._resolveBlockTarget(jid);
+    if (!lid) {
+      throw new Error(action + 'Contact: could not resolve a LID for ' + jid +
+        ' — the server only accepts LID-addressed block list items. ' +
+        'Check the number is on WhatsApp.');
+    }
+    const attrs = { action, jid: jidStrToObj(lid) };
+    if (action === 'block') {
+      if (!pn) {
+        throw new Error('blockContact: no phone number known for ' + lid +
+          ' — a block has to carry pn_jid beside the LID.');
+      }
+      attrs.pn_jid = jidStrToObj(pn);
+    }
+
     const node = new BinaryNode('iq', {
       id:    this._genMsgId(),
       xmlns: 'blocklist',
       to:    's.whatsapp.net',
       type:  'set'
     }, [
-      new BinaryNode('item', { jid: jidStrToObj(target), action }, null)
+      new BinaryNode('item', attrs, null)
     ]);
 
     const resp = await this._sendIq(node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whalibmob",
-  "version": "5.5.89",
+  "version": "5.5.90",
   "description": "WhatsApp library for interaction with WhatsApp Mobile API no web",
   "author": "Kunboruto50",
   "main": "index.js",