fix: update presence

tutors-sdk · Aug 9, 2023 · add243a · add243a
1 parent bc7155e
commit add243a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 16 deletions.
diff --git a/apps/web/src/lib/services/presence.ts b/apps/web/src/lib/services/presence.ts
@@ -14,6 +14,20 @@ export function setupPresence(supabase: SupabaseClient, courseid: string) {
 	});
 }
 
+export function updatePresence(presence: Presence) {
+	presenceChannel.track({
+		online_at: new Date().toISOString(),
+		studentName: presence.studentName,
+		studentEmail: presence.studentEmail,
+		studentImg: presence.studentImg,
+		courseTitle: presence.courseTitle,
+		loTitle: presence.loTitle,
+		loImage: presence.loImage,
+		loRoute: presence.loRoute,
+		loIcon: presence.loIcon
+	});
+}
+
 export function subscribePresence(presence: Presence, courseid: string) {
 	try {
 		presenceChannel.subscribe(async (status) => {
@@ -23,6 +37,7 @@ export function subscribePresence(presence: Presence, courseid: string) {
 					studentName: presence.studentName,
 					studentEmail: presence.studentEmail,
 					studentImg: presence.studentImg,
+					courseTitle: presence.courseTitle,
 					loTitle: presence.loTitle,
 					loImage: presence.loImage,
 					loRoute: presence.loRoute,

diff --git a/apps/web/src/lib/types/presence.ts b/apps/web/src/lib/types/presence.ts
@@ -4,6 +4,7 @@ export interface Presence {
 	studentName: string;
 	studentEmail: string;
 	studentImg: string;
+	courseTitle: string;
 	loTitle: string;
 	loImage: string;
 	loRoute: string;

diff --git a/apps/web/src/routes/(course-reader)/+layout.svelte b/apps/web/src/routes/(course-reader)/+layout.svelte
@@ -17,7 +17,12 @@
 	import { analyticsService } from '$lib/services/analytics';
 	import { initServices } from '$lib/tutors-startup';
 	import type { RealtimeChannel } from '@supabase/supabase-js';
-	import { setupPresence, subscribePresence, unsubscribePresence } from '$lib/services/presence';
+	import {
+		setupPresence,
+		subscribePresence,
+		unsubscribePresence,
+		updatePresence
+	} from '$lib/services/presence';
 
 	let currentRoute = '';
 
@@ -34,20 +39,24 @@
 		}
 	}
 
-	let currentStatus: boolean;
-	onlineStatus.subscribe((value) => {
-		currentStatus = value;
-	});
+	let presenceSetup: boolean = false;
 
-	$: currentLo;
+	onMount(() => {
+		!presenceSetup && setupPresence(supabase, $page.params.courseid);
+		presenceSetup = true;
+		setInitialClassState();
+		initServices(data.session);
+		setInterval(updatePageCount, 30 * 1000);
 
-	$: {
-		if (currentStatus) {
+		if ($onlineStatus) {
 			subscribePresence(
 				{
 					studentName: session.user.user_metadata.full_name,
 					studentEmail: session.user.user_metadata.email,
 					studentImg: session.user.user_metadata.avatar_url,
+					courseTitle: get(currentLo).parentLo
+						? get(currentLo).parentLo.title
+						: get(currentLo).title,
 					loTitle: get(currentLo).title,
 					loImage: get(currentLo).img,
 					loRoute: get(currentLo).route,
@@ -56,19 +65,27 @@
 				$page.params.courseid
 			);
 			console.log('subscribed');
-		} else if (!currentStatus) {
+			console.log(get(studentsOnlineList));
+		} else if (!$onlineStatus) {
 			unsubscribePresence();
 			console.log('unsubscribed');
 		}
-	}
-
-	onMount(() => {
-		setupPresence(supabase, $page.params.courseid);
-		setInitialClassState();
-		initServices(data.session);
-		setInterval(updatePageCount, 30 * 1000);
 	});
 
+	$: $currentLo &&
+		$onlineStatus &&
+		presenceSetup &&
+		updatePresence({
+			studentName: session.user.user_metadata.full_name,
+			studentEmail: session.user.user_metadata.email,
+			studentImg: session.user.user_metadata.avatar_url,
+			courseTitle: get(currentLo).parentLo ? get(currentLo).parentLo.title : get(currentLo).title,
+			loTitle: get(currentLo).title,
+			loImage: get(currentLo).img,
+			loRoute: get(currentLo).route,
+			loIcon: get(currentLo).icon
+		});
+
 	page.subscribe((path) => {
 		if (path.route.id) {
 			currentRoute = path.route.id;

diff --git a/apps/web/src/routes/(course-reader)/topic/[courseid]/[...loid]/+page.ts b/apps/web/src/routes/(course-reader)/topic/[courseid]/[...loid]/+page.ts
@@ -28,6 +28,7 @@ export const load: PageLoad = async ({ params }) => {
 	}
 
 	return {
+		course: topic.course,
 		topic: topic,
 		lo: topic.lo,
 		unitId: unitId