From ba4fdf069056b6caec2d3225c01aabbe70b0b6f5 Mon Sep 17 00:00:00 2001 From: Thomas <1688389+Rakambda@users.noreply.github.com> Date: Wed, 10 Apr 2024 16:32:57 +0200 Subject: [PATCH 1/4] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6be803f4..b0bbea50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=2.2.12 +version=2.2.13 From f0e42d8c95835ed6f90823315de2f532d239c1d3 Mon Sep 17 00:00:00 2001 From: Thomas <1688389+Rakambda@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:52:10 +0200 Subject: [PATCH 2/4] Fix obtaining spade url (#750) --- .../rakambda/channelpointsminer/miner/api/twitch/TwitchApi.java | 2 +- .../channelpointsminer/miner/api/twitch/TwitchApiTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApi.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApi.java index 91e23d61..fd8f0469 100644 --- a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApi.java +++ b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApi.java @@ -18,7 +18,7 @@ @RequiredArgsConstructor @Log4j2 public class TwitchApi{ - private static final Pattern SETTINGS_URL_PATTERN = Pattern.compile("(https://static.twitchcdn.net/config/settings.*?js)"); + private static final Pattern SETTINGS_URL_PATTERN = Pattern.compile("(https://static.twitchcdn.net/config/settings.*?js|https://assets.twitch.tv/config/settings.*?.js)"); private static final Pattern SPADE_URL_PATTERN = Pattern.compile("\"spade(Url|_url)\":\"(.*?)\""); private final UnirestInstance unirest; diff --git a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApiTest.java b/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApiTest.java index 8e13dabd..e27fee64 100644 --- a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApiTest.java +++ b/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApiTest.java @@ -36,7 +36,7 @@ class TwitchApiTest{ private static final String GAME = "game"; private static final String GAME_ID = "game-id"; private static final String STREAMER_URL = "https://google.com/streamer"; - private static final String CONFIG_URL = "https://static.twitchcdn.net/config/settings.sq5d4q6s54ds854c84qs.js"; + private static final String CONFIG_URL = "https://assets.twitch.tv/config/settings.sq5d4q6s54ds854c84qs.js"; private static final String CONFIG_BODY = "".formatted(CONFIG_URL); private static final String SPADE_URL = "https://google.com"; private static final String SPADE_BODY = "azeazeazeaze\"spade_url\":\"%s\"azeazeaze".formatted(SPADE_URL); From f494c3387e00d97de95d134c42a1b6dc597614da Mon Sep 17 00:00:00 2001 From: Thomas Couchoud <1688389+Rakambda@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:55:21 +0200 Subject: [PATCH 3/4] dependency submission --- .github/workflows/build-test-deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 3cc32e9b..fd7ef0ce 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -19,6 +19,11 @@ jobs: steps: - name: Checkout source uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: ${{ vars.JAVA_VERSION }} - name: Generate and submit dependency graph uses: gradle/actions/dependency-submission@v3.2.0 continue-on-error: true From 451b76267d1dae5e34158c87fe0952008d3cfe8f Mon Sep 17 00:00:00 2001 From: Thomas Couchoud <1688389+Rakambda@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:59:26 +0200 Subject: [PATCH 4/4] dependency submission permission --- .github/workflows/build-test-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index fd7ef0ce..9b5f263e 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -16,6 +16,8 @@ jobs: dependency-submission: name: Dependencies submission runs-on: ubuntu-latest + permissions: + contents: write steps: - name: Checkout source uses: actions/checkout@v4