From 91372d7427cc06ec60f93f41c65067a167f3eae5 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Thu, 5 May 2022 19:40:38 +0100
Subject: [PATCH] Revert unsubscribe logic.

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

diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index 94616e8..c2259c2 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -771,18 +771,14 @@ public class ResponseHelper {
     public static byte[] unsubscribeResponse(String session, String channelId)
             throws IOException {
 
-        User user = DatabaseHelper.getUserFromSessionWithSubscribed(session);
+        User user = DatabaseHelper.getUserFromSession(session);
 
         if (user != null) {
             try (Session s = DatabaseSessionFactory.createSession()) {
-                if (user.getSubscribed().contains(channelId)) {
-                    user.getSubscribed().remove(channelId);
-
-                    s.update(user);
-                    s.getTransaction().begin();
-                    s.getTransaction().commit();
-                }
-
+                s.getTransaction().begin();
+                s.createNativeQuery("delete from users_subscribed where subscriber = :id and channel = :channel")
+                        .setParameter("id", user.getId()).setParameter("channel", channelId).executeUpdate();
+                s.getTransaction().commit();
                 return Constants.mapper.writeValueAsBytes(new AcceptedResponse());
             }