From c298499a30f25a585e8573b81647406604b55f3d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:00:02 +0000
Subject: [PATCH 1/2] Update hibernate core to v6.2.1.Final

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

diff --git a/build.gradle b/build.gradle
index 116e74a..99a5017 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,8 +31,8 @@ dependencies {
     implementation 'io.activej:activej-launchers-http:5.4.3'
     implementation 'org.hsqldb:hsqldb:2.7.1'
     implementation 'org.postgresql:postgresql:42.6.0'
-    implementation 'org.hibernate:hibernate-core:6.1.7.Final'
-    implementation 'org.hibernate:hibernate-hikaricp:6.1.7.Final'
+    implementation 'org.hibernate:hibernate-core:6.2.1.Final'
+    implementation 'org.hibernate:hibernate-hikaricp:6.2.1.Final'
     implementation 'com.zaxxer:HikariCP:5.0.1'
     implementation 'org.springframework.security:spring-security-crypto:6.0.2'
     implementation 'commons-logging:commons-logging:1.2'

From f42a006d81f5b294106833127b73a830bfa90513 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Wed, 26 Apr 2023 12:00:46 +0100
Subject: [PATCH 2/2] Fix existing code for new hibernate sanity checks.

---
 .../me/kavin/piped/server/handlers/auth/FeedHandlers.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java b/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
index 6107564..d867d68 100644
--- a/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
+++ b/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
@@ -109,14 +109,14 @@ public class FeedHandlers {
                 CriteriaQuery<Video> criteria = cb.createQuery(Video.class);
                 var root = criteria.from(Video.class);
                 root.fetch("channel", JoinType.RIGHT);
-                var subquery = criteria.subquery(User.class);
+                var subquery = criteria.subquery(String.class);
                 var subroot = subquery.from(User.class);
                 subquery.select(subroot.get("subscribed_ids"))
                         .where(cb.equal(subroot.get("id"), user.getId()));
 
                 criteria.select(root)
                         .where(
-                                root.get("channel").in(subquery)
+                                root.get("channel").get("uploader_id").in(subquery)
                         )
                         .orderBy(cb.desc(root.get("uploaded")));
 
@@ -162,14 +162,14 @@ public class FeedHandlers {
                 CriteriaQuery<Video> criteria = cb.createQuery(Video.class);
                 var root = criteria.from(Video.class);
                 root.fetch("channel", JoinType.RIGHT);
-                var subquery = criteria.subquery(User.class);
+                var subquery = criteria.subquery(String.class);
                 var subroot = subquery.from(User.class);
                 subquery.select(subroot.get("subscribed_ids"))
                         .where(cb.equal(subroot.get("id"), user.getId()));
 
                 criteria.select(root)
                         .where(
-                                root.get("channel").in(subquery)
+                                root.get("channel").get("uploader_id").in(subquery)
                         )
                         .orderBy(cb.desc(root.get("uploaded")));