Fix user following (InstaPy#6204)

* Fix user following

* reformat unfollow_util

* Fix formatting so travis stops complaining

* reformat proxy_extension.py

* Changes requested by review

* Remove unused import

* Update CHANGELOG.md

Bumped version for the PR commit, UNRELEASED

Co-authored-by: Daniel Carvallo <[email protected]>

Author: schealex

CHANGELOG.md

@@ -5,7 +5,14 @@ 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] - UNRELEASED
+
+### Added
+
+- Fix user following and verification of follow
+
 ## [0.6.15] - UNRELEASED
+
 ### Added
 
 - Added `verified_only` argument to `get_followers` to return only verified users

instapy/browser.py

@@ -158,7 +158,7 @@ def set_selenium_local_session(
 
 
 def proxy_authentication(browser, logger, proxy_username, proxy_password):
-    """ Authenticate proxy using popup alert window """
+    """Authenticate proxy using popup alert window"""
 
     # FIXME: https://github.com/SeleniumHQ/selenium/issues/7239
     # this feauture is not working anymore due to the Selenium bug report above
@@ -273,10 +273,10 @@ def wrapper(*args, **kwargs):
 
 
 class custom_browser(Remote):
-    """ Custom browser instance for manupulation later on """
+    """Custom browser instance for manupulation later on"""
 
     def find_element_by_xpath(self, *args, **kwargs):
-        """ example usage of hooking into built in functions """
+        """example usage of hooking into built in functions"""
         rv = super(custom_browser, self).find_element_by_xpath(*args, **kwargs)
         return rv
 
@@ -312,6 +312,6 @@ def wait_for_valid_authorization(self, username, logger):
 
 
 def convert_selenium_browser(driver):
-    """ Changed the class to our custom class """
+    """Changed the class to our custom class"""
     driver.__class__ = custom_browser
     return driver

instapy/clarifai_util.py

@@ -102,7 +102,7 @@ def check_image(
 
 
 def given_tags_in_result(search_tags, clarifai_tags, full_match=False):
-    """Checks the clarifai tags if it contains one (or all) search tags """
+    """Checks the clarifai tags if it contains one (or all) search tags"""
     if full_match:
         return all([tag in clarifai_tags for tag in search_tags])
     else:

instapy/comment_util.py

@@ -236,7 +236,7 @@ def verify_mandatory_words(
 def get_comments_on_post(
     browser, owner, poster, amount, post_link, ignore_users, randomize, logger
 ):
-    """ Fetch comments data on posts """
+    """Fetch comments data on posts"""
     web_address_navigator(browser, post_link)
 
     comments = []
@@ -333,7 +333,7 @@ def get_comments_on_post(
 
 
 def is_commenting_enabled(browser, logger):
-    """ Find out if commenting on the post is enabled """
+    """Find out if commenting on the post is enabled"""
 
     try:
         comments_disabled = browser.execute_script(
@@ -365,7 +365,7 @@ def is_commenting_enabled(browser, logger):
 
 
 def get_comments_count(browser, logger):
-    """ Get the number of total comments in the post """
+    """Get the number of total comments in the post"""
     try:
         comments_count = browser.execute_script(
             "return window.__additionalData[Object.keys(window.__additionalData)[0]].data"
@@ -380,7 +380,7 @@ def get_comments_count(browser, logger):
 
 
 def verify_commented_image(browser, link, owner, logger):
-    """ Fetch comments data on posts to determine if already commented """
+    """Fetch comments data on posts to determine if already commented"""
 
     web_address_navigator(browser, link)
 

instapy/commenters_util.py

@@ -316,7 +316,7 @@ def users_liked(browser, photo_url, amount=100, logger=None):
 
 
 def likers_from_photo(browser, amount=20, logger=None):
-    """ Get the list of users from the 'Likes' dialog of a photo """
+    """Get the list of users from the 'Likes' dialog of a photo"""
 
     try:
         if check_exists_by_xpath(

instapy/file_manager.py

@@ -28,7 +28,7 @@ def use_assets():
 
 
 def get_workspace():
-    """ Make a workspace ready for user """
+    """Make a workspace ready for user"""
 
     if WORKSPACE["path"]:
         workspace = verify_workspace_name(WORKSPACE["path"])
@@ -47,7 +47,7 @@ def get_workspace():
 
 
 def set_workspace(path=None):
-    """ Set a custom workspace for use """
+    """Set a custom workspace for use"""
 
     if not Settings.InstaPy_is_running:
         if path:
@@ -92,15 +92,15 @@ def set_workspace(path=None):
 
 
 def update_workspace(latest_path):
-    """ Update the workspace constant with its latest path """
+    """Update the workspace constant with its latest path"""
 
     latest_path = slashen(latest_path, "native")
     validate_path(latest_path)
     WORKSPACE.update(path=latest_path)
 
 
 def move_workspace(old_path, new_path):
-    """ Find data files in old workspace folder and move to new location """
+    """Find data files in old workspace folder and move to new location"""
     # write in future
 
 
@@ -121,7 +121,7 @@ def update_locations():
 
 
 def get_home_path():
-    """ Get user's home directory """
+    """Get user's home directory"""
 
     if python_version() >= "3.5":
         from pathlib import Path
@@ -137,7 +137,7 @@ def get_home_path():
 
 
 def slashen(path, direction="forward"):
-    """ Replace backslashes in paths with forward slashes """
+    """Replace backslashes in paths with forward slashes"""
 
     if direction == "forward":
         path = path.replace("\\", "/")
@@ -153,7 +153,7 @@ def slashen(path, direction="forward"):
 
 
 def remove_last_slash(path):
-    """ Remove the last slash in the given path [if any] """
+    """Remove the last slash in the given path [if any]"""
 
     if path.endswith("/"):
         path = path[:-1]
@@ -162,7 +162,7 @@ def remove_last_slash(path):
 
 
 def verify_workspace_name(path):
-    """ Make sure chosen workspace name is InstaPy friendly """
+    """Make sure chosen workspace name is InstaPy friendly"""
 
     path = slashen(path)
     path = remove_last_slash(path)
@@ -182,7 +182,7 @@ def verify_workspace_name(path):
 
 
 def differ_paths(old, new):
-    """ Compare old and new paths """
+    """Compare old and new paths"""
 
     if old and old.endswith(("\\", "/")):
         old = old[:-1]
@@ -196,7 +196,7 @@ def differ_paths(old, new):
 
 
 def validate_path(path):
-    """ Make sure the given path exists """
+    """Make sure the given path exists"""
 
     if not path_exists(path):
         try:

instapy/follow_util.py

@@ -19,7 +19,7 @@
 def get_following_status(
     browser, track, username, person, person_id, logger, logfolder
 ):
-    """ Verify if you are following the user in the loaded page """
+    """Verify if you are following the user in the loaded page"""
     if person == username:
         return "OWNER", None
 

instapy/instapy.py

@@ -491,7 +491,7 @@ def set_action_delays(
         random_range_to: int = None,
         safety_match: bool = True,
     ):
-        """ Set custom sleep delay after actions """
+        """Set custom sleep delay after actions"""
         Settings.action_delays.update(
             {
                 "enabled": enabled,
@@ -902,7 +902,7 @@ def follow_commenters(
         sleep_delay: int = 600,
         interact: bool = False,
     ):
-        """ Follows users' commenters """
+        """Follows users' commenters"""
 
         if self.aborting:
             return self
@@ -1022,7 +1022,7 @@ def follow_likers(
         sleep_delay: int = 600,
         interact: bool = False,
     ):
-        """ Follows users' likers """
+        """Follows users' likers"""
         if self.aborting:
             return self
 
@@ -1344,7 +1344,7 @@ def set_relationship_bounds(
         self.max_posts = max_posts if enabled is True else None
 
     def validate_user_call(self, user_name: str):
-        """ Short call of validate_username() function """
+        """Short call of validate_username() function"""
         validation, details = validate_username(
             self.browser,
             user_name,
@@ -1451,7 +1451,7 @@ def set_delimit_commenting(
         self.comments_mandatory_words = comments_mandatory_words
 
     def set_simulation(self, enabled: bool = True, percentage: int = 100):
-        """ Sets aside simulation parameters """
+        """Sets aside simulation parameters"""
         if enabled not in [True, False]:
             self.logger.info(
                 "Invalid simulation parameter! Please use correct syntax "
@@ -3629,7 +3629,7 @@ def follow_user_followers(
         interact: bool = False,
         sleep_delay: int = 600,
     ):
-        """ Follow the `Followers` of given users """
+        """Follow the `Followers` of given users"""
         if self.aborting:
             return self
 
@@ -3817,7 +3817,7 @@ def follow_user_following(
         interact: bool = False,
         sleep_delay: int = 600,
     ):
-        """ Follow the `Following` of given users """
+        """Follow the `Following` of given users"""
         if self.aborting:
             return self
 
@@ -4627,7 +4627,7 @@ def pick_unfollowers(
     def pick_nonfollowers(
         self, username: str = None, live_match: bool = False, store_locally: bool = True
     ):
-        """ Returns Nonfollowers data of a given user """
+        """Returns Nonfollowers data of a given user"""
 
         message = "Starting to pick Nonfollowers of {}..".format(username)
         highlight_print(self.username, message, "feature", "info", self.logger)
@@ -4989,7 +4989,7 @@ def follow_by_tags(
     def interact_by_URL(
         self, urls: list = [], randomize: bool = False, interact: bool = False
     ):
-        """ Interact on posts at given URLs """
+        """Interact on posts at given URLs"""
 
         if self.aborting:
             return self
@@ -5284,7 +5284,7 @@ def feature_in_feature(self, feature, validate_users):
             self.internal_usage.pop(feature)
 
     def live_report(self):
-        """ Report live sessional statistics """
+        """Report live sessional statistics"""
 
         print("")
 
@@ -5356,15 +5356,15 @@ def live_report(self):
             )
 
     def set_do_reply_to_comments(self, enabled: bool = False, percentage: int = 0):
-        """ Define if the comments on posts should be replied """
+        """Define if the comments on posts should be replied"""
 
         self.do_reply_to_comments = enabled
         self.reply_to_comments_percent = percentage
 
         return self
 
     def set_comment_replies(self, replies: list = [], media: str = None):
-        """ Set the replies to comments """
+        """Set the replies to comments"""
 
         if not replies:
             self.logger.info("Please, provide some comment replies for use next time.")
@@ -5395,7 +5395,7 @@ def set_use_meaningcloud(
         subjectivity: str = None,
         confidence: bool = 100,
     ):
-        """ Set MeaningCloud Sentiment Analysis API configuration """
+        """Set MeaningCloud Sentiment Analysis API configuration"""
 
         if license_key is None:
             license_key = os.environ.get("MEANINGCLOUD_LIC_KEY")
@@ -5430,7 +5430,7 @@ def set_use_yandex(
         match_language: bool = False,
         language_code: str = "en",
     ):
-        """ Set Yandex Translate API configuration """
+        """Set Yandex Translate API configuration"""
 
         if API_key is None:
             API_key = os.environ.get("YANDEX_API_KEY")
@@ -5838,7 +5838,7 @@ def is_mandatory_character(self, uchr):
             )
 
     def run_time(self):
-        """ Get the time session lasted in seconds """
+        """Get the time session lasted in seconds"""
 
         real_time = time.time()
         run_time = real_time - self.start_time
@@ -5895,7 +5895,7 @@ def accept_follow_requests(self, amount: int = 100, sleep_delay: int = 1):
         return self
 
     def join_pods(self, topic: str = "general", engagement_mode: str = "normal"):
-        """ Join pods """
+        """Join pods"""
         if topic not in self.allowed_pod_topics:
             self.logger.error(
                 "You have entered an invalid topic for pods, allowed topics are : {}. Exiting...".format(
@@ -6091,7 +6091,7 @@ def engage_with_posts(self, pod_posts, modespecific_comment_percentage):
                 self.logger.error("Failed for {} with Error {}".format(pod_post, err))
 
     def story_by_tags(self, tags: list = None):
-        """ Watch stories for specific tag(s) """
+        """Watch stories for specific tag(s)"""
         if self.aborting:
             return self
 
@@ -6123,7 +6123,7 @@ def story_by_tags(self, tags: list = None):
                     self.reels_watched += reels
 
     def story_by_users(self, users: list = None):
-        """ Watch stories for specific user(s)"""
+        """Watch stories for specific user(s)"""
         if self.aborting:
             return self
 
@@ -6155,7 +6155,7 @@ def story_by_users(self, users: list = None):
                     self.reels_watched += reels
 
     def target_list(self, file):
-        """ Extracts target list from text file """
+        """Extracts target list from text file"""
         target_list = file_handling(file)
 
         if "FileNotFoundError" in target_list:

instapy/like_util.py

@@ -982,7 +982,7 @@ def verify_liking(browser, maximum, minimum, logger):
 
 
 def like_comment(browser, original_comment_text, logger):
-    """ Like the given comment """
+    """Like the given comment"""
     comments_block_XPath = read_xpath(
         like_comment.__name__, "comments_block"
     )  # quite an efficient