From 338a0a433e526cdc857fc91a3d5584b66b4a9f1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:02:57 +0000 Subject: [PATCH 1/6] Bump docker/build-push-action from 5.1.0 to 5.3.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.1.0 to 5.3.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5.1.0...v5.3.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index ee90cbf3..0a228587 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -38,7 +38,7 @@ jobs: - name: Build and push AMD64, ARM64, ARMv7 id: docker_build - uses: docker/build-push-action@v5.1.0 + uses: docker/build-push-action@v5.3.0 with: context: . push: true From c0047266159aac6cbf86c026f546b6d17195bdc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:03:07 +0000 Subject: [PATCH 2/6] Bump docker/login-action from 3.0.0 to 3.1.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index ee90cbf3..edf36c67 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -22,7 +22,7 @@ jobs: uses: docker/setup-buildx-action@v3.1.0 - name: Login to DockerHub - uses: docker/login-action@v3.0.0 + uses: docker/login-action@v3.1.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} From 6154bf9123ba4ad7f0dd3721eca95da930c67319 Mon Sep 17 00:00:00 2001 From: HeelMePlz <78705543+HeelMePlz@users.noreply.github.com> Date: Thu, 21 Mar 2024 09:07:46 +0000 Subject: [PATCH 3/6] Fix typo in variable name from 'POINTS_DESCEDING' to 'POINTS_DESCENDING' --- README.md | 6 +++--- TwitchChannelPointsMiner/classes/Settings.py | 2 +- TwitchChannelPointsMiner/classes/Twitch.py | 4 ++-- example.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 034333df..dc4ae5e7 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ twitch_miner = TwitchChannelPointsMiner( priority=[ # Custom priority in this case for example: Priority.STREAK, # - We want first of all to catch all watch streak from all streamers Priority.DROPS, # - When we don't have anymore watch streak to catch, wait until all drops are collected over the streamers - Priority.ORDER # - When we have all of the drops claimed and no watch-streak available, use the order priority (POINTS_ASCENDING, POINTS_DESCEDING) + Priority.ORDER # - When we have all of the drops claimed and no watch-streak available, use the order priority (POINTS_ASCENDING, POINTS_DESCENDING) ], enable_analytics=False, # Disables Analytics if False. Disabling it significantly reduces memory consumption disable_ssl_cert_verification=False, # Set to True at your own risk and only to fix SSL: CERTIFICATE_VERIFY_FAILED error @@ -421,14 +421,14 @@ Make sure to write the streamers array in order of priority from left to right. ## Settings Most of the settings are self-explained and are commented on in the example. -You can watch only two streamers per time. With `priority` settings, you can select which streamers watch by use priority. You can use an array of priority or single item. I suggest using at least one priority from `ORDER`, `POINTS_ASCENDING`, `POINTS_DESCEDING` because, for example, If you set only `STREAK` after catch all watch streak, the script will stop to watch streamers. +You can watch only two streamers per time. With `priority` settings, you can select which streamers watch by use priority. You can use an array of priority or single item. I suggest using at least one priority from `ORDER`, `POINTS_ASCENDING`, `POINTS_DESCENDING` because, for example, If you set only `STREAK` after catch all watch streak, the script will stop to watch streamers. Available values are the following: - `STREAK` - Catch the watch streak from all streamers - `DROPS` - Claim all drops from streamers with drops tags enabled - `SUBSCRIBED` - Prioritize streamers you're subscribed to (higher subscription tiers are mined first) - `ORDER` - Following the order of the list - `POINTS_ASCENDING` - On top the streamers with the lowest points - - `POINTS_DESCEDING` - On top the streamers with the highest points + - `POINTS_DESCENDING` - On top the streamers with the highest points You can combine all priority but keep in mind that use `ORDER` and `POINTS_ASCENDING` in the same settings doesn't make sense. diff --git a/TwitchChannelPointsMiner/classes/Settings.py b/TwitchChannelPointsMiner/classes/Settings.py index 3db6b621..3f0c3813 100644 --- a/TwitchChannelPointsMiner/classes/Settings.py +++ b/TwitchChannelPointsMiner/classes/Settings.py @@ -7,7 +7,7 @@ class Priority(Enum): DROPS = auto() SUBSCRIBED = auto() POINTS_ASCENDING = auto() - POINTS_DESCEDING = auto() + POINTS_DESCENDING = auto() class FollowersOrder(Enum): diff --git a/TwitchChannelPointsMiner/classes/Twitch.py b/TwitchChannelPointsMiner/classes/Twitch.py index 7a9dd47d..fe7f7621 100644 --- a/TwitchChannelPointsMiner/classes/Twitch.py +++ b/TwitchChannelPointsMiner/classes/Twitch.py @@ -395,7 +395,7 @@ def send_minute_watched_events(self, streamers, priority, chunk_size=3): elif ( prior in [Priority.POINTS_ASCENDING, - Priority.POINTS_DESCEDING] + Priority.POINTS_DESCENDING] and len(streamers_watching) < 2 ): items = [ @@ -407,7 +407,7 @@ def send_minute_watched_events(self, streamers, priority, chunk_size=3): items, key=lambda x: x["points"], reverse=( - True if prior == Priority.POINTS_DESCEDING else False + True if prior == Priority.POINTS_DESCENDING else False ), ) streamers_watching += [item["index"] diff --git a/example.py b/example.py index f3b05790..8d480368 100644 --- a/example.py +++ b/example.py @@ -21,7 +21,7 @@ priority=[ # Custom priority in this case for example: Priority.STREAK, # - We want first of all to catch all watch streak from all streamers Priority.DROPS, # - When we don't have anymore watch streak to catch, wait until all drops are collected over the streamers - Priority.ORDER # - When we have all of the drops claimed and no watch-streak available, use the order priority (POINTS_ASCENDING, POINTS_DESCEDING) + Priority.ORDER # - When we have all of the drops claimed and no watch-streak available, use the order priority (POINTS_ASCENDING, POINTS_DESCENDING) ], enable_analytics=False, # Disables Analytics if False. Disabling it significantly reduces memory consumption disable_ssl_cert_verification=False, # Set to True at your own risk and only to fix SSL: CERTIFICATE_VERIFY_FAILED error From b61f8e87a40e0ccf0c9cc618d3d809d3a4da6918 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:37:48 +0000 Subject: [PATCH 4/6] Bump docker/setup-buildx-action from 3.1.0 to 3.3.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.1.0 to 3.3.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.1.0...v3.3.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index ee90cbf3..9754bf2a 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -19,7 +19,7 @@ jobs: uses: docker/setup-qemu-action@v3.0.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.1.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to DockerHub uses: docker/login-action@v3.0.0 From b5a064b1abd316f2057926d286b6e70ab32c998d Mon Sep 17 00:00:00 2001 From: Thomas <1688389+Rakambda@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:57:03 +0200 Subject: [PATCH 5/6] Fix regex for settings when getting spade url --- TwitchChannelPointsMiner/classes/Twitch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TwitchChannelPointsMiner/classes/Twitch.py b/TwitchChannelPointsMiner/classes/Twitch.py index 7a9dd47d..c8b3830d 100644 --- a/TwitchChannelPointsMiner/classes/Twitch.py +++ b/TwitchChannelPointsMiner/classes/Twitch.py @@ -139,7 +139,7 @@ def get_spade_url(self, streamer): streamer.streamer_url, headers=headers) response = main_page_request.text # logger.info(response) - regex_settings = "(https://static.twitchcdn.net/config/settings.*?js)" + regex_settings = "(https://static.twitchcdn.net/config/settings.*?js|https://assets.twitch.tv/config/settings.*?.js)" settings_url = re.search(regex_settings, response).group(1) settings_request = requests.get(settings_url, headers=headers) From 62c01c485706d361932436cd1bd94ceb35cfa100 Mon Sep 17 00:00:00 2001 From: Roman Davydov <15850461+rdavydov@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:50:59 +0300 Subject: [PATCH 6/6] 1.9.5 --- TwitchChannelPointsMiner/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TwitchChannelPointsMiner/__init__.py b/TwitchChannelPointsMiner/__init__.py index 650078da..b6df4f89 100644 --- a/TwitchChannelPointsMiner/__init__.py +++ b/TwitchChannelPointsMiner/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -__version__ = "1.9.4" +__version__ = "1.9.5" from .TwitchChannelPointsMiner import TwitchChannelPointsMiner __all__ = [