Merge pull request #1249 from CodeCrowCorp/dev

Fix: moved websocket listener above emits
CodeCrowCorp · May 15, 2024 · bbd8055 · bbd8055
2 parents 89f0e13 + fe929c9
commit bbd8055
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/routes/channel/[channelId]/+page.svelte b/src/routes/channel/[channelId]/+page.svelte
@@ -50,16 +50,6 @@
 	$: isLive = channel?.videoItems?.some((input: any) => input?.rtmps?.isConnected) ?? false
 
 	onMount(async () => {
-		clearInterval(platformPollingInterval)
-		platformPollingInterval = null
-		await loadChannel()
-		await handleWebsocket()
-		await loadMoreChannels()
-		$is_chat_drawer_destroy = false
-		setTimeout(() => {
-			$is_chat_drawer_open = true
-		}, 600)
-
 		channel_message.subscribe(async (value: any) => {
 			if (!value || !channel || (channel && parseInt($page.params.channelId) !== channel._id))
 				return
@@ -134,6 +124,15 @@
 					break
 			}
 		})
+		clearInterval(platformPollingInterval)
+		platformPollingInterval = null
+		await loadChannel()
+		await handleWebsocket()
+		await loadMoreChannels()
+		$is_chat_drawer_destroy = false
+		setTimeout(() => {
+			$is_chat_drawer_open = true
+		}, 600)
 	})
 
 	onDestroy(async () => {