From 49a9cd07fd431b4a934ed9f42d25c980ac0ade69 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 14 Jun 2024 22:52:44 +0200
Subject: [PATCH 01/15] feat: add uploaded timestamp to streams response

---
 src/main/java/me/kavin/piped/utils/CollectionUtils.java | 7 ++++---
 src/main/java/me/kavin/piped/utils/obj/Streams.java     | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/me/kavin/piped/utils/CollectionUtils.java b/src/main/java/me/kavin/piped/utils/CollectionUtils.java
index ded6c24..97726c8 100644
--- a/src/main/java/me/kavin/piped/utils/CollectionUtils.java
+++ b/src/main/java/me/kavin/piped/utils/CollectionUtils.java
@@ -76,9 +76,10 @@ public class CollectionUtils {
         )));
 
         return new Streams(info.getName(), info.getDescription().getContent(),
-                info.getTextualUploadDate(), info.getUploaderName(), substringYouTube(info.getUploaderUrl()),
-                getLastThumbnail(info.getUploaderAvatars()), getLastThumbnail(info.getThumbnails()), info.getDuration(),
-                info.getViewCount(), info.getLikeCount(), info.getDislikeCount(), info.getUploaderSubscriberCount(), info.isUploaderVerified(),
+                info.getTextualUploadDate(), info.getUploadDate() != null ? info.getUploadDate().offsetDateTime().toInstant().toEpochMilli() : -1,
+                info.getUploaderName(), substringYouTube(info.getUploaderUrl()), getLastThumbnail(info.getUploaderAvatars()),
+                getLastThumbnail(info.getThumbnails()), info.getDuration(), info.getViewCount(), info.getLikeCount(), info.getDislikeCount(),
+                info.getUploaderSubscriberCount(), info.isUploaderVerified(),
                 audioStreams, videoStreams, relatedStreams, subtitles, livestream, rewriteVideoURL(info.getHlsUrl(), Map.of()),
                 rewriteVideoURL(info.getDashMpdUrl(), Map.of()), null, info.getCategory(), info.getLicence(),
                 info.getPrivacy().name().toLowerCase(), info.getTags(), metaInfo, chapters, previewFrames);
diff --git a/src/main/java/me/kavin/piped/utils/obj/Streams.java b/src/main/java/me/kavin/piped/utils/obj/Streams.java
index 478a37b..e0c2dd6 100644
--- a/src/main/java/me/kavin/piped/utils/obj/Streams.java
+++ b/src/main/java/me/kavin/piped/utils/obj/Streams.java
@@ -17,7 +17,7 @@ public class Streams {
 
     public boolean uploaderVerified;
 
-    public long duration, views, likes, dislikes, uploaderSubscriberCount;
+    public long duration, views, likes, dislikes, uploaderSubscriberCount, uploaded;
 
     public List<PipedStream> audioStreams, videoStreams;
 
@@ -33,7 +33,7 @@ public class Streams {
 
     public List<PreviewFrames> previewFrames;
 
-    public Streams(String title, String description, String uploadDate, String uploader, String uploaderUrl,
+    public Streams(String title, String description, String uploadDate, long uploaded, String uploader, String uploaderUrl,
                    String uploaderAvatar, String thumbnailUrl, long duration, long views, long likes, long dislikes, long uploaderSubscriberCount,
                    boolean uploaderVerified, List<PipedStream> audioStreams, List<PipedStream> videoStreams,
                    List<ContentItem> relatedStreams, List<Subtitle> subtitles, boolean livestream, String hls, String dash,
@@ -42,6 +42,7 @@ public class Streams {
         this.title = title;
         this.description = description;
         this.uploadDate = uploadDate;
+        this.uploaded = uploaded;
         this.uploader = uploader;
         this.uploaderUrl = uploaderUrl;
         this.uploaderAvatar = uploaderAvatar;

From 0859e48a1ceaeb40a9366ae6fd6a3e881855726d Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Wed, 10 Jul 2024 22:05:12 +0100
Subject: [PATCH 02/15] Update NewPipeExtractor

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b1409f8..e910d2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     implementation 'it.unimi.dsi:fastutil-core:8.5.13'
     implementation 'commons-codec:commons-codec:1.16.1'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
-    implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:fcb1d28f5b7c5c2dd74f54b047c4978cc672a66c'
+    implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:d486c3f4220c5b3fd045e614cd1662cdee437d13'
     implementation 'com.github.FireMasterK:nanojson:9f4af3b739cc13f3d0d9d4b758bbe2b2ae7119d7'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0'
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0'

From 5dc10bbf9e668a37243099c8c2f470abb3aeb4bd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 19:10:41 +0000
Subject: [PATCH 03/15] fix(deps): update jackson to v2.17.2

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index e910d2e..4901c15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,9 +18,9 @@ dependencies {
     implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
     implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:d486c3f4220c5b3fd045e614cd1662cdee437d13'
     implementation 'com.github.FireMasterK:nanojson:9f4af3b739cc13f3d0d9d4b758bbe2b2ae7119d7'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
     implementation 'com.rometools:rome:2.1.0'
     implementation 'com.rometools:rome-modules:2.1.0'
     implementation 'org.jsoup:jsoup:1.17.2'

From 6152aaf2b450cd8e48fd2c11a7d281678a72d0db Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2024 14:27:10 +0000
Subject: [PATCH 04/15] fix(deps): update dependency
 commons-codec:commons-codec to v1.17.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4901c15..27ff6d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation 'org.apache.commons:commons-text:1.12.0'
     implementation 'commons-io:commons-io:2.16.1'
     implementation 'it.unimi.dsi:fastutil-core:8.5.13'
-    implementation 'commons-codec:commons-codec:1.16.1'
+    implementation 'commons-codec:commons-codec:1.17.0'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
     implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:d486c3f4220c5b3fd045e614cd1662cdee437d13'
     implementation 'com.github.FireMasterK:nanojson:9f4af3b739cc13f3d0d9d4b758bbe2b2ae7119d7'

From 34f41085780e7b3ae0a856337cb054114cf5c9a4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:31:10 +0000
Subject: [PATCH 05/15] chore(deps): update dependency gradle to v8.9

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43453 -> 43504 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   7 +++++--
 gradlew.bat                              |   2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3d4ba8a0da8d277868979cfbc8ad796..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 8703
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
Ojj7^59?Sdh$^Qpp*~F><

delta 8662
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c0c423..6699604 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4..f5feea6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e..9b42019 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

From c52115dec21c579f53646a73af42584dd9b13437 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 13:19:19 +0000
Subject: [PATCH 06/15] fix(deps): update dependency
 commons-logging:commons-logging to v1.3.3

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 27ff6d0..7722085 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation('org.liquibase.ext:liquibase-yugabytedb:4.27.0') { exclude group: 'org.liquibase' }
     implementation 'com.zaxxer:HikariCP:5.1.0'
     implementation 'org.springframework.security:spring-security-crypto:6.2.4'
-    implementation 'commons-logging:commons-logging:1.3.1'
+    implementation 'commons-logging:commons-logging:1.3.3'
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
     implementation 'com.squareup.okhttp3:okhttp'
     implementation 'com.squareup.okhttp3:okhttp-brotli'

From cb35d1849b49c4ea68f221e625712acde9b49eb3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 01:40:54 +0000
Subject: [PATCH 07/15] fix(deps): update liquibase to v4.28.0

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7722085..e83255f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ dependencies {
     implementation 'org.postgresql:postgresql:42.7.3'
     implementation 'org.hibernate:hibernate-core:6.4.1.Final'
     implementation 'org.hibernate:hibernate-hikaricp:6.4.1.Final'
-    implementation 'org.liquibase:liquibase-core:4.27.0'
-    implementation('org.liquibase.ext:liquibase-yugabytedb:4.27.0') { exclude group: 'org.liquibase' }
+    implementation 'org.liquibase:liquibase-core:4.28.0'
+    implementation('org.liquibase.ext:liquibase-yugabytedb:4.28.0') { exclude group: 'org.liquibase' }
     implementation 'com.zaxxer:HikariCP:5.1.0'
     implementation 'org.springframework.security:spring-security-crypto:6.2.4'
     implementation 'commons-logging:commons-logging:1.3.3'

From 4e5f8eaadc8049ac738d387046241e69c1854d31 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 20:01:25 +0000
Subject: [PATCH 08/15] fix(deps): update dependency io.sentry:sentry to
 v7.11.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e83255f..458977b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
     implementation 'com.squareup.okhttp3:okhttp'
     implementation 'com.squareup.okhttp3:okhttp-brotli'
-    implementation 'io.sentry:sentry:7.8.0'
+    implementation 'io.sentry:sentry:7.11.0'
     implementation 'rocks.kavin:reqwest4j:1.0.14'
     implementation 'io.minio:minio:8.5.10'
     compileOnly 'org.projectlombok:lombok:1.18.32'

From e6725b457f70e1c7debf37e71a6e09418715fb74 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:43:28 +0000
Subject: [PATCH 09/15] fix(deps): update dependency org.projectlombok:lombok
 to v1.18.34

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 458977b..6d78173 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,8 @@ dependencies {
     implementation 'io.sentry:sentry:7.11.0'
     implementation 'rocks.kavin:reqwest4j:1.0.14'
     implementation 'io.minio:minio:8.5.10'
-    compileOnly 'org.projectlombok:lombok:1.18.32'
-    annotationProcessor 'org.projectlombok:lombok:1.18.32'
+    compileOnly 'org.projectlombok:lombok:1.18.34'
+    annotationProcessor 'org.projectlombok:lombok:1.18.34'
 }
 
 shadowJar {

From 66e7557f49c9a7c29db4627ac267376bc3258399 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:45:31 +0000
Subject: [PATCH 10/15] fix(deps): update dependency
 org.springframework.security:spring-security-crypto to v6.3.1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6d78173..fd6241c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     implementation 'org.liquibase:liquibase-core:4.28.0'
     implementation('org.liquibase.ext:liquibase-yugabytedb:4.28.0') { exclude group: 'org.liquibase' }
     implementation 'com.zaxxer:HikariCP:5.1.0'
-    implementation 'org.springframework.security:spring-security-crypto:6.2.4'
+    implementation 'org.springframework.security:spring-security-crypto:6.3.1'
     implementation 'commons-logging:commons-logging:1.3.3'
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
     implementation 'com.squareup.okhttp3:okhttp'

From 0e7a9cdb2c8541faddfc74dc917ab122ecd85a70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:46:55 +0000
Subject: [PATCH 11/15] fix(deps): update dependency io.minio:minio to v8.5.11

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index fd6241c..48842e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp-brotli'
     implementation 'io.sentry:sentry:7.11.0'
     implementation 'rocks.kavin:reqwest4j:1.0.14'
-    implementation 'io.minio:minio:8.5.10'
+    implementation 'io.minio:minio:8.5.11'
     compileOnly 'org.projectlombok:lombok:1.18.34'
     annotationProcessor 'org.projectlombok:lombok:1.18.34'
 }

From 275eddc09f9b71afc27d67b8efd61693cea9c63e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 08:09:23 +0000
Subject: [PATCH 12/15] fix(deps): update dependency org.hsqldb:hsqldb to
 v2.7.3

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 48842e7..ff3d491 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     implementation 'io.activej:activej-boot:5.5'
     implementation 'io.activej:activej-specializer:5.5'
     implementation 'io.activej:activej-launchers-http:5.5'
-    implementation 'org.hsqldb:hsqldb:2.7.2'
+    implementation 'org.hsqldb:hsqldb:2.7.3'
     implementation 'org.postgresql:postgresql:42.7.3'
     implementation 'org.hibernate:hibernate-core:6.4.1.Final'
     implementation 'org.hibernate:hibernate-hikaricp:6.4.1.Final'

From cb2a16eb0d91146fbe00cc21084854c2a8386606 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Thu, 11 Jul 2024 17:00:45 +0100
Subject: [PATCH 13/15] Change from docker-compose command to docker compose.

---
 .github/workflows/docker-build-test.yml            | 4 ++--
 .github/workflows/docker-migrations-build-test.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index b534b7f..1bdddc3 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -49,9 +49,9 @@ jobs:
           file: ${{ matrix.dockerfile }}
           tags: 1337kavin/piped:latest
       - name: Start Docker-Compose services
-        run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
+        run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
       - name: Run tests
         run: ./testing/api-test.sh
       - name: Collect services logs
         if: failure()
-        run: docker-compose -f ${{ matrix.docker-compose-file }} logs
+        run: docker compose -f ${{ matrix.docker-compose-file }} logs
diff --git a/.github/workflows/docker-migrations-build-test.yml b/.github/workflows/docker-migrations-build-test.yml
index ca18b97..183c72b 100644
--- a/.github/workflows/docker-migrations-build-test.yml
+++ b/.github/workflows/docker-migrations-build-test.yml
@@ -61,7 +61,7 @@ jobs:
           file: ${{ matrix.dockerfile }}
           tags: 1337kavin/piped:latest
       - name: Start Docker-Compose services
-        run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
+        run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
       - run: rm piped.jar
       - uses: actions/download-artifact@v4
         with:
@@ -74,9 +74,9 @@ jobs:
           file: ${{ matrix.dockerfile }}
           tags: 1337kavin/piped:latest
       - name: Start Docker-Compose services
-        run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
+        run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
       - name: Run tests
         run: ./testing/api-test.sh
       - name: Collect services logs
         if: failure()
-        run: docker-compose -f ${{ matrix.docker-compose-file }} logs
+        run: docker compose -f ${{ matrix.docker-compose-file }} logs

From 1c1348a49e4694fa1b4981fce98e2df73c13f526 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 16:01:13 +0000
Subject: [PATCH 14/15] chore(deps): update docker/build-push-action action to
 v6

---
 .github/workflows/docker-build-test.yml            | 2 +-
 .github/workflows/docker-build.yml                 | 2 +-
 .github/workflows/docker-migrations-build-test.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index b534b7f..6fa965d 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Create Version File
         run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION
       - name: Build Image Locally
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index ee26e45..8d72614 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -47,7 +47,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ${{ matrix.dockerfile }}
diff --git a/.github/workflows/docker-migrations-build-test.yml b/.github/workflows/docker-migrations-build-test.yml
index ca18b97..a442be0 100644
--- a/.github/workflows/docker-migrations-build-test.yml
+++ b/.github/workflows/docker-migrations-build-test.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           name: piped-old.jar
       - name: Build Old Image Locally
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true
@@ -67,7 +67,7 @@ jobs:
         with:
           name: piped.jar
       - name: Build New Image Locally
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true

From 6380cea805d1bd95655e29a90321f09aeb3bb99a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 16:01:09 +0000
Subject: [PATCH 15/15] fix(deps): update dependency org.jsoup:jsoup to v1.18.1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ff3d491..78a6f3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
     implementation 'com.rometools:rome:2.1.0'
     implementation 'com.rometools:rome-modules:2.1.0'
-    implementation 'org.jsoup:jsoup:1.17.2'
+    implementation 'org.jsoup:jsoup:1.18.1'
     implementation 'io.activej:activej-common:5.5'
     implementation 'io.activej:activej-http:5.5'
     implementation 'io.activej:activej-boot:5.5'