Fix unsubscribeResponse()

This commit is contained in:
theanonymousexyz 2022-04-23 00:20:37 +02:00
parent b38c641b5f
commit cffd93f383
No known key found for this signature in database
GPG key ID: 35EE09F5481049BB

View file

@ -650,18 +650,18 @@ public class ResponseHelper {
plQuery.select(plRoot).where(plCriteria.equal(plRoot.get("owner"), user.getId())); plQuery.select(plRoot).where(plCriteria.equal(plRoot.get("owner"), user.getId()));
List<me.kavin.piped.utils.obj.db.Playlist> playlists = s.createQuery(plQuery).getResultList(); 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(); Iterator<PlaylistVideo> pvIter = pl.getVideos().iterator();
while (pvIter.hasNext()) while (pvIter.hasNext())
s.delete(pvIter.next()); 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.delete(user);
s.getTransaction().begin(); s.getTransaction().begin();
@ -790,7 +790,7 @@ public class ResponseHelper {
public static byte[] unsubscribeResponse(String session, String channelId) public static byte[] unsubscribeResponse(String session, String channelId)
throws IOException { throws IOException {
User user = DatabaseHelper.getUserFromSession(session); User user = DatabaseHelper.getUserFromSessionWithSubscribed(session);
if (user != null) { if (user != null) {
try (Session s = DatabaseSessionFactory.createSession()) { try (Session s = DatabaseSessionFactory.createSession()) {