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] 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")));