From 3d8d5927680c5b487001b1cde2f6d84a703a6180 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Tue, 1 Mar 2022 21:02:35 +0000
Subject: [PATCH] Fix for bug where subscriptions can't be fetched on fresh
 accounts. (#205)

---
 src/main/java/me/kavin/piped/utils/DatabaseHelper.java | 2 +-
 src/main/java/me/kavin/piped/utils/ResponseHelper.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/kavin/piped/utils/DatabaseHelper.java b/src/main/java/me/kavin/piped/utils/DatabaseHelper.java
index 4bef70b..abd9057 100644
--- a/src/main/java/me/kavin/piped/utils/DatabaseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/DatabaseHelper.java
@@ -26,7 +26,7 @@ public class DatabaseHelper {
         CriteriaBuilder cb = s.getCriteriaBuilder();
         CriteriaQuery<User> cr = cb.createQuery(User.class);
         Root<User> root = cr.from(User.class);
-        root.fetch("subscribed_ids", JoinType.INNER);
+        root.fetch("subscribed_ids", JoinType.LEFT);
         cr.select(root).where(cb.equal(root.get("sessionId"), session));
 
         return s.createQuery(cr).uniqueResult();
diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index 3199caf..d6e83d1 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -628,7 +628,7 @@ public class ResponseHelper {
 
                 Multithreading.runAsync(() -> {
                     Session sess = DatabaseSessionFactory.createSession();
-                    me.kavin.piped.utils.obj.db.Channel channel = DatabaseHelper.getChannelFromId(sess, channelId);
+                    var channel = DatabaseHelper.getChannelFromId(sess, channelId);
 
                     if (channel == null) {
                         ChannelInfo info = null;
@@ -866,7 +866,7 @@ public class ResponseHelper {
 
                         Session sess = DatabaseSessionFactory.createSession();
 
-                        me.kavin.piped.utils.obj.db.Channel channel = DatabaseHelper.getChannelFromId(sess, channelId);
+                        var channel = DatabaseHelper.getChannelFromId(sess, channelId);
 
                         if (channel == null) {
                             ChannelInfo info;