instauto 9.1.11 → 9.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instauto",
-  "version": "9.1.11",
+  "version": "9.2.1",
   "description": "Instagram automation library written in Node.js",
   "main": "src/index.js",
   "scripts": {
@@ -23,7 +23,6 @@
   },
   "devDependencies": {
     "eslint": "^7.32.0 || ^8.2.0",
-    "eslint-config-airbnb": "^16.1.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.25.2",
     "puppeteer": "^1.19.0"

package/src/index.js

@@ -55,6 +55,7 @@ const Instauto = async (db, browser, options) => {
     followUserMinFollowing = null,
 
     shouldFollowUser = null,
+    shouldLikeMedia = null,
 
     dontUnfollowUntilTimeElapsed = 3 * 24 * 60 * 60 * 1000,
 
@@ -128,11 +129,13 @@ const Instauto = async (db, browser, options) => {
     }
   }
 
+  const sleepFixed = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
   const sleep = (ms, deviation = 1) => {
     let msWithDev = ((Math.random() * deviation) + 1) * ms;
     if (dryRun) msWithDev = Math.min(3000, msWithDev); // for dryRun, no need to wait so long
     logger.log('Waiting', (msWithDev / 1000).toFixed(2), 'sec');
-    return new Promise(resolve => setTimeout(resolve, msWithDev));
+    return sleepFixed(msWithDev);
   };
 
   async function onImageLiked({ username, href }) {
@@ -279,7 +282,7 @@ const Instauto = async (db, browser, options) => {
           }
         }
       } catch (err) {
-        logger.warn('Failed to get user data from page', err);
+        logger.warn(`Unable to get user data from page (${err.name}) - This is normal`);
       }
       return undefined;
     }
@@ -412,7 +415,11 @@ const Instauto = async (db, browser, options) => {
   }
 
   async function findUnfollowConfirmButton() {
-    const elementHandles = await page.$x("//button[text()='Unfollow']");
+    let elementHandles = await page.$x("//button[text()='Unfollow']");
+    if (elementHandles.length > 0) return elementHandles[0];
+
+    // https://github.com/mifi/SimpleInstaBot/issues/191
+    elementHandles = await page.$x("//*[@role='button'][contains(.,'Unfollow')]");
     return elementHandles[0];
   }
 
@@ -570,7 +577,7 @@ const Instauto = async (db, browser, options) => {
   }
 
   /* eslint-disable no-undef */
-  async function likeCurrentUserImagesPageCode({ dryRun: dryRunIn, likeImagesMin, likeImagesMax }) {
+  async function likeCurrentUserImagesPageCode({ dryRun: dryRunIn, likeImagesMin, likeImagesMax, shouldLikeMedia: shouldLikeMediaIn }) {
     const allImages = Array.from(document.getElementsByTagName('a')).filter(el => /instagram.com\/p\//.test(el.href));
 
     // eslint-disable-next-line no-shadow
@@ -629,12 +636,42 @@ const Instauto = async (db, browser, options) => {
 
       if (!foundClickable) throw new Error('Like button not found');
 
-      if (!dryRunIn) {
-        foundClickable.click();
+      const instautoLog2 = instautoLog;
+
+      // eslint-disable-next-line no-inner-declarations
+      function likeImage() {
+        if (shouldLikeMediaIn !== null && (typeof shouldLikeMediaIn === 'function')) {
+          const presentation = dialog.querySelector('article[role=presentation]');
+          const img = presentation.querySelector('img[alt^="Photo by "]');
+          const video = presentation.querySelector('video[type="video/mp4"]');
+          const mediaDesc = presentation.querySelector('[role=menuitem] h2 ~ div').textContent;
+          let mediaType; let src; let alt; let poster;
+          if (img) {
+            mediaType = 'image';
+            ({ src } = img);
+            ({ alt } = img);
+          } else if (video) {
+            mediaType = 'video';
+            ({ poster } = video);
+            ({ src } = video);
+          } else {
+            instautoLog2('Could not determin mediaType');
+          }
 
+          if (!shouldLikeMediaIn({ mediaType, mediaDesc, src, alt, poster })) {
+            instautoLog2(`shouldLikeMedia returned false for ${image.href}, skipping`);
+            return;
+          }
+        }
+
+        foundClickable.click();
         window.instautoOnImageLiked(image.href);
       }
 
+      if (!dryRunIn) {
+        likeImage();
+      }
+
       await window.instautoSleep(3000);
 
       const closeButtonChild = document.querySelector('svg[aria-label="Close"]');
@@ -669,7 +706,7 @@ const Instauto = async (db, browser, options) => {
       // Ignore already exists error
     }
 
-    await page.evaluate(likeCurrentUserImagesPageCode, { dryRun, likeImagesMin, likeImagesMax });
+    await page.evaluate(likeCurrentUserImagesPageCode, { dryRun, likeImagesMin, likeImagesMax, shouldLikeMedia });
   }
 
   async function followUserRespectingRestrictions({ username, skipPrivate = false }) {
@@ -691,17 +728,17 @@ const Instauto = async (db, browser, options) => {
       return false;
     }
     if (
-      (followUserMaxFollowers != null && followedByCount > followUserMaxFollowers) ||
-      (followUserMaxFollowing != null && followsCount > followUserMaxFollowing) ||
-      (followUserMinFollowers != null && followedByCount < followUserMinFollowers) ||
-      (followUserMinFollowing != null && followsCount < followUserMinFollowing)
+      (followUserMaxFollowers != null && followedByCount > followUserMaxFollowers)
+      || (followUserMaxFollowing != null && followsCount > followUserMaxFollowing)
+      || (followUserMinFollowers != null && followedByCount < followUserMinFollowers)
+      || (followUserMinFollowing != null && followsCount < followUserMinFollowing)
     ) {
       logger.log('User has too many or too few followers or following, skipping.', 'followedByCount:', followedByCount, 'followsCount:', followsCount);
       return false;
     }
     if (
-      (followUserRatioMax != null && ratio > followUserRatioMax) ||
-      (followUserRatioMin != null && ratio < followUserRatioMin)
+      (followUserRatioMax != null && ratio > followUserRatioMax)
+      || (followUserRatioMin != null && ratio < followUserRatioMin)
     ) {
       logger.log('User has too many followers compared to follows or opposite, skipping');
       return false;
@@ -1003,7 +1040,7 @@ const Instauto = async (db, browser, options) => {
       await sleep(6000);
     }
 
-    await sleep(6000);
+    await sleepFixed(10000);
 
     // Sometimes login button gets stuck with a spinner
     // https://github.com/mifi/SimpleInstaBot/issues/25
@@ -1137,9 +1174,9 @@ const Instauto = async (db, browser, options) => {
     });
 
     function condition(username) {
-      return getPrevFollowedUser(username) &&
-        !excludeUsers.includes(username) &&
-        (new Date().getTime() - getPrevFollowedUser(username).time) / (1000 * 60 * 60 * 24) > ageInDays;
+      return getPrevFollowedUser(username)
+        && !excludeUsers.includes(username)
+        && (new Date().getTime() - getPrevFollowedUser(username).time) / (1000 * 60 * 60 * 24) > ageInDays;
     }
 
     return safelyUnfollowUserList(followingUsersGenerator, limit, condition);
@@ -1151,8 +1188,7 @@ const Instauto = async (db, browser, options) => {
       getFollowers: false,
     });
 
-    return allFollowing.filter(u =>
-      !getPrevFollowedUser(u) && !excludeUsers.includes(u));
+    return allFollowing.filter(u => !getPrevFollowedUser(u) && !excludeUsers.includes(u));
   }
 
   return {