Merge pull request #409 from davidteather/nightly

V3.8.4 - Fix Some Changes & Add Option For Test Endpoints
davidteather · Dec 7, 2020 · 5aec299 · 5aec299
2 parents 9e839fa + 6fddd93
commit 5aec299
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,6 @@ test.mp4
 test.txt
 .pytest_cache/*
 tests/__pycache__/*
-*.pyc
+*.pyc
+acrawl.js
+test2.py
diff --git a/TikTokApi/tiktok.py b/TikTokApi/tiktok.py
@@ -43,6 +43,9 @@ def __init__(self, **kwargs):
         self.proxy = kwargs.get("proxy", None)
         self.custom_verifyFp = kwargs.get("custom_verifyFp")
 
+        if kwargs.get("use_test_endpoints", False):
+            global BASE_URL
+            BASE_URL = "https://t.tiktok.com/"
         if kwargs.get("use_selenium", False):
             from .browser_selenium import browser
         else:
@@ -210,7 +213,7 @@ def getData(self, **kwargs) -> dict:
                 raise JSONDecodeFailure() from e
 
     def get_cookies(self, **kwargs):
-        did = kwargs.get("did", str(random.randint(10000, 999999999)))
+        did = kwargs.get("custom_did", ''.join(random.choice(string.digits) for num in range(19)))
         if kwargs.get("custom_verifyFp") == None:
             if self.custom_verifyFp != None:
                 verifyFp = self.custom_verifyFp
@@ -1564,7 +1567,6 @@ def __process_kwargs__(self, kwargs):
         language = kwargs.get("language", "en")
         proxy = kwargs.get("proxy", None)
         maxCount = kwargs.get("maxCount", 35)
-        did = kwargs.get("did", str(random.randint(10000, 999999999)))
-        kwargs["did"] = did
+        did = kwargs.get("custom_did", ''.join(random.choice(string.digits) for num in range(19)))
 
         return region, language, proxy, maxCount, did
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 setuptools.setup(
     name="TikTokApi",
     packages=["TikTokApi"],
-    version="3.8.3",
+    version="3.8.4",
     license="MIT",
     description="The Unofficial TikTok API Wrapper in Python 3.",
     author="David Teather",

diff --git a/tests/test_byHashtag.py b/tests/test_byHashtag.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def unique_count(tiktoks):
@@ -16,7 +16,7 @@ def test_hashtag():
     assert len(api.byHashtag("funny", 5)) == 5
     assert len(api.byHashtag("funny", 10)) == 10
     assert len(api.byHashtag("funny", 20)) == 20
-    assert len(unique_count(api.byHashtag("funny", 500))) == 500
+    assert abs(len(unique_count(api.byHashtag("funny", 500)))-500) <= 5
 
 
 def test_non_latin1():

diff --git a/tests/test_bySound.py b/tests/test_bySound.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_trending():

diff --git a/tests/test_byUsername.py b/tests/test_byUsername.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_trending():

diff --git a/tests/test_discover.py b/tests/test_discover.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_trending():

diff --git a/tests/test_getHashtagDetails.py b/tests/test_getHashtagDetails.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_getHashtagDetails():

diff --git a/tests/test_getObjectRoutes.py b/tests/test_getObjectRoutes.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_tiktok_object():

diff --git a/tests/test_search_for.py b/tests/test_search_for.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_search_for():

diff --git a/tests/test_suggested.py b/tests/test_suggested.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_suggested():

diff --git a/tests/test_trending.py b/tests/test_trending.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_trending():

diff --git a/tests/test_user.py b/tests/test_user.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 def test_user():

diff --git a/tests/test_userPager.py b/tests/test_userPager.py
@@ -1,7 +1,7 @@
 from TikTokApi import TikTokApi
 import os
 
-api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None))
+api = TikTokApi.get_instance(custom_verifyFp=os.environ.get("verifyFp", None), use_test_endpoints=True)
 
 
 class TestUserPager: