From 83cb68b63fb542ae2afd8a3e294b362e9f3ede21 Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Thu, 24 Apr 2025 14:51:28 +0900
Subject: [PATCH] **Remove redundant session cleanup in WebSocket error
 handlers**

Removed unnecessary `removeSession` calls from WebSocket `finally` blocks as they are either handled elsewhere or no longer needed. This simplifies the error handling flow and ensures consistency across WebSocket route implementations.
---
 .../space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt   | 2 --
 .../space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt       | 2 --
 .../space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt      | 2 --
 3 files changed, 6 deletions(-)

diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt
index 01b145b..bc4ea6c 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt
@@ -151,8 +151,6 @@ fun Routing.wsSongListRoutes() {
             }
         } catch (e: ClosedReceiveChannelException) {
             logger.error("Error in WebSocket: ${e.message}")
-        } finally {
-            removeSession(uid)
         }
     }
 
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
index 111d052..618ccfa 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
@@ -110,8 +110,6 @@ fun Routing.wsSongRoutes() {
             }
         } catch(e: ClosedReceiveChannelException) {
             logger.error("Error in WebSocket: ${e.message}")
-        } finally {
-            removeSession(uid, this)
         }
     }
 
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt
index 243b30f..d0014f7 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt
@@ -87,8 +87,6 @@ fun Routing.wsTimerRoutes() {
             }
         } catch(e: ClosedReceiveChannelException) {
             logger.error("Error in WebSocket: ${e.message}")
-        } finally {
-            removeSession(uid, this)
         }
     }