instauto 7.1.2 → 7.2.1

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,19 +799,56 @@ const Instauto = async (db, browser, options) => {
 
   if (enableCookies) await tryLoadCookies();
 
+  const goHome = async () => page.goto(`${instagramBaseUrl}/`);
+
+  // https://github.com/mifi/SimpleInstaBot/issues/28
+  async function setLang(short, long) {
+    logger.log(`Setting language to ${long} (${short})`);
 
-  // Not sure if we can set cookies before having gone to a page
-  await page.goto(`${instagramBaseUrl}/`);
-  await sleep(1000);
-  logger.log('Setting language to english');
-  await page.setCookie({
-    name: 'ig_lang',
-    value: 'en',
-    path: '/',
-  });
-  await sleep(1000);
-  await page.goto(`${instagramBaseUrl}/`);
-  await sleep(3000);
+    // This doesn't seem to always work, hence why it's just a fallback now
+    async function fallbackSetLang() {
+      await goHome();
+      await sleep(1000);
+
+      await page.setCookie({
+        name: 'ig_lang',
+        value: short,
+        path: '/',
+      });
+      await sleep(1000);
+      await goHome();
+      await sleep(3000);
+    }
+
+    try {
+      await sleep(1000);
+      await goHome();
+      await sleep(3000);
+      const elementHandles = await page.$x(`//select[//option[@value='${short}' and text()='${long}']]`);
+      if (elementHandles.length < 1) throw new Error('Language selector not found');
+      logger.log('Found language selector');
+
+      // https://stackoverflow.com/questions/45864516/how-to-select-an-option-from-dropdown-select
+      await page.evaluate((selectElem, short2) => {
+        const optionElem = selectElem.querySelector(`option[value='${short2}']`);
+        optionElem.selected = true;
+        // eslint-disable-next-line no-undef
+        const event = new Event('change', { bubbles: true });
+        selectElem.dispatchEvent(event);
+      }, elementHandles[0], short);
+      logger.log('Selected language');
+
+      await sleep(3000);
+      await goHome();
+      await sleep(1000);
+    } catch (err) {
+      logger.error('Failed to set language, trying fallback (cookie)', err);
+      await fallbackSetLang();
+    }
+  }
+
+  const setEnglishLang = async () => setLang('en', 'English');
+  // const setEnglishLang = async () => setLang('de', 'Deutsch');
 
   async function tryPressButton(elementHandles, name) {
     try {
@@ -784,6 +862,7 @@ const Instauto = async (db, browser, options) => {
     }
   }
 
+  await setEnglishLang();
 
   await tryPressButton(await page.$x('//button[contains(text(), "Accept")]'), 'Accept cookies dialog');
 
@@ -816,7 +895,6 @@ const Instauto = async (db, browser, options) => {
     // Sometimes login button gets stuck with a spinner
     // https://github.com/mifi/SimpleInstaBot/issues/25
     if (!(await isLoggedIn())) {
-      await sleep(5000);
       logger.log('Still not logged in, trying to reload loading page');
       await page.reload();
       await sleep(5000);
@@ -824,13 +902,18 @@ const Instauto = async (db, browser, options) => {
 
     let warnedAboutLoginFail = false;
     while (!(await isLoggedIn())) {
-      if (!warnedAboutLoginFail) logger.warn('WARNING: Login has not succeeded. This could be because of an incorrect username/password, or a "suspicious login attempt"-message. You need to manually complete the process.');
+      if (!warnedAboutLoginFail) logger.warn('WARNING: Login has not succeeded. This could be because of an incorrect username/password, or a "suspicious login attempt"-message. You need to manually complete the process, or if really logged in, click the Instagram logo in the top left to go to the Home page.');
       warnedAboutLoginFail = true;
       await sleep(5000);
     }
 
+    // In case language gets reset after logging in
+    await setEnglishLang();
+
     // Mobile version https://github.com/mifi/SimpleInstaBot/issues/7
-    await tryPressButton(await page.$x('//button[contains(text(), "Save Info")]'), 'Save login info dialog');
+    await tryPressButton(await page.$x('//button[contains(text(), "Save Info")]'), 'Login info dialog: Save Info');
+    // May sometimes be "Save info" too? https://github.com/mifi/instauto/pull/70
+    await tryPressButton(await page.$x('//button[contains(text(), "Save info")]'), 'Login info dialog: Save info');
   }
 
   await tryPressButton(await page.$x('//button[contains(text(), "Not Now")]'), 'Turn on Notifications dialog');
@@ -859,6 +942,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.2",
+  "version": "7.2.1",
   "description": "Instagram automation library written in Node.js",
   "main": "index.js",
   "scripts": {