Merge pull request #775 from RakambdaOrg/develop

2.2.15

.github/dependabot.yml

@@ -23,6 +23,12 @@ updates:
         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
 #  - package-ecosystem: "github-actions"
 #    directory: "/"

.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/[email protected].1
+        uses: gradle/actions/[email protected].2
         continue-on-error: true
 
   build:
@@ -45,7 +45,7 @@ jobs:
           java-version: ${{ vars.JAVA_VERSION }}
 
       - name: Setup Gradle
-        uses: gradle/actions/[email protected].1
+        uses: gradle/actions/[email protected].2
       - name: Build project
         run: |
           ./gradlew \
@@ -86,7 +86,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - 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/[email protected].0
+        uses: codecov/[email protected].1
         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/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - 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/[email protected].0
+        uses: codecov/[email protected].1
         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/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - 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/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - 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/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - name: Calculate miner image name
         id: miner-image-name
@@ -51,9 +51,9 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: ${{ env.APP_JAVA_VERSION }}
+          java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - 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/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - 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/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - 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/[email protected].1
+        uses: gradle/actions/[email protected].2
 
       - name: Build project
         run: |
           ./gradlew \
           assemble
       - name: Release
-        uses: softprops/[email protected].4
+        uses: softprops/[email protected].5
         with:
           fail_on_unmatched_files: false
           generate_release_notes: true

gradle.properties

@@ -1 +1 @@
-version=2.2.14
+version=2.2.15

gradle/libs.versions.toml

@@ -3,12 +3,12 @@ slf4j-version = "2.0.13"
 log4j2-version = "2.23.1"
 log4j2-slf4j-version = "2.23.1"
 unirest-version = "4.2.9"
-picocli-version = "4.7.5"
-jackson-version = "2.17.0"
+picocli-version = "4.7.6"
+jackson-version = "2.17.1"
 jsonschema-generator-version = "4.35.0"
 httpclient-version = "4.5.14"
 lang3-version = "3.14.0"
-commons-text-version = "1.11.0"
+commons-text-version = "1.12.0"
 jetbrains-annotations-version = "24.1.0"
 websocket-version = "1.5.6"
 junitVersion = "5.10.2"
@@ -20,20 +20,20 @@ json-unit-version = "3.2.7"
 kitteh-irc-version = "9.0.0"
 hikari-cp-version = "5.1.0"
 mariadb-version = "3.3.3"
-sqlite-version = "3.45.2.0"
-mysql-version = "8.3.0"
+sqlite-version = "3.45.3.0"
+mysql-version = "8.4.0"
 rerunner-jupiter-version = "2.1.6"
-flyway-version = "10.11.0"
-selenide-version = "7.2.3"
+flyway-version = "10.13.0"
+selenide-version = "7.3.1"
 lombok-version = "1.18.32"
-jacocoVersion = "0.8.10"
+jacocoVersion = "0.8.12"
 
 shadow-version = "8.1.1"
 names-version = "0.51.0"
 jib-version = "3.4.2"
-git-properties-version = "2.4.1"
-springboot-version = "3.2.4"
-springboot-dependencies-version = "1.1.4"
+git-properties-version = "2.4.2"
+springboot-version = "3.2.5"
+springboot-dependencies-version = "1.1.5"
 test-logger-version = "4.0.0"
 git-version-plugin-version = "3.0.0"
 

miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApi.java

@@ -17,6 +17,8 @@
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.dropshighlightserviceavailabledrops.DropsHighlightServiceAvailableDropsOperation;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.dropspageclaimdroprewards.DropsPageClaimDropRewardsData;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.dropspageclaimdroprewards.DropsPageClaimDropRewardsOperation;
+import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.playbackaccesstoken.PlaybackAccessTokenData;
+import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.playbackaccesstoken.PlaybackAccessTokenOperation;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.inventory.InventoryData;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.inventory.InventoryOperation;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.joinraid.JoinRaidData;
@@ -186,6 +188,11 @@ public Optional<GQLResponse<MakePredictionData>> makePrediction(@NotNull String
         return postGqlRequest(new MakePredictionOperation(eventId, outcomeId, amount, transactionId));
     }
 
+    @NotNull
+    public Optional<GQLResponse<PlaybackAccessTokenData>> playbackAccessToken(@NotNull String login){
+        return postGqlRequest(new PlaybackAccessTokenOperation(login));
+    }
+
     @NotNull
     public List<User> allChannelFollows(){
         var follows = new ArrayList<User>();

miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/playbackaccesstoken/PlaybackAccessTokenData.java

@@ -0,0 +1,23 @@
+package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.playbackaccesstoken;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.StreamPlaybackAccessToken;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode
+@ToString
+public class PlaybackAccessTokenData{
+	@JsonProperty("streamPlaybackAccessToken")
+	@NotNull
+	private StreamPlaybackAccessToken streamPlaybackAccessToken;
+}

miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/playbackaccesstoken/PlaybackAccessTokenOperation.java

@@ -0,0 +1,31 @@
+package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.playbackaccesstoken;
+
+import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.GQLResponse;
+import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.IGQLOperation;
+import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.PersistedQueryExtension;
+import kong.unirest.core.GenericType;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@ToString
+public class PlaybackAccessTokenOperation extends IGQLOperation<PlaybackAccessTokenData>{
+	public PlaybackAccessTokenOperation(@NotNull String login){
+		super("PlaybackAccessToken");
+		addPersistedQueryExtension(new PersistedQueryExtension(1, "3093517e37e4f4cb48906155bcd894150aef92617939236d2508f3375ab732ce"));
+		addVariable("isLive", true);
+		addVariable("isVod", false);
+		addVariable("login", login);
+		addVariable("playerType", "picture-by-picture");
+		addVariable("vodID", "");
+	}
+
+	@Override
+	@NotNull
+	public GenericType<GQLResponse<PlaybackAccessTokenData>> getResponseType(){
+		return new GenericType<>(){};
+	}
+}

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

@@ -20,5 +20,5 @@
 public class ClaimCommunityPointsError extends GQLType{
 	@JsonProperty("code")
 	@NotNull
-	private ClaimErrorCode code;
+	private String code;
 }

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

@@ -20,7 +20,7 @@ public class ClaimDropRewardsPayload extends GQLType{
 	@JsonProperty("isUserAccountConnected")
 	private boolean isUserAccountConnected;
 	@JsonProperty("status")
-	private ClaimDropRewardsStatus status;
+	private String status;
 	@JsonProperty("dropType")
 	private TimeBasedDrop dropType;
 }

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

@@ -52,7 +52,7 @@ public class CommunityPointsCommunityGoal extends GQLType{
     @JsonDeserialize(using = ISO8601ZonedDateTimeDeserializer.class)
     private ZonedDateTime startedAt;
     @JsonProperty("status")
-    private CommunityPointsCommunityGoalStatus status;
+    private String status;
     @JsonProperty("title")
     private String title;
     @JsonProperty("type")

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

@@ -21,7 +21,7 @@
 @ToString
 public class CommunityPointsLastViewedContentByType extends GQLType{
 	@JsonProperty("contentType")
-	private ContentType contentType;
+	private String contentType;
 	@JsonProperty("lastViewedAt")
 	@JsonDeserialize(using = ISO8601ZonedDateTimeDeserializer.class)
 	private ZonedDateTime lastViewedAt;

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

@@ -26,7 +26,7 @@ public class CommunityPointsLastViewedContentByTypeAndID extends GQLType{
 	private String contentId;
 	@JsonProperty("contentType")
 	@NotNull
-	private ContentType contentType;
+	private String contentType;
 	@JsonProperty("lastViewedAt")
 	@JsonDeserialize(using = ISO8601ZonedDateTimeDeserializer.class)
 	@NotNull

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

@@ -67,7 +67,7 @@ public class DropCampaign extends GQLType{
 	private List<TimeBasedDrop> timeBasedDrops = new ArrayList<>();
 	@JsonProperty("status")
 	@Nullable
-	private DropCampaignStatus status;
+	private String status;
 	@JsonProperty("self")
 	@Nullable
 	private DropCampaignSelfEdge self;

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

@@ -59,6 +59,7 @@
         @JsonSubTypes.Type(value = ClaimCommunityMomentPayload.class, name = "ClaimCommunityMomentPayload"),
         @JsonSubTypes.Type(value = CommunityMoment.class, name = "CommunityMoment"),
         @JsonSubTypes.Type(value = CommunityPointsEmoteModifier.class, name = "CommunityPointsEmoteModifier"),
+        @JsonSubTypes.Type(value = StreamPlaybackAccessToken.class, name = "PlaybackAccessToken"),
 })
 @EqualsAndHashCode
 public abstract class GQLType{

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

@@ -20,5 +20,5 @@
 public class MakePredictionError extends GQLType{
 	@JsonProperty("code")
 	@NotNull
-	private MakePredictionErrorCode code;
+	private String code;
 }