PR - Fix extract_text_from_element()and find_element*() to find_element() (InstaPy#6438)

* Updated getUserData() and find_element*
Signed-off-by: elulcao <[email protected]>

Thanks @breuerfelix for reviewing, 🚀 
People in this thread please let me know if something is not OK, IG changed a lot these days. 🤗 @her

Author: elulcao

.gitignore

@@ -115,6 +115,7 @@ tests/logs
 
 # Pipfile
 Pipfile
+Pipfile.lock
 
 # Instances
 z_*

CHANGELOG.md

@@ -5,6 +5,17 @@ The **goal** of this file is explaining to the users of our project the notable
 _The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)_
 
 
+## [0.6.16] - 2021-12-11
+
+### Added
+
+- Added filter in `extract_text_from_element()` for non-username elements.
+
+### Fixed
+
+- Fixed `is_private_profile()` when 'NoneType' object is not subscriptable
+- Fixed `find_element*()` to `find_element()`
+
 ## [0.6.15] - 2021-12-02
 
 ### Fixed

docs/settings.md

@@ -43,7 +43,7 @@ comments=[
     {'mandatory_words': [["high", "tide"]], 'comments': ["High tides are better than low"]}
 
     # Only "summer" AND ("lake" OR "occean") will satisfy this:
-    {'mandatory_words': [["summer", ["lake", "occean"]], 'comments': ["Summer fun"]}
+    {'mandatory_words': [["summer", ["lake", "occean"]]], 'comments': ["Summer fun"]}
 
 ]
 session.set_comments(comments)

instapy/__init__.py

@@ -1,7 +1,7 @@
 # flake8: noqa
 
 # __variables__ with double-quoted values will be available in setup.py
-__version__ = "0.6.15"
+__version__ = "0.6.16"
 
 from .instapy import InstaPy
 from .util import smart_run

instapy/clarifai_util.py

@@ -1,8 +1,8 @@
 """Module which handles the clarifai api and checks
 the image for invalid content"""
-from clarifai.rest import ClarifaiApp
-from clarifai.rest import Workflow
+from clarifai.rest import ClarifaiApp, Workflow
 from selenium.common.exceptions import NoSuchElementException
+from selenium.webdriver.common.by import By
 
 from .xpath import read_xpath
 
@@ -119,19 +119,19 @@ def get_source_link(browser):
 
     try:
         source.append(
-            browser.find_element_by_xpath(
-                read_xpath(get_source_link.__name__, "image")
+            browser.find_element(
+                By.XPATH, read_xpath(get_source_link.__name__, "image")
             ).get_attribute("src")
         )
     except NoSuchElementException:
         source.append(
-            browser.find_element_by_xpath(
-                read_xpath(get_source_link.__name__, "video")
+            browser.find_element(
+                By.XPATH, read_xpath(get_source_link.__name__, "video")
             ).get_attribute("src")
         )
         source.append(
-            browser.find_element_by_xpath(
-                read_xpath(get_source_link.__name__, "image_alt")
+            browser.find_element(
+                By.XPATH, read_xpath(get_source_link.__name__, "image_alt")
             ).get_attribute("src")
         )
 

instapy/comment_util.py

@@ -2,38 +2,45 @@
 """ Module which handles the commenting features """
 # import built-in & third-party modules
 import random
-import emoji
 
-# import InstaPy modules
-from .time_util import sleep
-from .util import update_activity
-from .util import getMediaData
-from .util import add_user_to_blacklist
-from .util import click_element
-from .util import get_action_delay
-from .util import explicit_wait
-from .util import web_address_navigator
-from .util import evaluate_mandatory_words
-from .event import Event
-from .quota_supervisor import quota_supervisor
-from .xpath import read_xpath
+import emoji
 
 # import exceptions
-from selenium.common.exceptions import WebDriverException
-from selenium.common.exceptions import InvalidElementStateException
-from selenium.common.exceptions import NoSuchElementException
+from selenium.common.exceptions import (
+    InvalidElementStateException,
+    NoSuchElementException,
+    WebDriverException,
+)
 from selenium.webdriver.common.action_chains import ActionChains
+from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 
+from .event import Event
+from .quota_supervisor import quota_supervisor
+
+# import InstaPy modules
+from .time_util import sleep
+from .util import (
+    add_user_to_blacklist,
+    click_element,
+    evaluate_mandatory_words,
+    explicit_wait,
+    get_action_delay,
+    getMediaData,
+    update_activity,
+    web_address_navigator,
+)
+from .xpath import read_xpath
+
 
 def get_comment_input(browser):
-    comment_input = browser.find_elements_by_xpath(
-        read_xpath(get_comment_input.__name__, "comment_input")
+    comment_input = browser.find_elements(
+        By.XPATH, read_xpath(get_comment_input.__name__, "comment_input")
     )
 
     if len(comment_input) <= 0:
-        comment_input = browser.find_elements_by_xpath(
-            read_xpath(get_comment_input.__name__, "placeholder")
+        comment_input = browser.find_elements(
+            By.XPATH, read_xpath(get_comment_input.__name__, "placeholder")
         )
 
     return comment_input
@@ -45,8 +52,8 @@ def open_comment_section(browser, logger):
         "\t~may cause issues with browser windows of smaller widths"
     )
 
-    comment_elem = browser.find_elements_by_xpath(
-        read_xpath(open_comment_section.__name__, "comment_elem")
+    comment_elem = browser.find_elements(
+        By.XPATH, read_xpath(open_comment_section.__name__, "comment_elem")
     )
 
     if len(comment_elem) > 0:
@@ -265,8 +272,8 @@ def get_comments_on_post(
     explicit_wait(browser, "PFL", [], logger, 10)
 
     try:
-        all_comment_like_buttons = browser.find_elements_by_xpath(
-            like_button_full_XPath
+        all_comment_like_buttons = browser.find_elements(
+            By.XPATH, like_button_full_XPath
         )
 
         if all_comment_like_buttons:
@@ -290,8 +297,8 @@ def get_comments_on_post(
                     logger.info("Could not grab any commenter from this post")
 
         else:
-            comment_unlike_buttons = browser.find_elements_by_xpath(
-                unlike_button_full_XPath
+            comment_unlike_buttons = browser.find_elements(
+                By.XPATH, unlike_button_full_XPath
             )
 
             if comment_unlike_buttons: