Merge pull request InstaPy#6107 from elulcao/minor_fixes

timgrossmann · web-flow · commit 78ad421ec6d1 · 2021-03-12T08:46:00.000+01:00
Minor fixes, some delays for browser actions and traces.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,10 @@ _The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 
 ## [0.6.15] - UNRELEASED
-
 ### Added
 
 - Added `verified_only` argument to `get_followers` to return only verified users
+- `mandatory_bio_keywords` control before evaluating for mandatory
 
 ## [0.6.14] - UNRELEASED
 
@@ -19,11 +19,15 @@ _The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added `apidisplaypurposes about` in `smart_hashtags` and new api token; Python3.5
 - Added `interact_user_likers` interacting with the likers from a given user's posts
 - Added second `accept_igcookie_dialogue` to handled the second "cookie accept screen" that is not automatically accepted
+- Added delays after `update_activity()` in `follow_util.py` and `util.py`
+- Added extra trace in `get_followers()`
 
 ### Fixed
 
 - Move call to `get_following_status` above `web_address_navigator` inside `get_links_for_username` function
 - Fixed the correct URL `displaypurposes.com`, the old `displaypurposes.com` API is deprecated
+- Fixed `additional-information.md`, removed extra info for `cron` configuration
+- Fixed `actions.md` and `settings.md` for identation
 
 ## [0.6.13] - 2020-12-30
 
diff --git a/docs/actions.md b/docs/actions.md
@@ -152,12 +152,17 @@ accs = ['therock','natgeo']
 session.follow_by_list(accs, times=1, sleep_delay=600, interact=False)
 ```
 * You can also **interact** with the followed users by enabling `interact=True` which will use the configuration of `set_user_interact` setting:
+
 ```python
 session.set_user_interact(amount=4,
-				 percentage=50,
-                  randomize=True,
-                   media='Photo')
-session.follow_by_list(followlist=['samantha3', 'larry_ok'], times=2, sleep_delay=600, interact=True)
+                          percentage=50,
+                          randomize=True,
+                          media='Photo')
+
+session.follow_by_list(followlist=['samantha3', 'larry_ok'],
+                       times=2,
+                       sleep_delay=600,
+                       interact=True)
 ```
 
 
@@ -237,10 +242,16 @@ The `follow_likers_per_photo` is how many people to follow per each photo
 * You can also **interact** with the followed users by enabling `interact=True` which will use the configuration of `set_user_interact` setting:
 ```python
 session.set_user_interact(amount=2,
-				 percentage=70,
-                  randomize=True,
-                   media='Photo')
-session.follow_likers(['user1' , 'user2'], photos_grab_amount = 2, follow_likers_per_photo = 3, randomize=True, sleep_delay=600, interact=True)
+                          percentage=70,
+                          randomize=True,
+                          media='Photo')
+
+session.follow_likers(['user1' , 'user2'],
+                      photos_grab_amount = 2,
+                      follow_likers_per_photo = 3,
+                      randomize=True,
+                      sleep_delay=600,
+                      interact=True)
 ```
 
 
@@ -259,9 +270,9 @@ The `max_pic` will limit number of photos to analyze
 * You can also **interact** with the followed users by enabling `interact=True` which will use the configuration of `set_user_interact` setting:
 ```python
 session.set_user_interact(amount=3,
-				 percentage=32,
-                  randomize=True,
-                   media='Video')
+                          percentage=32,
+                          randomize=True,
+                          media='Video')
 session.follow_commenters(['user1', 'user2', 'user3'], amount=100, daysold=365, max_pic = 100, sleep_delay=600, interact=True)
 ```
 
@@ -612,15 +623,15 @@ session.remove_follow_requests(amount=200, sleep_delay=600)
   ```python
 
  photo_comments = ['Nice shot! @{}',
-                   'I love your profile! @{}',
- 	           'Your feed is an inspiration :thumbsup:',
- 	           'Just incredible :open_mouth:',
- 	           'What camera did you use @{}?',
- 	           'Love your posts @{}',
- 	           'Looks awesome @{}',
- 	           'Getting inspired by you @{}',
- 	           ':raised_hands: Yes!',
- 	           'I can feel your passion @{} :muscle:']
+                  'I love your profile! @{}',
+ 	                'Your feed is an inspiration :thumbsup:',
+ 	                'Just incredible :open_mouth:',
+ 	                'What camera did you use @{}?',
+ 	                'Love your posts @{}',
+ 	                'Looks awesome @{}',
+ 	                'Getting inspired by you @{}',
+ 	                ':raised_hands: Yes!',
+ 	                'I can feel your passion @{} :muscle:']
 
  session = InstaPy()
 
diff --git a/docs/additional-information.md b/docs/additional-information.md
@@ -544,7 +544,7 @@ To do this simply pass the `disable_image_load=True` parameter in the InstaPy co
 session = InstaPy(username=insta_username,
                   password=insta_password,
                   headless_browser=False,
-		  disable_image_load=True,
+                  disable_image_load=True,
                   multi_logs=True)
 ```
 
@@ -568,7 +568,7 @@ To do this simply pass the `split_db=True` parameter in the InstaPy constructor
 session = InstaPy(username=insta_username,
                   password=insta_password,
                   headless_browser=False,
-		  split_db=True,
+                  split_db=True,
                   multi_logs=True)
 ```
 
@@ -708,7 +708,6 @@ You can use Window's built in Task Scheduler to automate InstaPy, using a variet
 9. "Start in" input Instapy install location (Example: C:\Users\USER_NAME\Documents\GitHub\InstaPy\). Click "Next"
 10. To finish the process, hit "Finish"
 
-
 ### `cron`
 You can add InstaPy to your crontab, so that the script will be executed regularly. This is especially useful for servers, but be sure not to break Instagrams follow and like limits.
 
@@ -773,124 +772,6 @@ You can use Window's built in Task Scheduler to automate InstaPy, using a variet
 9. "Start in" input Instapy install location (Example: C:\Users\USER_NAME\Documents\GitHub\InstaPy\). Click "Next"
 10. To finish the process, hit "Finish"
 
-
-### `cron`
-You can add InstaPy to your crontab, so that the script will be executed regularly. This is especially useful for servers, but be sure not to break Instagrams follow and like limits.
-
-```
-# Edit or create a crontab
-crontab -e
-# Add information to execute your InstaPy regularly.
-# With cd you navigate to your InstaPy folder, with the part after &&
-# you execute your quickstart.py with python. Make sure that those paths match
-# your environment.
-45 */4 * * * cd /home/user/InstaPy && /usr/bin/python ./quickstart.py
-```
-
-
-### [Schedule](https://github.com/dbader/schedule)
-> Schedule is an in-process scheduler for periodic jobs that uses the builder pattern for configuration. Schedule lets you run Python functions periodically at pre-determined intervals using a simple, human-friendly syntax.
-
-```shell
-pip install schedule
-```
-
-```python
-from instapy import InstaPy
-from instapy import smart_run
-from instapy import set_workspace
-import schedule
-import time
-
-#your login credentials
-insta_username=''
-insta_password=''
-
-#path to your workspace
-set_workspace(path=None)
-
-def job():
-  session = InstaPy(username=insta_username, password=insta_password)
-  with smart_run(session):
-    session.set_do_comment(enabled=True, percentage=20)
-    session.set_comments(['Well done!'])
-    session.set_do_follow(enabled=True, percentage=5, times=2)
-    session.like_by_tags(['love'], amount=100, media='Photo')
-
-
-schedule.every().day.at("6:35").do(job)
-schedule.every().day.at("16:22").do(job)
-
-while True:
-  schedule.run_pending()
-  time.sleep(10)
-```
-
-You can use Window's built in Task Scheduler to automate InstaPy, using a variety of trigger types: time, login, computer idles, etc. To schedule a simple daily run of an Instapy script follow the below directions
-1. Open [Windows Task Scheduler](https://msdn.microsoft.com/en-us/library/windows/desktop/aa383614(v=vs.85).aspx)
-2. Select "Create Basic Task"
-3. Fill out "Name" and "Description" as desired, click "Next"
-4. On "Trigger" screen select how frequently to run, click "Next" (Frequency can be modified later)
-5. On "Daily" screen, hit "Next"
-6. "Action Screen" select "Start a program" and then click "Next"
-7. "Program/script" enter the path, or browse to select the path to python. ([How to find python path on Windows](https://stackoverflow.com/questions/647515/how-can-i-get-python-path-under-windows))
-8. "Add arguments" input the InstaPy script path you wish to run. (Example: C:\Users\USER_NAME\Documents\GitHub\InstaPy\craigquick.py)
-9. "Start in" input Instapy install location (Example: C:\Users\USER_NAME\Documents\GitHub\InstaPy\). Click "Next"
-10. To finish the process, hit "Finish"
-
-
-### `cron`
-You can add InstaPy to your crontab, so that the script will be executed regularly. This is especially useful for servers, but be sure not to break Instagrams follow and like limits.
-
-```
-# Edit or create a crontab
-crontab -e
-# Add information to execute your InstaPy regularly.
-# With cd you navigate to your InstaPy folder, with the part after &&
-# you execute your quickstart.py with python. Make sure that those paths match
-# your environment.
-45 */4 * * * cd /home/user/InstaPy && /usr/bin/python ./quickstart.py
-```
-
-
-### [Schedule](https://github.com/dbader/schedule)
-> Schedule is an in-process scheduler for periodic jobs that uses the builder pattern for configuration. Schedule lets you run Python functions periodically at pre-determined intervals using a simple, human-friendly syntax.
-
-```shell
-pip install schedule
-```
-
-```python
-from instapy import InstaPy
-from instapy import smart_run
-from instapy import set_workspace
-import schedule
-import time
-
-#your login credentials
-insta_username=''
-insta_password=''
-
-#path to your workspace
-set_workspace(path=None)
-
-def job():
-  session = InstaPy(username=insta_username, password=insta_password)
-  with smart_run(session):
-    session.set_do_comment(enabled=True, percentage=20)
-    session.set_comments(['Well done!'])
-    session.set_do_follow(enabled=True, percentage=5, times=2)
-    session.like_by_tags(['love'], amount=100, media='Photo')
-
-
-schedule.every().day.at("6:35").do(job)
-schedule.every().day.at("16:22").do(job)
-
-while True:
-  schedule.run_pending()
-  time.sleep(10)
-```
-
 <ins
   class="adsbygoogle"
   data-ad-layout="in-article"
diff --git a/docs/settings.md b/docs/settings.md
@@ -128,17 +128,21 @@ session.like_by_tags(amount=10, use_smart_hashtags=True)
 ###### Take full control of the actions with the most sophisticated approaches
 
 ```python
-session.set_quota_supervisor(enabled=True, sleep_after=["likes", "comments_d", "follows", "unfollows", "server_calls_h"], sleepyhead=True, stochastic_flow=True, notify_me=True,
-                              peak_likes_hourly=57,
-                              peak_likes_daily=585,
-                               peak_comments_hourly=21,
-                               peak_comments_daily=182,
-                                peak_follows_hourly=48,
-                                peak_follows_daily=None,
-                                 peak_unfollows_hourly=35,
-                                 peak_unfollows_daily=402,
-                                  peak_server_calls_hourly=None,
-                                  peak_server_calls_daily=4700)
+session.set_quota_supervisor(enabled=True,
+                            sleep_after=["likes", "comments_d", "follows", "unfollows", "server_calls_h"],
+                            sleepyhead=True,
+                            stochastic_flow=True,
+                            notify_me=True,
+                            peak_likes_hourly=57,
+                            peak_likes_daily=585,
+                            peak_comments_hourly=21,
+                            peak_comments_daily=182,
+                            peak_follows_hourly=48,
+                            peak_follows_daily=None,
+                            peak_unfollows_hourly=35,
+                            peak_unfollows_daily=402,
+                            peak_server_calls_hourly=None,
+                            peak_server_calls_daily=4700)
 ```
 #### Parameters:
 `enabled`: put `True` to **activate** or `False` to **deactivate** supervising any time
@@ -418,7 +422,7 @@ This will skip all business accounts except the ones that have a category that m
                         skip_no_profile_pic=True,
                         skip_business=True,
                         skip_non_business=True,
-                        dont_skip_business_categories=['Creators & Celebrities'])
+                        dont_skip_business_categories=['Creators &  Celebrities'])
  ```
  This will skip all non business and business accounts except categories in _dont_skip_business_categories_.
 
@@ -504,14 +508,14 @@ session.set_delimit_commenting(enabled=True, comments_mandatory_words=['cat', 'd
 ##### This is used to check the number of _followers_ and/or _following_ a user has and if these numbers _either_ **exceed** the number set OR **does not pass** the number set OR if **their ratio does not reach** desired potency ratio then no further interaction happens
 ```python
 session.set_relationship_bounds(enabled=True,
-				 potency_ratio=1.34,
-				  delimit_by_numbers=True,
-				   max_followers=8500,
-				    max_following=4490,
-				     min_followers=100,
-				      min_following=56,
-				       min_posts=10,
-                max_posts=1000)
+                                potency_ratio=1.34,
+                                delimit_by_numbers=True,
+                                max_followers=8500,
+                                max_following=4490,
+                                min_followers=100,
+                                min_following=56,
+                                min_posts=10,
+                                max_posts=1000)
 ```
 Use `enabled=True` to **activate** this feature, and `enabled=False` to **deactivate** it, _any time_
 `delimit_by_numbers` is used to **activate** & **deactivate** the usage of max & min values
diff --git a/instapy/__init__.py b/instapy/__init__.py
@@ -1,7 +1,7 @@
 # flake8: noqa
 
 # __variables__ with double-quoted values will be available in setup.py
-__version__ = "0.6.13"
+__version__ = "0.6.14"
 
 from .instapy import InstaPy
 from .util import smart_run
diff --git a/instapy/follow_util.py b/instapy/follow_util.py
@@ -1,4 +1,8 @@
 """ Module which handles the follow features """
+# import built-in & third-party modules
+from random import randint
+from time import sleep
+
 # import InstaPy modules
 from .util import web_address_navigator
 from .util import get_username_from_id
@@ -69,6 +73,7 @@ def get_following_status(
     if not follow_button:
         browser.execute_script("location.reload()")
         update_activity(browser, state=None)
+        sleep(randint(1, 5))
 
         follow_button = explicit_wait(
             browser, "VOEL", [follow_button_XP, "XPath"], logger, 14, False
diff --git a/instapy/like_util.py b/instapy/like_util.py
@@ -471,12 +471,17 @@ def get_links_for_username(
     #    browser.wait_for_valid_authorization(browser, username, logger)
 
     is_private = is_private_profile(browser, logger, following_status == "Following")
+
     if (
         is_private is None
         or (is_private is True and following_status not in ["Following", True])
         or (following_status == "Blocked")
     ):
-        logger.info("This user is private and we are not following")
+        logger.info(
+            "This user is private and we are not following. '{}':'{}'".format(
+                is_private, following_status
+            )
+        )
         return False
 
     # Get links
@@ -487,7 +492,7 @@ def get_links_for_username(
 
     if posts_count is not None and amount > posts_count:
         logger.info(
-            "You have requested to get {} posts from {}'s profile page BUT"
+            "You have requested to get {} posts from {}'s profile page but"
             " there only {} posts available :D".format(amount, person, posts_count)
         )
         amount = posts_count
diff --git a/instapy/relationship_tools.py b/instapy/relationship_tools.py
diff --git a/instapy/util.py b/instapy/util.py
