From cffd93f383e290d541704412138266bfe8415485 Mon Sep 17 00:00:00 2001
From: theanonymousexyz <hello@theanonymouse.xyz>
Date: Sat, 23 Apr 2022 00:20:37 +0200
Subject: [PATCH] Fix unsubscribeResponse()

---
 .../java/me/kavin/piped/utils/ResponseHelper.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index 7dde9ae..5971413 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -650,18 +650,18 @@ public class ResponseHelper {
                     plQuery.select(plRoot).where(plCriteria.equal(plRoot.get("owner"), user.getId()));
                     List<me.kavin.piped.utils.obj.db.Playlist> playlists = s.createQuery(plQuery).getResultList();
                     
-                    for (me.kavin.piped.utils.obj.db.Playlist pl : playlists) {
+                    Iterator<me.kavin.piped.utils.obj.db.Playlist> plIter = playlists.iterator();
+
+                    while (plIter.hasNext()) {
+                        me.kavin.piped.utils.obj.db.Playlist pl = plIter.next();
                         Iterator<PlaylistVideo> pvIter = pl.getVideos().iterator();
 
                         while (pvIter.hasNext())
                             s.delete(pvIter.next());
+                        
+                        s.delete(pl);
                     }
 
-                    Iterator<me.kavin.piped.utils.obj.db.Playlist> iter = playlists.iterator();
-
-                    while (iter.hasNext())
-                        s.delete(iter.next());
-
                     s.delete(user);
 
                     s.getTransaction().begin();
@@ -790,7 +790,7 @@ public class ResponseHelper {
     public static byte[] unsubscribeResponse(String session, String channelId)
             throws IOException {
 
-        User user = DatabaseHelper.getUserFromSession(session);
+        User user = DatabaseHelper.getUserFromSessionWithSubscribed(session);
 
         if (user != null) {
             try (Session s = DatabaseSessionFactory.createSession()) {