Merge pull request #829 from CodeCrowCorp/dev

Fix: websocket reconnection and channel edit issues
CodeCrowCorp · Dec 14, 2023 · ddf81e8 · ddf81e8
2 parents 5bf2207 + 182381e
commit ddf81e8
Show file tree

Hide file tree

Showing 12 changed files with 149 additions and 197 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage-website",
-	"version": "0.1.11",
+	"version": "0.1.12",
 	"license": "GPL-3.0",
 	"private": true,
 	"type": "module",

diff --git a/src/lib/components/Channel/Chat/DrawerEditChannel.svelte b/src/lib/components/Channel/Chat/DrawerEditChannel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { tags } from '$lib/stores/channelStore'
-	import { is_sharing_screen, is_sharing_webcam } from '$lib/stores/streamStore'
+	import { is_sharing_webrtc, is_sharing_webcam } from '$lib/stores/streamStore'
 	import { onDestroy, onMount } from 'svelte'
 	import Tags from 'svelte-tags-input'
 	import DrawerAddCategory from '$lib/components/Browse/DrawerAddCategory.svelte'

diff --git a/src/lib/components/Channel/Stream/StreamContainer.svelte b/src/lib/components/Channel/Stream/StreamContainer.svelte
@@ -12,9 +12,9 @@
 	import { page } from '$app/stores'
 	import { createEventDispatcher } from 'svelte'
 	import {
-		is_sharing_obs,
+		is_sharing_rtmp,
 		is_sharing_audio,
-		is_sharing_screen,
+		is_sharing_webrtc,
 		is_sharing_webcam
 	} from '$lib/stores/streamStore'
 	import { getNumberInThousands } from '$lib/utils'
@@ -89,8 +89,8 @@
 <div class="flex justify-center h-full">
 	<div
 		class="carousel carousel-vertical rounded-lg bg-base-100 w-full m-5 mb-24 {isScrollable ||
-		$is_sharing_obs ||
-		$is_sharing_screen ||
+		$is_sharing_rtmp ||
+		$is_sharing_webrtc ||
 		$is_sharing_webcam ||
 		$is_sharing_audio
 			? 'overflow-y-hidden'