Merge pull request #128 from venomlib/fix-lid-migration

Fix lid migration

Author: 9cb14c1ec0

src/lib/wapi/business/send-message-with-buttons.js

@@ -1,3 +1,5 @@
+import { createWidWrapper } from '../helper';
+
 window.WAPI.sendButtons = async function (chatId) {
   var chat = Store.Chat.get(chatId);
   var tempMsg = Object.create(chat.msgs.filter((msg) => msg.__x_isSentByMe)[0]);
@@ -103,12 +105,12 @@ window.WAPI.sendButtons = async function (chatId) {
         .then((t) => chat.msgs.add(t))
         .catch((e) => console.log(e))
     )
-    .then((t) => {
+    .then(async (t) => {
       var e = t[0];
       const s = Store.Base2;
       if (!s.BinaryProtocol)
         window.Store.Base2.BinaryProtocol = new window.Store.bp(11);
-      var idUser = new Store.WidFactory.createWid(chatId);
+      var idUser = await createWidWrapper(chatId);
       var k = Store.createMessageKey({
         ...e,
         to: idUser,

src/lib/wapi/functions/get-chat.js

@@ -1,15 +1,32 @@
+import { createWidWrapper } from '../helper';
+
 export async function getChat(id) {
   if (!id) {
     return false;
   }
   id = typeof id == 'string' ? id : id._serialized;
-  let found = Store.Chat.get(id);
+
+  let gate = window
+    .require('WAWebLid1X1MigrationGating')
+    .Lid1X1MigrationUtils.isLidMigrated();
+  let found = false;
+  if (gate) {
+    console.info('Lid migration found');
+    let chatWid = await createWidWrapper(id);
+    found = await window.Store.FindOrCreateChat.findOrCreateLatestChat(chatWid).chat;
+  } else {
+    console.info('Lid migration not found');
+    found = Store.Chat.get(id);
+  }
+
   if (!found) {
+    console.info('Validating Wid');
     if (Store.CheckWid.validateWid(id)) {
       const ConstructChat = new window.Store.UserConstructor(id, {
         intentionallyUsePrivateConstructor: !0
       });
       const chatWid = new Store.WidFactory.createWid(id);
+      console.log('Adding chat');
       await Store.Chat.add(
         {
           createdLocally: true,
@@ -21,8 +38,7 @@ export async function getChat(id) {
       );
       found = Store.Chat.find(ConstructChat) || false;
     }
-  }
-  if (found) {
+  } else {
     found.sendMessage = found.sendMessage
       ? found.sendMessage
       : function () {

src/lib/wapi/functions/index.js

@@ -54,7 +54,6 @@ export { sendMessage } from './send-message';
 export { sendMessageOptions } from './sendMessageOptions';
 export { sendMessageWithTags } from './send-message-with-tags';
 export { sendMessageWithThumb } from './send-message-with-thumb';
-export { sendMessage2 } from './send-message2';
 export { sendSticker } from './send-sticker';
 export { sendVideoAsGif } from './send-video-as-gif';
 export { setMyName } from './set-my-name';

src/lib/wapi/functions/send-image-with-product.js

@@ -1,5 +1,5 @@
 import { processFiles } from './process-files';
-import { base64ToFile } from '../helper';
+import { base64ToFile, createWidWrapper } from '../helper';
 
 /**
  * Sends product with product image to given chat id
@@ -38,7 +38,7 @@ export function sendImageWithProduct(
         caption
       };
 
-      const idUser = new Store.WidFactory.createWid(chatid);
+      const idUser = await createWidWrapper(chatid);
       await Store.Chat.add(
         {
           createdLocally: true,

src/lib/wapi/functions/send-message.js

@@ -1,3 +1,5 @@
+import { createWidWrapper } from '../helper/index.js';
+
 export async function sendMessage(
   to,
   content,
@@ -27,6 +29,7 @@ export async function sendMessage(
     return WAPI.scope(to, true, 404, 'It is necessary to number');
   }
 
+  createWidWrapper(to);
   const chat = checkNumber
     ? await WAPI.sendExist(to)
     : await WAPI.returnChat(to);

src/lib/wapi/functions/send-message2.js

@@ -1,5 +1,7 @@
+import { createWidWrapper } from '../helper/index.js';
 export async function startTyping(chatId) {
-  const chat = window.Store.WidFactory.createWid(chatId);
+  console.log(`startTyping: chatId ${chatId}`);
+  const chat = createWidWrapper(chatId);
   if (!chat) {
     throw {
       error: true,

src/lib/wapi/functions/simulate-typing.js

@@ -0,0 +1,42 @@
+export async function createWidWrapper(chatId) {
+  let gate = window
+    .require('WAWebLid1X1MigrationGating')
+    .Lid1X1MigrationUtils.isLidMigrated();
+
+  let chatWid = window.Store.WidFactory.createWid(chatId);
+  if (gate) {
+    const isChannel = /@\w*newsletter\b/.test(chatId);
+
+    let chat;
+
+    if (isChannel) {
+      try {
+        chat = window.Store.NewsletterCollection.get(chatId);
+        if (!chat) {
+          await window.Store.ChannelUtils.loadNewsletterPreviewChat(chatId);
+          chat = await window.Store.NewsletterCollection.find(chatWid);
+        }
+      } catch (err) {
+        chat = null;
+      }
+    } else {
+      chat = await window.Store.FindOrCreateChat.findOrCreateLatestChat(chatWid)
+        .then((chat) => chat.chat)
+        .catch(async (_) => {
+          let actions;
+          actions = [
+            {
+              type: 'add',
+              phoneNumber: chatWid.user
+            }
+          ];
+          let query = window
+            .require('WAWebContactSyncUtils')
+            .constructUsyncDeltaQuery(actions);
+          let result = await query.execute();
+          chatWid = window.Store.WidFactory.createWid(result.list[0].lid);
+        });
+    }
+  }
+  return chatWid;
+}

src/lib/wapi/helper/fix-lid-migration.js

@@ -7,3 +7,4 @@ export { sleep } from './sleep';
 export { injectConfig } from './inject-config';
 export { filterObjects } from './filter-object';
 export { filterModule } from './filter-module';
+export { createWidWrapper } from './fix-lid-migration';

src/lib/wapi/helper/index.js

@@ -218,6 +218,16 @@ export const storeObjects = [
     conditions: (module) =>
       module.storeMessages && module.appendMessage ? module : null,
   },
+  {
+    id: 'ChannelUtils',
+    conditions: (module) =>
+      module.loadNewsletterPreviewChat ? module : null,
+  },
+  {
+    id: 'FindOrCreateChat',
+    conditions: (module) =>
+      module.findOrCreateLatestChat ? module : null,
+  },
   {
     id: 'createMessageKey',
     conditions: (module) =>