Merge pull request #745 from CodeCrowCorp/dev

Fix: new user urls crash and favorites/FCM
CodeCrowCorp · Oct 13, 2023 · a7a7285 · a7a7285
2 parents 7edaaf1 + ae56610
commit a7a7285
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 13 deletions.
diff --git a/src/lib/components/Channel/Chat/DropdownViewChannel.svelte b/src/lib/components/Channel/Chat/DropdownViewChannel.svelte
@@ -21,11 +21,10 @@
 
 	onMount(async () => {
 		if ($page.data.user?.userId) {
-			const favorites = await get(`favorites?channelId=${channel._id}`, {
+			isFavorite = await get(`favorite?channelId=${channel._id}`, {
 				userId: $page.data.user?.userId,
 				token: $page.data.user?.token
 			})
-			isFavorite = favorites?.length > 0
 		}
 	})
 

diff --git a/src/lib/components/Channel/Stream/StreamControls.svelte b/src/lib/components/Channel/Stream/StreamControls.svelte
@@ -8,7 +8,7 @@
 		is_chat_drawer_destroy,
 		was_chat_drawer_closed
 	} from '$lib/stores/channelStore'
-	import { del, put } from '$lib/api'
+	import { del, post, put } from '$lib/api'
 	import { page } from '$app/stores'
 	import { emitAction } from '$lib/websocket'
 	import {
@@ -59,6 +59,25 @@
 		})
 	}
 
+	const sendFcm = async ({
+		channelId,
+		channelTitle,
+		username
+	}: {
+		channelId: string
+		channelTitle: string
+		username: string
+	}) => {
+		return await post(
+			`firebase/send-fcm`,
+			{ channelId, channelTitle, username },
+			{
+				userId: $page.data.user?.userId,
+				token: $page.data.user?.token
+			}
+		)
+	}
+
 	const deleteLiveInput = async ({
 		channelId,
 		userId,
@@ -82,8 +101,6 @@
 	const startObsStream = async () => {
 		const liveInput = await createLiveInput({
 			channelId: `${$page.params.channelId}`,
-			channelTitle: `${channel.title}`,
-			username: `${$page.data.user?.user?.username}`,
 			userId: $page.data.user?.userId,
 			trackType: 'obs',
 			isTrackActive: true,
@@ -103,6 +120,11 @@
 				video: liveInput
 			}
 		})
+		await sendFcm({
+			channelId: $page.params.channelId,
+			channelTitle: channel.title,
+			username: $page.data.user?.user?.username
+		})
 	}
 
 	const stopObsStream = async () => {
@@ -131,8 +153,6 @@
 	const startScreenStream = async () => {
 		const liveInput = await createLiveInput({
 			channelId: `${$page.params.channelId}`,
-			channelTitle: `${channel.title}`,
-			username: `${$page.data.user?.user?.username}`,
 			userId: $page.data.user?.userId,
 			trackType: 'screen',
 			isTrackActive: true,
@@ -152,6 +172,11 @@
 				video: liveInput
 			}
 		})
+		await sendFcm({
+			channelId: $page.params.channelId,
+			channelTitle: channel.title,
+			username: $page.data.user?.user?.username
+		})
 	}
 
 	const stopScreenStream = async () => {
@@ -180,8 +205,6 @@
 	const startWebcamStream = async () => {
 		const liveInput = await createLiveInput({
 			channelId: `${$page.params.channelId}`,
-			channelTitle: `${channel.title}`,
-			username: `${$page.data.user?.user?.username}`,
 			userId: $page.data.user?.userId,
 			trackType: 'webcam',
 			isTrackActive: true,
@@ -201,6 +224,11 @@
 				video: liveInput
 			}
 		})
+		await sendFcm({
+			channelId: $page.params.channelId,
+			channelTitle: channel.title,
+			username: $page.data.user?.user?.username
+		})
 	}
 
 	const stopWebcamStream = async () => {
@@ -229,8 +257,6 @@
 	const startAudioStream = async () => {
 		const liveInput = await createLiveInput({
 			channelId: `${$page.params.channelId}`,
-			channelTitle: `${channel.title}`,
-			username: `${$page.data.user?.user?.username}`,
 			userId: $page.data.user?.userId,
 			trackType: 'audio',
 			isTrackActive: true,
@@ -250,6 +276,11 @@
 				video: liveInput
 			}
 		})
+		await sendFcm({
+			channelId: $page.params.channelId,
+			channelTitle: channel.title,
+			username: $page.data.user?.user?.username
+		})
 	}
 
 	const stopAudioStream = async () => {

diff --git a/src/lib/components/Profile/DrawerEditProfile.svelte b/src/lib/components/Profile/DrawerEditProfile.svelte
@@ -10,7 +10,12 @@
 	export let profile: any
 
 	let isProfileUpdated = objectMonitor($page.data.profile)
-	$: inputFields = profile.urls ? [...profile.urls] : []
+
+	let inputFields = [...profile.urls]
+
+	$: if (!inputFields.length) {
+		inputFields = ['']
+	}
 
 	const removeInputField = (index: number) => {
 		inputFields = inputFields.filter((_, i) => i !== index)

diff --git a/src/routes/[username]/+page.server.ts b/src/routes/[username]/+page.server.ts
@@ -33,13 +33,15 @@ export const load = (async ({ params }: { params: any }) => {
 export const actions = {
 	'update-profile': async ({ request, locals }: { request: any; locals: any }) => {
 		const data: FormData = await request.formData()
-		const newUser: any = {}
+		let newUser: any = {}
 		addPropertyIfDefined(data, 'displayName', newUser)
 		addPropertyIfDefined(data, 'username', newUser)
 		addPropertyIfDefined(data, 'category', newUser)
 		addPropertyIfDefined(data, 'bio', newUser)
 		addPropertyIfDefined(data, 'urls', newUser, true)
 
+		newUser.urls = newUser.urls.filter((i:string) => i)
+
 		const avatar = data.get('avatar') as File
 
 		const banner = data.get('banner') as File