Merge pull request #1266 from CodeCrowCorp/dev

Fix: prevent thumbnail screenshot if not live
CodeCrowCorp · May 23, 2024 · 3cd3703 · 3cd3703
2 parents 2281c3b + d81b398
commit 3cd3703
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/lib/components/Channel/Chat/DrawerEditChannel.svelte b/src/lib/components/Channel/Chat/DrawerEditChannel.svelte
@@ -10,7 +10,7 @@
 	import IconChatScreenshot from '$lib/assets/icons/chat/IconChatScreenshot.svelte'
 	import { captureScreenShot } from '$lib/utils'
 
-	export let channel: any, showDrawer: boolean
+	export let channel: any, showDrawer: boolean, isLive: boolean
 
 	let fileuploader: HTMLInputElement,
 		thumbnailRef: any,
@@ -56,7 +56,7 @@
 	const checkVideo = (e: any) => {
 		e.preventDefault()
 		showThumbnail = true
-		if (channel.videoItems.length > 0) {
+		if (isLive && channel.videoItems.length > 0) {
 			imageSrc = captureScreenShot(channel)
 		}
 	}
@@ -217,7 +217,7 @@
 					<div class="flex flex-row gap-2 mt-auto p-3">
 						<button type="button" class="btn btn-neutral grow" on:click={() => toggleDrawer()}
 							>Cancel</button>
-						<button type="submit" class="btn btn-primary grow">Edit</button>
+						<button type="submit" class="btn btn-primary grow">Apply</button>
 					</div>
 				</div>
 			</form>

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -387,7 +387,7 @@ export const getHref = async ({
 			'x-api-key': xApiKey
 		}
 	})
-	const { loginUrl } = await response.json()
+	const { loginUrl }: any = await response.json()
 	window.location.replace(loginUrl)
 }
 

diff --git a/src/routes/channel/[channelId]/+page.svelte b/src/routes/channel/[channelId]/+page.svelte
@@ -407,7 +407,7 @@
 					bind:viewers />
 
 				{#if showEditChannelDrawer}
-					<DrawerEditChannel bind:channel bind:showDrawer={showEditChannelDrawer} />
+					<DrawerEditChannel bind:channel bind:showDrawer={showEditChannelDrawer} bind:isLive />
 				{/if}
 			</div>
 			{#if !$is_chat_drawer_destroy}