instauto 9.1.4 → 9.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instauto",
-  "version": "9.1.4",
+  "version": "9.1.7",
   "description": "Instagram automation library written in Node.js",
   "main": "src/index.js",
   "scripts": {

package/src/index.js

@@ -45,6 +45,8 @@ const Instauto = async (db, browser, options) => {
     followUserMinFollowers = null,
     followUserMinFollowing = null,
 
+    shouldFollowUser = null,
+
     dontUnfollowUntilTimeElapsed = 3 * 24 * 60 * 60 * 1000,
 
     excludeUsers = [],
@@ -168,11 +170,14 @@ const Instauto = async (db, browser, options) => {
     return new Date().getTime() - followedUserEntry.time < dontUnfollowUntilTimeElapsed;
   }
 
+  // See https://github.com/mifi/SimpleInstaBot/issues/140#issuecomment-1149105387
+  const gotoUrl = async (url) => page.goto(url, { waitUntil: ['load', 'domcontentloaded', 'networkidle0'] });
+
   async function gotoWithRetry(url) {
     const maxAttempts = 3;
     for (let attempt = 0; ; attempt += 1) {
       logger.log(`Goto ${url}`);
-      const response = await page.goto(url);
+      const response = await gotoUrl(url);
       await sleep(2000);
       const status = response.status();
 
@@ -319,9 +324,15 @@ const Instauto = async (db, browser, options) => {
     const elementHandles3 = await page.$x("//header//button[*//span[@aria-label='Following']]");
     if (elementHandles3.length > 0) return elementHandles3[0];
 
-    const elementHandles4 = await page.$x("//header//button[*//*[name()='svg'][@aria-label='Following']]");
+    const elementHandles4 = await page.$x("//header//button[*//span[@aria-label='Requested']]");
     if (elementHandles4.length > 0) return elementHandles4[0];
 
+    const elementHandles5 = await page.$x("//header//button[*//*[name()='svg'][@aria-label='Following']]");
+    if (elementHandles5.length > 0) return elementHandles5[0];
+
+    const elementHandles6 = await page.$x("//header//button[*//*[name()='svg'][@aria-label='Requested']]");
+    if (elementHandles6.length > 0) return elementHandles6[0];
+
     return undefined;
   }
 
@@ -551,7 +562,7 @@ const Instauto = async (db, browser, options) => {
 
       await window.instautoSleep(3000);
 
-      const closeButtonChild = document.querySelector('button [aria-label=Close]');
+      const closeButtonChild = document.querySelector('svg[aria-label="Close"]');
 
       if (!closeButtonChild) throw new Error('Close button not found (aria-label)');
 
@@ -594,9 +605,7 @@ const Instauto = async (db, browser, options) => {
 
     const graphqlUser = await navigateToUserAndGetData(username);
 
-    const followedByCount = graphqlUser.edge_followed_by.count;
-    const followsCount = graphqlUser.edge_follow.count;
-    const isPrivate = graphqlUser.is_private;
+    const { edge_followed_by: { count: followedByCount }, edge_follow: { count: followsCount }, is_private: isPrivate, is_verified: isVerified, is_business_account: isBusinessAccount, is_professional_account: isProfessionalAccount, full_name: fullName, biography, profile_pic_url_hd: profilePicUrlHd, external_url: externalUrl, business_category_name: businessCategoryName, category_name: categoryName } = graphqlUser;
 
     // logger.log('followedByCount:', followedByCount, 'followsCount:', followsCount);
 
@@ -622,6 +631,10 @@ const Instauto = async (db, browser, options) => {
       logger.log('User has too many followers compared to follows or opposite, skipping');
       return false;
     }
+    if (shouldFollowUser !== null && (typeof shouldFollowUser === 'function' && !shouldFollowUser({ username, isVerified, isBusinessAccount, isProfessionalAccount, fullName, biography, profilePicUrlHd, externalUrl, businessCategoryName, categoryName }) === true)) {
+      logger.log(`Custom follow logic returned false for ${username}, skipping`);
+      return false;
+    }
 
     await followUser(username);
 
@@ -791,7 +804,7 @@ const Instauto = async (db, browser, options) => {
 
   if (enableCookies) await tryLoadCookies();
 
-  const goHome = async () => page.goto(`${instagramBaseUrl}/?hl=en`);
+  const goHome = async () => gotoUrl(`${instagramBaseUrl}/?hl=en`);
 
   // https://github.com/mifi/SimpleInstaBot/issues/28
   async function setLang(short, long, assumeLoggedIn = false) {
@@ -803,7 +816,7 @@ const Instauto = async (db, browser, options) => {
       // when logged in, we need to go to account in order to be able to check/set language
       // (need to see the footer)
       if (assumeLoggedIn) {
-        await page.goto(`${instagramBaseUrl}/accounts/edit/`);
+        await gotoUrl(`${instagramBaseUrl}/accounts/edit/`);
       } else {
         await goHome();
       }