2.3.4

.github/dependabot.yml

@@ -3,11 +3,36 @@ registries:
   dockerhub:
     type: docker-registry
     url: https://registry.hub.docker.com
-    username: ${{ secrets.DOCKER_USERNAME }}
-    password: ${{ secrets.DOCKER_TOKEN }}
+    username: ${{ secrets.DOCKER_HUB_USERNAME }}
+    password: ${{ secrets.DOCKER_HUB_TOKEN }}
     replaces-base: true
 
 updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    assignees:
+      - "Rakambda"
+    schedule:
+      interval: "daily"
+      time: "05:00"
+      timezone: "Europe/Paris"
+    pull-request-branch-name:
+      separator: "-"
+    groups:
+      log4j:
+        patterns:
+          - "org.apache.logging.log4j:log4j-core"
+          - "org.apache.logging.log4j:log4j-slf4j2-impl"
+      google-apis:
+        patterns:
+          - "com.google.api-client:google-api-client"
+          - "com.google.oauth-client:google-oauth-client-jetty"
+          - "com.google.apis:google-api-services-gmail"
+          - "com.google.apis:google-api-services-calendar"
+  #  Disable while paths can't be ignored as it'd update all 'auto-approve-sync-files.yml', Renovate will handle exclusion
+  #  - <<: *defaults
+  #    package-ecosystem: "github-actions"
+  #    directory: "/"
   - package-ecosystem: "docker"
     directory: "/"
     assignees:
@@ -20,3 +45,52 @@ updates:
       separator: "-"
     registries:
       - dockerhub
+  - package-ecosystem: "maven"
+    directory: "/"
+    assignees:
+      - "Rakambda"
+    schedule:
+      interval: "daily"
+      time: "05:00"
+      timezone: "Europe/Paris"
+    pull-request-branch-name:
+      separator: "-"
+  - package-ecosystem: "npm"
+    directory: "/"
+    assignees:
+      - "Rakambda"
+    schedule:
+      interval: "daily"
+      time: "05:00"
+      timezone: "Europe/Paris"
+    pull-request-branch-name:
+      separator: "-"
+  - package-ecosystem: "nuget"
+    directory: "/"
+    assignees:
+      - "Rakambda"
+    schedule:
+      interval: "daily"
+      time: "05:00"
+      timezone: "Europe/Paris"
+    pull-request-branch-name:
+      separator: "-"
+    groups:
+      restsharp:
+        patterns:
+          - "restsharp"
+          - "restsharp.*"
+      opencvsharp4:
+        patterns:
+          - "opencvsharp4"
+          - "opencvsharp4.*"
+  - package-ecosystem: "pip"
+    directory: "/"
+    assignees:
+      - "Rakambda"
+    schedule:
+      interval: "daily"
+      time: "05:00"
+      timezone: "Europe/Paris"
+    pull-request-branch-name:
+      separator: "-"

.github/renovate.json

@@ -10,12 +10,7 @@
     "type: \uD83D\uDCDA dependencies"
   ],
   "enabledManagers" : [
-    "dockerfile",
-    "maven",
-    "nuget",
-    "pip_requirements",
     "github-actions",
-    "gradle",
     "gradle-wrapper",
     "cargo"
   ],

.github/workflows/build-test-deploy.yml

@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v4.1.0
+        uses: gradle/actions/dependency-submission@v4.2.0
         continue-on-error: true
 
   build:
@@ -45,7 +45,7 @@ jobs:
           java-version: ${{ vars.JAVA_VERSION }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
       - name: Build project
         run: |
           ./gradlew \
@@ -86,7 +86,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Run tests
         run: |
@@ -105,7 +105,7 @@ jobs:
         with:
           report_paths: 'miner/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.0.2
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -150,7 +150,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Run tests
         run: |
@@ -169,7 +169,7 @@ jobs:
         with:
           report_paths: 'viewer/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.0.2
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -214,7 +214,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Calculate miner image name
         id: miner-image-name
@@ -244,7 +244,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Calculate viewer image name
         id: viewer-image-name

.github/workflows/manual-docker.yml

@@ -17,7 +17,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Calculate miner image name
         id: miner-image-name
@@ -53,7 +53,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Calculate viewer image name
         id: viewer-image-name

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Push latest on Docker Hub
         run: |
@@ -42,7 +42,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Push latest on Docker Hub
         run: |
@@ -66,14 +66,14 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.1.0
+        uses: gradle/actions/setup-gradle@v4.2.0
 
       - name: Build project
         run: |
           ./gradlew \
           assemble
       - name: Release
-        uses: softprops/action-gh-release@v2.0.8
+        uses: softprops/action-gh-release@v2.1.0
         with:
           fail_on_unmatched_files: false
           generate_release_notes: true

gradle.properties

@@ -1 +1 @@
-version=2.3.3
+version=2.3.4

gradle/libs.versions.toml

@@ -1,37 +1,37 @@
 [versions]
 slf4j-version = "2.0.16"
 log4j2-version = "2.24.1"
-unirest-version = "4.4.4"
+unirest-version = "4.4.5"
 picocli-version = "4.7.6"
-jackson-version = "2.18.0"
-jsonschema-generator-version = "4.36.0"
+jackson-version = "2.18.1"
+jsonschema-generator-version = "4.37.0"
 httpclient-version = "4.5.14"
 lang3-version = "3.17.0"
 commons-text-version = "1.12.0"
-jetbrains-annotations-version = "25.0.0"
+jetbrains-annotations-version = "26.0.1"
 websocket-version = "1.5.7"
-junitVersion = "5.11.1"
+junitVersion = "5.11.3"
 assertj-core-version = "3.26.3"
 assertj-db-version = "2.0.2"
-mockito-version = "5.14.1"
+mockito-version = "5.14.2"
 awaitility-version = "4.2.2"
-json-unit-version = "3.4.1"
+json-unit-version = "4.0.0"
 kitteh-irc-version = "9.0.0"
-hikari-cp-version = "6.0.0"
-mariadb-version = "3.4.1"
-sqlite-version = "3.46.1.3"
-mysql-version = "9.0.0"
+hikari-cp-version = "6.2.0"
+mariadb-version = "3.5.0"
+sqlite-version = "3.47.0.0"
+mysql-version = "9.1.0"
 rerunner-jupiter-version = "2.1.6"
-flyway-version = "10.18.2"
+flyway-version = "10.21.0"
 selenide-version = "7.5.1"
-lombok-version = "1.18.34"
+lombok-version = "1.18.36"
 jacocoVersion = "0.8.12"
 
 shadow-version = "8.1.1"
 names-version = "0.51.0"
-jib-version = "3.4.3"
+jib-version = "3.4.4"
 git-properties-version = "2.4.2"
-springboot-version = "3.3.4"
+springboot-version = "3.3.5"
 springboot-dependencies-version = "1.1.6"
 test-logger-version = "4.0.0"
 git-version-plugin-version = "3.1.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/DropCampaignSummary.java

@@ -19,4 +19,8 @@
 public class DropCampaignSummary extends GQLType{
 	@JsonProperty("includesSubRequirement")
 	private boolean includesSubRequirement;
+	@JsonProperty("isPermanentlyDismissible")
+	private boolean permanentlyDismissible;
+	@JsonProperty("isSitewide")
+	private boolean sitewide;
 }

miner/src/main/java/fr/rakambda/channelpointsminer/miner/runnable/UpdateStreamInfo.java

@@ -18,13 +18,10 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 
 @Log4j2
 @RequiredArgsConstructor
 public class UpdateStreamInfo implements Runnable{
-	private static final Collection<String> DISMISSIBLE_CAMPAIGNS = Set.of("dc4ff0b4-4de0-11ef-9ec3-621fb0811846");
-
 	@NotNull
 	private final IMiner miner;
 
@@ -151,7 +148,7 @@ private void updateCampaigns(@NotNull Streamer streamer){
 						.map(DropsHighlightServiceAvailableDropsData::getChannel)
 						.map(Channel::getViewerDropCampaigns)
 						.flatMap(Collection::stream)
-						.filter(dropCampaign -> DISMISSIBLE_CAMPAIGNS.contains(dropCampaign.getId()))
+						.filter(this::isDismissibleGlobalCompaign)
 						.forEach(dropCampaign -> dismissCampaign(miner, streamer, dropCampaign));
 			}
 		}
@@ -160,6 +157,12 @@ private void updateCampaigns(@NotNull Streamer streamer){
 		}
 	}
 
+	private boolean isDismissibleGlobalCompaign(@NotNull DropCampaign dropCampaign){
+		return Optional.ofNullable(dropCampaign.getSummary())
+				.map(summary -> summary.isSitewide() && summary.isPermanentlyDismissible())
+				.orElse(false);
+	}
+
 	private void dismissCampaign(@NotNull IMiner miner, @NotNull Streamer streamer, @NotNull DropCampaign dropCampaign){
 		var result = miner.getGqlApi().setDropsCommunityHighlightToHidden(streamer.getId(), dropCampaign.getId());
 		var isHidden = result

miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiDropsHighlightServiceAvailableDropsTest.java

@@ -55,6 +55,8 @@ void nominalWithDrops(UnirestMock unirest){
                                                         .build()))
                                                 .build()))
 				                                .summary(DropCampaignSummary.builder()
+						                                .sitewide(true)
+						                                .permanentlyDismissible(true)
 						                                .includesSubRequirement(true)
 						                                .build())
                                         .build()))