Merge pull request #776 from CodeCrowCorp/dev

Fix: enabling and disabling restream
CodeCrowCorp · Oct 30, 2023 · 3bad156 · 3bad156
2 parents 665e452 + f99d7df
commit 3bad156
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage-website",
-	"version": "0.1.07",
+	"version": "0.1.08",
 	"license": "GPL-3.0",
 	"private": true,
 	"type": "module",

diff --git a/src/lib/components/Channel/Chat/DrawerRestream.svelte b/src/lib/components/Channel/Chat/DrawerRestream.svelte
@@ -3,7 +3,7 @@
 	import { get, put, del } from '$lib/api.js'
 	import { page } from '$app/stores'
 	import { isValidURL } from '$lib/utils'
-	import IconRestream from '$lib/assets/icons/channel/IconRestream.svelte'
+	import { is_restream_drawer_open } from '$lib/stores/channelStore'
 
 	$: auth = {
 		userId: $page.data.user?.userId,
@@ -76,22 +76,8 @@
 </script>
 
 <div class="drawer drawer-end">
-	<input id="restream-drawer" type="checkbox" class="drawer-toggle" />
-	<div class="drawer-content">
-		<!-- Page content here -->
-		<!-- svelte-ignore a11y-click-events-have-key-events -->
-		<label
-			for="restream-drawer"
-			class="btn text-white border-none tooltip font-normal normal-case items-center flex {restream_drawer
-				? 'btn-primary'
-				: 'btn-neutral'}"
-			data-tip="Restream"
-			on:click={() => {
-				restream_drawer = !restream_drawer
-			}}>
-			<IconRestream />
-		</label>
-	</div>
+	<input id="restream-drawer" type="checkbox" class="drawer-toggle" bind:checked={$is_restream_drawer_open}/>
+
 	<!-- svelte-ignore a11y-click-events-have-key-events -->
 	<div class="drawer-side z-50" on:click={overlayClick}>
 		<label id="overlay" for="restream-drawer" aria-label="close sidebar" class="drawer-overlay" />
@@ -205,7 +191,7 @@
 					class="btn btn-neutral text-white grow w-full"
 					on:click={() => {
 						document.getElementById('overlay')?.click()
-					}}>Cancel</button>
+					}}>Close</button>
 			</div>
 		</ul>
 	</div>

diff --git a/src/lib/components/Channel/Stream/StreamControls.svelte b/src/lib/components/Channel/Stream/StreamControls.svelte
@@ -2,6 +2,7 @@
 	import IconShareScreen from '$lib/assets/icons/channel/IconShareScreen.svelte'
 	import IconShareWebcam from '$lib/assets/icons/channel/IconShareWebcam.svelte'
 	import IconShareAudio from '$lib/assets/icons/channel/IconShareAudio.svelte'
+	import IconRestream from '$lib/assets/icons/channel/IconRestream.svelte'
 	import { del, post, put } from '$lib/api'
 	import { page } from '$app/stores'
 	import { emitAction } from '$lib/websocket'
@@ -19,7 +20,7 @@
 		is_feature_apps_enabled,
 		is_feature_restream_enabled
 	} from '$lib/stores/remoteConfigStore'
-	import DrawerRestream from '$lib/components/Channel/Chat/DrawerRestream.svelte'
+	import { is_restream_drawer_open } from '$lib/stores/channelStore'
 
 	export let isHostOrGuest: boolean = false,
 		channel: any,
@@ -413,9 +414,24 @@
 				!videoItemIsActive}>
 			<IconShareObs />
 		</button>
-
 		{#if $is_feature_restream_enabled}
-			<DrawerRestream />
+			<button
+				class="flex items-center btn text-white border-none tooltip font-normal normal-case {$is_restream_drawer_open
+					? 'btn-primary'
+					: 'btn-neutral'}"
+				data-tip="Restream"
+				on:click={() => {
+					$is_restream_drawer_open = !$is_restream_drawer_open
+				}}
+				disabled={$is_sharing_obs ||
+					$is_sharing_screen ||
+					$is_sharing_webcam ||
+					$is_sharing_audio ||
+					!isHostOrGuest ||
+					!isChannelSocketConnected ||
+					!videoItemIsActive}>
+				<IconRestream />
+			</button>
 		{/if}
 	</div>
 </div>

diff --git a/src/lib/stores/channelStore.ts b/src/lib/stores/channelStore.ts
@@ -12,5 +12,3 @@ export const is_chat_drawer_destroy: Writable<boolean> = writable(false)
 export const was_chat_drawer_closed: Writable<boolean> = writable(false)
 
 export const is_restream_drawer_open: Writable<boolean> = writable(false)
-export const is_restream_drawer_destroy: Writable<boolean> = writable(false)
-export const was_restream_drawer_closed: Writable<boolean> = writable(false)
diff --git a/src/routes/channel/[channelId]/+page.svelte b/src/routes/channel/[channelId]/+page.svelte
@@ -2,7 +2,7 @@
 	import DrawerChat from '$lib/components/Channel/Chat/DrawerChat.svelte'
 	import StreamContainer from '$lib/components/Channel/Stream/StreamContainer.svelte'
 	import { onDestroy, onMount } from 'svelte'
-	import { get, del, post, put, patch } from '$lib/api'
+	import { get, del, post } from '$lib/api'
 	import {
 		emitChatHistoryToChannel,
 		initChannelSocket,
@@ -22,6 +22,8 @@
 		is_sharing_audio,
 		updateVideoItems
 	} from '$lib/stores/streamStore'
+	import { is_feature_restream_enabled } from '$lib/stores/remoteConfigStore'
+	import DrawerRestream from '$lib/components/Channel/Chat/DrawerRestream.svelte'
 
 	let channel: any,
 		isDeleteModalOpen = false,
@@ -297,6 +299,10 @@
 	})
 </script>
 
+{#if $is_feature_restream_enabled && !$is_sharing_screen && !$is_sharing_webcam && !$is_sharing_audio && isHostOrGuest}
+	<DrawerRestream />
+{/if}
+
 {#if channel && channel._id === $page.params.channelId}
 	<div class="relative h-full bg-base-200 overflow-hidden flex">
 		<div