diff --git a/src/lib/components/Channel/Chat/ChatInput.svelte b/src/lib/components/Channel/Chat/ChatInput.svelte index 771814d0..f8f5ed87 100644 --- a/src/lib/components/Channel/Chat/ChatInput.svelte +++ b/src/lib/components/Channel/Chat/ChatInput.svelte @@ -12,15 +12,15 @@ export let users: any let selectedCommand = 0 let selectedUser = 0 - let inputBox:any = null + let inputBox: any = null $: chatMessage = '' $: isChannelSocketConnected = $channel_connection === `open-${channel._id}` && $page.data.user?.userId $: isHost = channel.user === $page.data.user?.userId - function insert(str:string, index:number, value:string) { - return str.substr(0, index) + value + str.substr(index); + function insert(str: string, index: number, value: string) { + return str.substr(0, index) + value + str.substr(index) } const sendMessage = () => { @@ -90,21 +90,19 @@ } const makeCodeSnippet = () => { - if(!chatMessage){ - chatMessage = "``" - + if (!chatMessage) { + chatMessage = '``' + inputBox.focus() setTimeout(() => { const pos = chatMessage.length - 1 inputBox.setSelectionRange(pos, pos) }, 100) - - } - else { + } else { const s = inputBox.selectionStart, - e = inputBox.selectionEnd; - chatMessage = insert(chatMessage, s, "`") - chatMessage = insert(chatMessage, e+1, "`") + e = inputBox.selectionEnd + chatMessage = insert(chatMessage, s, '`') + chatMessage = insert(chatMessage, e + 1, '`') } } @@ -202,18 +200,19 @@ data-tip="AI" on:click={() => { if (isHost) toggleAIChat() - }}> + }} + disabled={!isChannelSocketConnected}> Enable AI - - + + diff --git a/src/lib/components/Channel/Chat/EmojiPicker.svelte b/src/lib/components/Channel/Chat/EmojiPicker.svelte index 5829e0b8..b16c8ee0 100644 --- a/src/lib/components/Channel/Chat/EmojiPicker.svelte +++ b/src/lib/components/Channel/Chat/EmojiPicker.svelte @@ -3,7 +3,7 @@ import FloatingMenu from './FloatingMenu.svelte' import IconChatEmoji from '$lib/assets/icons/chat/IconChatEmoji.svelte' - export let onSelect: any + export let onSelect: any, isChannelSocketConnected: any let container: any let btn: any @@ -30,6 +30,6 @@ }) - +
diff --git a/src/lib/components/Channel/Chat/FloatingMenu.svelte b/src/lib/components/Channel/Chat/FloatingMenu.svelte index 30f31e21..87be696c 100644 --- a/src/lib/components/Channel/Chat/FloatingMenu.svelte +++ b/src/lib/components/Channel/Chat/FloatingMenu.svelte @@ -1,57 +1,55 @@ + -
+
-
+
+ \ No newline at end of file + diff --git a/src/lib/components/Channel/Chat/GifPicker.svelte b/src/lib/components/Channel/Chat/GifPicker.svelte index 37d85a14..715bda38 100644 --- a/src/lib/components/Channel/Chat/GifPicker.svelte +++ b/src/lib/components/Channel/Chat/GifPicker.svelte @@ -6,7 +6,7 @@ import { get } from '../../../api.js' import { page } from '$app/stores' - export let onSelect: any + export let onSelect: any, isChannelSocketConnected: any let gifs: { downsized_large: string; original: string; title: string }[] = [] let searched: { downsized_large: string; original: string; title: string }[] = [] @@ -15,11 +15,13 @@ onMount(async () => { loading = true - const resp = await get('giphy/trending', { - userId: $page.data.user?.userId, - token: $page.data.user?.token - }) - if (resp && Array.isArray(resp)) gifs = resp + if (isChannelSocketConnected) { + const resp = await get('giphy/trending', { + userId: $page.data.user?.userId, + token: $page.data.user?.token + }) + if (resp && Array.isArray(resp)) gifs = resp + } loading = false }) @@ -37,7 +39,12 @@ $: list = query ? searched : gifs - +
{ - if(e.key === 'Enter'){ + if (e.key === 'Enter') { e.preventDefault() onSearch(e) } - }} - /> + }} />
{#if loading}