diff --git a/TikTokLive/events/proto_events.py b/TikTokLive/events/proto_events.py index 55f6f19..9f599e9 100644 --- a/TikTokLive/events/proto_events.py +++ b/TikTokLive/events/proto_events.py @@ -96,7 +96,7 @@ def streaking(self) -> bool: """ - if not self.streakable: + if not self.gift.streakable: return False return not bool(self.repeat_end) diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 1450060..0000000 --- a/manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "TikTokLive", - "license": "MIT", - "author": "Isaac Kogan", - "version": "6.0.1", - "email": "info@isaackogan.com" -} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..ce44d75 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +async-timeout>=4.0.3 # Fix: python_socks/async_/asyncio/_proxy.py import package +jinja2 +python-dotenv diff --git a/scripts/docs/conf.py b/scripts/docs/conf.py index 5dd03c8..92385a4 100644 --- a/scripts/docs/conf.py +++ b/scripts/docs/conf.py @@ -14,7 +14,9 @@ import os import sys -manifest = json.loads(open("../../manifest.json", "r").read()) +from setup import manifest # todo this wont work + +manifest = manifest version = "v" + manifest["version"] sys.path.insert(0, os.path.abspath('../../')) diff --git a/scripts/requirements.txt b/scripts/requirements.txt index a48609c..0d97b53 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -1,4 +1,5 @@ async-timeout>=4.0.3 jinja2 python-dotenv -build \ No newline at end of file +build +twine \ No newline at end of file diff --git a/setup.py b/setup.py index d4ceb58..7210918 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,15 @@ -import json - import setuptools # PyPi upload Command # rm -r dist ; python setup.py sdist ; python -m twine upload dist/* -manifest: dict = json.loads(open("manifest.json", "r").read()) + +manifest: dict = { + "name": "TikTokLive", + "license": "MIT", + "author": "Isaac Kogan", + "version": "6.0.1-post1", + "email": "info@isaackogan.com" +} if __name__ == '__main__': with open("README.md", "r", encoding="utf-8") as fh: