Merge pull request #602 from RakambdaOrg/develop

2.2.8

.github/CODEOWNERS

@@ -1 +1 @@
-* @Rakambda
+* @Rakambda @couchoud-t

.github/antora-playbook.local.yml

@@ -1,6 +1,6 @@
 site:
   title: ChannelPointsMiner
-  url: https://rakambda.github.io/ChannelPointsMiner/
+  url: https://rakambdaorg.github.io/ChannelPointsMiner/
   start_page: miner::index.adoc
 content:
   sources:

.github/antora-playbook.yml

@@ -1,10 +1,10 @@
 site:
   title: ChannelPointsMiner
-  url: https://rakambda.github.io/ChannelPointsMiner/
+  url: https://rakambdaorg.github.io/ChannelPointsMiner/
   start_page: miner::index.adoc
 content:
   sources:
-    - url: https://github.com/Rakambda/ChannelPointsMiner.git
+    - url: https://github.com/RakambdaOrg/ChannelPointsMiner.git
       branches: [ main, develop ]
       start_paths:
         - miner/docs

.github/dependabot.yml

@@ -1,45 +1,83 @@
 version: 2
+registries:
+  dockerhub:
+    type: docker-registry
+    url: https://registry.hub.docker.com
+    username: ${{ secrets.DOCKER_USERNAME }}
+    password: ${{ secrets.DOCKER_TOKEN }}
+    replaces-base: true
+
 updates:
   - package-ecosystem: "gradle"
     directory: "/"
+    assignees:
+      - "Rakambda"
     schedule:
       interval: "daily"
+      time: "08:00"
+      timezone: "Europe/Paris"
     pull-request-branch-name:
       separator: "-"
 #  Disable while paths can't be ignored as it'd update all 'auto-approve-sync-files.yml', Renovate will handle exclusion
 #  - package-ecosystem: "github-actions"
 #    directory: "/"
+#    assignees:
+#      - "Rakambda"
 #    schedule:
 #      interval: "daily"
+#      time: "08:00"
+#      timezone: "Europe/Paris"
 #    pull-request-branch-name:
 #      separator: "-"
   - package-ecosystem: "docker"
     directory: "/"
+    assignees:
+      - "Rakambda"
     schedule:
       interval: "daily"
+      time: "08:00"
+      timezone: "Europe/Paris"
     pull-request-branch-name:
       separator: "-"
+    registries:
+      - dockerhub
   - package-ecosystem: "maven"
     directory: "/"
+    assignees:
+      - "Rakambda"
     schedule:
       interval: "daily"
+      time: "08:00"
+      timezone: "Europe/Paris"
     pull-request-branch-name:
       separator: "-"
   - package-ecosystem: "npm"
     directory: "/"
+    assignees:
+      - "Rakambda"
     schedule:
       interval: "daily"
+      time: "08:00"
+      timezone: "Europe/Paris"
     pull-request-branch-name:
       separator: "-"
   - package-ecosystem: "nuget"
     directory: "/"
+    assignees:
+      - "Rakambda"
     schedule:
       interval: "daily"
+      time: "08:00"
+      timezone: "Europe/Paris"
     pull-request-branch-name:
       separator: "-"
   - package-ecosystem: "pip"
     directory: "/"
+    assignees:
+      - "Rakambda"
     schedule:
       interval: "daily"
+      time: "08:00"
+      timezone: "Europe/Paris"
     pull-request-branch-name:
       separator: "-"

.github/workflows/auto-aprove-sync-files.yml

@@ -4,18 +4,8 @@ on:
 
 jobs:
   auto-approve-synced-files:
-    name: Auto approve synced files
-    if: contains(github.event.pull_request.title, 'Synced file(s)') && github.actor == 'couchoud-t' && github.event.pull_request.base.ref == github.event.repository.default_branch
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull Request approval
-        uses: hmarr/[email protected]
-        with:
-          github-token: "${{ secrets.SYNC_TOKEN }}"
-      - name: Pull Request merge
-        uses: KeisukeYamashita/[email protected]
-        with:
-          token: "${{ secrets.SYNC_TOKEN }}"
-          strategy: squash
-          intervalSeconds: 60
-          timeoutSeconds: 3600
+    uses: RakambdaOrg/rakambda-github-workflows/.github/workflows/approve-sync-files.yml@main
+    with:
+      runs-on: self-hosted
+    secrets:
+      sync-token: ${{ secrets.SYNC_TOKEN }}

README.adoc

@@ -1,14 +1,14 @@
 = Channel Points Miner
 
-image:https://codecov.io/gh/Rakambda/ChannelPointsMiner/branch/main/graph/badge.svg[link="https://codecov.io/gh/Rakambda/ChannelPointsMiner",window="_blank",align="center"]
+image:https://codecov.io/gh/RakambdaOrg/ChannelPointsMiner/branch/main/graph/badge.svg[link="https://codecov.io/gh/RakambdaOrg/ChannelPointsMiner",window="_blank",align="center"]
 image:https://img.shields.io/docker/pulls/mrcraftcod/channel-points-miner.svg[link="https://hub.docker.com/r/mrcraftcod/channel-points-miner",window="_blank",align="center"]
 image:https://img.shields.io/discord/1007349372444491856.svg?label=Discord&logo=Discord&colorB=7289da[link="https://discord.gg/uXWsRftdy7",window="_blank",align="center"]
 
 include::miner/docs/modules/ROOT/partials/project-intro.adoc[]
 
 == Documentation
 
-Doc is available on link:https://rakambda.github.io/ChannelPointsMiner/[pages].
+Doc is available on link:https://rakambdaorg.github.io/ChannelPointsMiner/[pages].
 
 == Disclaimer
 

gradle.properties

@@ -1 +1 @@
-version=2.2.7
+version=2.2.8

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 slf4j-version = "2.0.9"
 log4j2-version = "2.20.0"
 log4j2-slf4j-version = "2.20.0"
-unirest-version = "4.0.4"
+unirest-version = "4.0.10"
 picocli-version = "4.7.5"
 jackson-version = "2.15.2"
 jsonschema-generator-version = "4.31.1"
@@ -16,23 +16,23 @@ assertj-core-version = "3.24.2"
 assertj-db-version = "2.0.2"
 mockito-version = "5.2.0"
 awaitility-version = "4.2.0"
-json-unit-version = "3.0.0"
+json-unit-version = "3.2.2"
 kitteh-irc-version = "8.0.0"
 hikari-cp-version = "5.0.1"
 mariadb-version = "3.2.0"
 sqlite-version = "3.43.0.0"
 mysql-version = "8.1.0"
 rerunner-jupiter-version = "2.1.6"
-flyway-version = "9.22.0"
-selenide-version = "6.18.0"
-lombok-version = "1.18.28"
+flyway-version = "9.22.2"
+selenide-version = "6.19.0"
+lombok-version = "1.18.30"
 jacocoVersion = "0.8.10"
 
 shadow-version = "8.1.1"
 names-version = "0.48.0"
-jib-version = "3.3.2"
+jib-version = "3.4.0"
 git-properties-version = "2.4.1"
-springboot-version = "3.1.3"
+springboot-version = "3.1.4"
 springboot-dependencies-version = "1.1.3"
 test-logger-version = "3.2.0"
 git-version-plugin-version = "3.0.0"

miner/docs/modules/ROOT/pages/configuration/discord.adoc

@@ -6,7 +6,7 @@ Discord settings can be customized to filter events and/or customize the format
 
 To filter messages, you need to provide a list of events you want to be sent, and set no customization.
 
-The name of the events can be found in link:https://github.com/Rakambda/ChannelPointsMiner/tree/develop/miner/src/main/java/fr/rakambda/channelpointsminer/miner/event/impl[miner/src/main/java/fr/rakambda/channelpointsminer/miner/event/impl] as the name of the classes (name of the file without `.java`).
+The name of the events can be found in link:https://github.com/RakambdaOrg/ChannelPointsMiner/tree/develop/miner/src/main/java/fr/rakambda/channelpointsminer/miner/event/impl[miner/src/main/java/fr/rakambda/channelpointsminer/miner/event/impl] as the name of the classes (name of the file without `.java`).
 
 .Example to sent only 3 type of events with default format
 [%collapsible]
@@ -22,7 +22,7 @@ include::example$discord-filtering.json[]
 Format works the same way as <<filtering, filtering>> except that additional parameters are provided.
 
 Placeholders are expected to be between braces, example: `\{placeholder_name}`.
-Available values can be seen in link:https://github.com/Rakambda/ChannelPointsMiner/blob/develop/miner/src/main/java/fr/rakambda/channelpointsminer/miner/event/EventVariableKey.java[EventVariableKey].
+Available values can be seen in link:https://github.com/RakambdaOrg/ChannelPointsMiner/blob/develop/miner/src/main/java/fr/rakambda/channelpointsminer/miner/event/EventVariableKey.java[EventVariableKey].
 
 NOTE: If you want to override the format of one event, you'll have to do the all as it'll also act as a filter.
 

miner/docs/modules/ROOT/pages/configuration/global.adoc

@@ -4,7 +4,7 @@ The global settings, that you pass to the miner with the `--settings` argument,
 
 Schema of the file is available in the xref:configuration/index.adoc[Configuration] page.
 
-Examples of this file can be found in link:https://github.com/Rakambda/ChannelPointsMiner/blob/main/src/examples/config[src/examples/config,window="_blank"].
+Examples of this file can be found in link:https://github.com/RakambdaOrg/ChannelPointsMiner/blob/main/src/examples/config[src/examples/config,window="_blank"].
 
 == Login method
 

miner/docs/modules/ROOT/pages/configuration/streamer.adoc

@@ -3,7 +3,7 @@
 Streamer settings define settings for a particular streamer.
 Each streamer setting will be defined in a json file named with the username of the streamer (eg: `streamer_username.json`).
 
-Examples can be found in link:https://github.com/Rakambda/ChannelPointsMiner/blob/main/miner/src/test/resources/factory[miner/src/test/resources/factory,window="_blank"].
+Examples can be found in link:https://github.com/RakambdaOrg/ChannelPointsMiner/blob/main/miner/src/test/resources/factory[miner/src/test/resources/factory,window="_blank"].
 
 == Priorities [[priorities]]
 

miner/docs/modules/ROOT/pages/installation/clone.adoc

@@ -3,7 +3,7 @@
 Running the project this way requires Java 17+ JDK to be installed.
 You can use the vendor of your choice (I personally use link:https://adoptium.net[Temurin]).
 
-1. Clone this repository `git clone [email protected]:RakSrinaNa/ChannelPointsMiner.git`.
+1. Clone this repository `git clone [email protected]:RakambdaOrg/ChannelPointsMiner.git`.
 2. Get into the cloned directory `cd ChannelPointsMiner`.
 3. Build the jar `./gradlew build -x test`
 4. Run with `config.json` as the configuration

miner/docs/modules/ROOT/pages/installation/docker.adoc

@@ -47,5 +47,5 @@ services:
 If you have 2FA enabled or using selenium, you'll have to enter information in the console for the first run in order to log in.
 
 As Docker doesn't give an interactive shell by default you'll have to run the container in interactive mode yourself the first time.
-More can be read about it in link:https://github.com/Rakambda/ChannelPointsMiner/issues/87#issuecomment-988276214[#87].
+More can be read about it in link:https://github.com/RakambdaOrg/ChannelPointsMiner/issues/87#issuecomment-988276214[#87].
 ====

miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/subtype/Raid.java

@@ -1,16 +1,13 @@
 package fr.rakambda.channelpointsminer.miner.api.ws.data.message.subtype;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.rakambda.channelpointsminer.miner.util.json.URLDeserializer;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
-import java.net.URL;
 
 @Getter
 @NoArgsConstructor
@@ -38,9 +35,8 @@ public class Raid{
 	@NotNull
 	private String targetDisplayName;
 	@JsonProperty("target_profile_image")
-	@JsonDeserialize(using = URLDeserializer.class)
 	@NotNull
-	private URL targetProfileImage;
+	private String targetProfileImage;
 	@JsonProperty("transition_jitter_seconds")
 	private int transitionJitterSeconds;
 	@JsonProperty("force_raid_now_seconds")

miner/src/main/java/fr/rakambda/channelpointsminer/miner/util/json/URLDeserializer.java

@@ -38,7 +38,7 @@ public URL deserialize(@NotNull JsonParser jsonParser, @NotNull DeserializationC
 			}
 		}
 		catch(MalformedURLException | IllegalArgumentException e){
-			log.warn("Failed to parse URL: {}", jsonParser.getValueAsString(), e);
+			log.warn("Failed to parse URL: {} at {} in {}", jsonParser.getValueAsString(), jsonParser.getCurrentName(), jsonParser.getCurrentLocation(), e);
 		}
 		return null;
 	}

miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/ws/TwitchPubSubWebSocketClientMessageTest.java

@@ -203,7 +203,7 @@ void onRaidGoV2(WebsocketMockServer server) throws MalformedURLException{
 										.targetId("987654")
 										.targetLogin("target-name")
 										.targetDisplayName("target-display-name")
-										.targetProfileImage(new URL("https://google.com/target-image"))
+										.targetProfileImage("https://google.com/target-image")
 										.transitionJitterSeconds(0)
 										.forceRaidNowSeconds(90)
 										.viewerCount(200)
@@ -232,7 +232,7 @@ void onRaidUpdateV2(WebsocketMockServer server) throws MalformedURLException{
 										.targetId("987654")
 										.targetLogin("target-name")
 										.targetDisplayName("target-display-name")
-										.targetProfileImage(new URL("https://google.com/target-image"))
+										.targetProfileImage("https://google.com/target-image")
 										.transitionJitterSeconds(0)
 										.forceRaidNowSeconds(90)
 										.viewerCount(200)
@@ -261,7 +261,7 @@ void onRaidCancelV2(WebsocketMockServer server) throws MalformedURLException{
 										.targetId("987654")
 										.targetLogin("target-name")
 										.targetDisplayName("target-display-name")
-										.targetProfileImage(new URL("https://google.com/target-image"))
+										.targetProfileImage("https://google.com/target-image")
 										.transitionJitterSeconds(0)
 										.forceRaidNowSeconds(90)
 										.viewerCount(200)