Merge branch 'master' into improvements-analytics

.github/workflows/deploy-docker.yml

@@ -20,14 +20,14 @@ jobs:
         uses: docker/setup-buildx-action@v1.6.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.13.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
         with:
           context: .
           push: true

README.md

@@ -347,7 +347,7 @@ docker run \
     tkdalex/twitch-channel-points-miner-v2
 ```
 
-`$(pwd)` Could not work on Windows (cmd), please us the absolute path instead, like: `/path/of/your/cookies:/usr/src/app/cookies`.
+`$(pwd)` Could not work on Windows (cmd), please use the absolute path instead, like: `/path/of/your/cookies:/usr/src/app/cookies`.
 If you don't mount the volume for the analytics (or cookies or logs) folder, the folder will be automatically created on the Docker container, and you will lose all the data when it is stopped.
 If you don't have a cookie or It's your first time running the script, you will need to login to Twitch and start the container with `-it` args. If you need to run multiple containers you can bind different ports (only if you need also the analytics) and mount dirrent run.py file, like
 ```sh

TwitchChannelPointsMiner/classes/entities/Bet.py

@@ -102,14 +102,22 @@ class BetSettings(object):
         self.delay_mode = delay_mode
 
     def default(self):
-        self.strategy = self.strategy if not None else Strategy.SMART
-        self.percentage = self.percentage if not None else 5
-        self.percentage_gap = self.percentage_gap if not None else 20
-        self.max_points = self.max_points if not None else 50000
-        self.minimum_points = self.minimum_points if not None else 0
-        self.stealth_mode = self.stealth_mode if not None else False
-        self.delay = self.delay if not None else 6
-        self.delay_mode = self.delay_mode if not None else DelayMode.FROM_END
+        self.strategy = self.strategy if self.strategy is not None else Strategy.SMART
+        self.percentage = self.percentage if self.percentage is not None else 5
+        self.percentage_gap = (
+            self.percentage_gap if self.percentage_gap is not None else 20
+        )
+        self.max_points = self.max_points if self.max_points is not None else 50000
+        self.minimum_points = (
+            self.minimum_points if self.minimum_points is not None else 0
+        )
+        self.stealth_mode = (
+            self.stealth_mode if self.stealth_mode is not None else False
+        )
+        self.delay = self.delay if self.delay is not None else 6
+        self.delay_mode = (
+            self.delay_mode if self.delay_mode is not None else DelayMode.FROM_END
+        )
 
     def __repr__(self):
         return f"BetSettings(strategy={self.strategy}, percentage={self.percentage}, percentage_gap={self.percentage_gap}, max_points={self.max_points}, minimum_points={self.minimum_points}, stealth_mode={self.stealth_mode})"

requirements.txt

@@ -1,7 +1,7 @@
 requests==2.25.1
 websocket-client==1.0.1
 browser_cookie3==0.12.1
-pillow==8.3.2
+pillow==9.0.0
 python-dateutil==2.8.1
 emoji==1.2.0
 millify==0.1.1

setup.py

@@ -29,7 +29,7 @@ setuptools.setup(
         "requests==2.25.1",
         "websocket-client==1.0.1",
         "browser_cookie3==0.12.1",
-        "pillow==8.3.2",
+        "pillow==9.0.0",
         "python-dateutil==2.8.1",
         "emoji==1.2.0",
         "millify==0.1.1",