instauto 7.1.4 → 7.2.2

package/index.js

@@ -242,12 +242,31 @@ const Instauto = async (db, browser, options) => {
     }
   }
 
-  async function findFollowButton() {
-    const elementHandles = await page.$x("//header//button[text()='Follow']");
+  // How to test xpaths in the browser:
+  // document.evaluate("your xpath", document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null ).singleNodeValue
+  async function findButtonWithText(text) {
+    // todo escape text?
+
+    // button seems to look like this now:
+    // <button class="..."><div class="...">Follow</div></button>
+    // https://sqa.stackexchange.com/questions/36918/xpath-text-buy-now-is-working-but-not-containstext-buy-now
+    // https://github.com/mifi/SimpleInstaBot/issues/106
+    let elementHandles = await page.$x(`//header//button[contains(.,'${text}')]`);
     if (elementHandles.length > 0) return elementHandles[0];
 
-    const elementHandles2 = await page.$x("//header//button[text()='Follow Back']");
-    if (elementHandles2.length > 0) return elementHandles2[0];
+    // old button:
+    elementHandles = await page.$x(`//header//button[text()='${text}']`);
+    if (elementHandles.length > 0) return elementHandles[0];
+
+    return undefined;
+  }
+
+  async function findFollowButton() {
+    let button = await findButtonWithText('Follow');
+    if (button) return button;
+
+    button = await findButtonWithText('Follow Back');
+    if (button) return button;
 
     return undefined;
   }
@@ -354,16 +373,12 @@ const Instauto = async (db, browser, options) => {
 
   const isLoggedIn = async () => (await page.$x('//*[@aria-label="Home"]')).length === 1;
 
-  async function getFollowersOrFollowing({
-    userId, getFollowers = false, maxPages, shouldProceed: shouldProceedArg,
-  }) {
-    const graphqlUrl = `${instagramBaseUrl}/graphql/query`;
-    const followersUrl = `${graphqlUrl}/?query_hash=37479f2b8209594dde7facb0d904896a`;
-    const followingUrl = `${graphqlUrl}/?query_hash=58712303d941c6855d4e888c5f0cd22f`;
+  async function graphqlQueryUsers({ queryHash, getResponseProp, maxPages, shouldProceed: shouldProceedArg, graphqlVariables: graphqlVariablesIn }) {
+    const graphqlUrl = `${instagramBaseUrl}/graphql/query/?query_hash=${queryHash}`;
 
     const graphqlVariables = {
-      id: userId,
       first: 50,
+      ...graphqlVariablesIn,
     };
 
     const outUsers = [];
@@ -379,15 +394,14 @@ const Instauto = async (db, browser, options) => {
     };
 
     while (shouldProceed()) {
-      const url = `${getFollowers ? followersUrl : followingUrl}&variables=${JSON.stringify(graphqlVariables)}`;
+      const url = `${graphqlUrl}&variables=${JSON.stringify(graphqlVariables)}`;
       // logger.log(url);
       await page.goto(url);
       const json = await getPageJson();
 
-      const subPropName = getFollowers ? 'edge_followed_by' : 'edge_follow';
-
-      const pageInfo = json.data.user[subPropName].page_info;
-      const { edges } = json.data.user[subPropName];
+      const subProp = getResponseProp(json);
+      const pageInfo = subProp.page_info;
+      const { edges } = subProp;
 
       edges.forEach(e => outUsers.push(e.node.username));
 
@@ -404,6 +418,33 @@ const Instauto = async (db, browser, options) => {
     return outUsers;
   }
 
+  async function getFollowersOrFollowing({
+    userId, getFollowers = false, maxPages, shouldProceed,
+  }) {
+    return graphqlQueryUsers({
+      getResponseProp: (json) => json.data.user[getFollowers ? 'edge_followed_by' : 'edge_follow'],
+      graphqlVariables: { id: userId },
+      shouldProceed,
+      maxPages,
+      queryHash: getFollowers ? '37479f2b8209594dde7facb0d904896a' : '58712303d941c6855d4e888c5f0cd22f',
+    });
+  }
+
+  async function getUsersWhoLikedContent({
+    contentId, maxPages, shouldProceed,
+  }) {
+    return graphqlQueryUsers({
+      getResponseProp: (json) => json.data.shortcode_media.edge_liked_by,
+      graphqlVariables: {
+        shortcode: contentId,
+        include_reel: true,
+      },
+      shouldProceed,
+      maxPages,
+      queryHash: 'd5d763b1e2acf209d62d22d184488e57',
+    });
+  }
+
   /* eslint-disable no-undef */
   async function likeCurrentUserImagesPageCode({ dryRun: dryRunIn, likeImagesMin, likeImagesMax }) {
     const allImages = Array.from(document.getElementsByTagName('a')).filter(el => /instagram.com\/p\//.test(el.href));
@@ -758,7 +799,7 @@ const Instauto = async (db, browser, options) => {
 
   if (enableCookies) await tryLoadCookies();
 
-  const goHome = async () => page.goto(`${instagramBaseUrl}/`);
+  const goHome = async () => page.goto(`${instagramBaseUrl}/?hl=en`);
 
   // https://github.com/mifi/SimpleInstaBot/issues/28
   async function setLang(short, long) {
@@ -788,15 +829,22 @@ const Instauto = async (db, browser, options) => {
       logger.log('Found language selector');
 
       // https://stackoverflow.com/questions/45864516/how-to-select-an-option-from-dropdown-select
-      await page.evaluate((selectElem, short2) => {
+      const alreadyEnglish = await page.evaluate((selectElem, short2) => {
         const optionElem = selectElem.querySelector(`option[value='${short2}']`);
+        if (optionElem.selected) return true; // already selected?
         optionElem.selected = true;
         // eslint-disable-next-line no-undef
         const event = new Event('change', { bubbles: true });
         selectElem.dispatchEvent(event);
+        return false;
       }, elementHandles[0], short);
-      logger.log('Selected language');
 
+      if (alreadyEnglish) {
+        logger.log('Already English language');
+        return;
+      }
+
+      logger.log('Selected language');
       await sleep(3000);
       await goHome();
       await sleep(1000);
@@ -809,12 +857,12 @@ const Instauto = async (db, browser, options) => {
   const setEnglishLang = async () => setLang('en', 'English');
   // const setEnglishLang = async () => setLang('de', 'Deutsch');
 
-  async function tryPressButton(elementHandles, name) {
+  async function tryPressButton(elementHandles, name, sleepMs = 3000) {
     try {
       if (elementHandles.length === 1) {
         logger.log(`Pressing button: ${name}`);
         elementHandles[0].click();
-        await sleep(3000);
+        await sleep(sleepMs);
       }
     } catch (err) {
       logger.warn(`Failed to press button: ${name}`);
@@ -824,6 +872,8 @@ const Instauto = async (db, browser, options) => {
   await setEnglishLang();
 
   await tryPressButton(await page.$x('//button[contains(text(), "Accept")]'), 'Accept cookies dialog');
+  await tryPressButton(await page.$x('//button[contains(text(), "Only allow essential cookies")]'), 'Accept cookies dialog 2 button 1', 10000);
+  await tryPressButton(await page.$x('//button[contains(text(), "Allow essential and optional cookies")]'), 'Accept cookies dialog 2 button 2', 10000);
 
   if (!(await isLoggedIn())) {
     if (!myUsername || !password) {
@@ -835,7 +885,7 @@ const Instauto = async (db, browser, options) => {
       await page.click('a[href="/accounts/login/?source=auth_switcher"]');
       await sleep(1000);
     } catch (err) {
-      logger.warn('Login page button not found, assuming we have login form');
+      logger.info('No login page button, assuming we are on login form');
     }
 
     // Mobile version https://github.com/mifi/SimpleInstaBot/issues/7
@@ -846,8 +896,15 @@ const Instauto = async (db, browser, options) => {
     await page.type('input[name="password"]', password, { delay: 50 });
     await sleep(1000);
 
-    const loginButton = (await page.$x("//button[.//text() = 'Log In']"))[0];
-    await loginButton.click();
+    for (;;) {
+      const loginButton = (await page.$x("//button[.//text() = 'Log In']"))[0];
+      if (loginButton) {
+        await loginButton.click();
+        break;
+      }
+      logger.warn('Login button not found. Maybe you can help me click it? And also report an issue on github with a screenshot of what you\'re seeing :)');
+      await sleep(6000);
+    }
 
     await sleep(6000);
 
@@ -901,6 +958,7 @@ const Instauto = async (db, browser, options) => {
     sleep,
     listManuallyFollowedUsers,
     getFollowersOrFollowing,
+    getUsersWhoLikedContent,
     safelyUnfollowUserList,
     getPage,
     followUsersFollowers,

package/package.json

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