Finalizing gifting page

michaeljolley · Dec 1, 2024 · 7013464 · 7013464
1 parent e561cb2
commit 7013464
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 49 deletions.
diff --git a/src/components/giving/Giving.astro b/src/components/giving/Giving.astro
@@ -1,10 +1,11 @@
 ---
+export const prerender = false;
 import GivingForm from './GivingForm.astro';
 import NotSubbed from './NotSubbed.astro';
 import Registered from './Registered.astro';
 import SignIn from './SignIn.astro';
 import { getSub } from '@lib/supabase';
-import { isSub } from '@scripts/twitch';
+import { subCheck } from '@scripts/twitch';
 
 export interface Props {
   user: {
@@ -15,7 +16,7 @@ export interface Props {
 	};
 }
 const { user } = Astro.props;
-const isSubscriber = user ? await isSub(user.user_id) : null;
+const check = user ? await subCheck(user.user_id) : null;
 const registered = user ? await getSub(user.id) : null;
 
 ---
@@ -26,10 +27,11 @@ const registered = user ? await getSub(user.id) : null;
 			{!user &&
 				<SignIn />
 			}
-			{user && !isSubscriber &&
+			{user && !check?.isSub &&
 				<NotSubbed user={user} />
+				<!-- ({check.status} {check.message}) -->
 			}
-			{user && isSubscriber && !registered &&
+			{user && check?.isSub && !registered &&
 				<GivingForm user={user} />
 			}
 			{user && registered &&

diff --git a/src/components/giving/GivingForm.astro b/src/components/giving/GivingForm.astro
@@ -1,5 +1,4 @@
 ---
-
 export interface Props {
   user: {
 		id: string;

diff --git a/src/components/giving/NotSubbed.astro b/src/components/giving/NotSubbed.astro
@@ -1,5 +1,4 @@
 ---
-
 export interface Props {
   user: {
 		id: string;

diff --git a/src/components/giving/SignIn.astro b/src/components/giving/SignIn.astro
@@ -1,14 +1,5 @@
 ---
 import Icon from "@components/Icon.astro"
-export interface Props {
-  user: {
-		id: string;
-		nickname: string;
-		profileImg: string;
-	};
-}
-const { user } = Astro.props;
-
 ---
 
 	<h3>Get in on the fun!</h3>

diff --git a/src/pages/notyou.astro b/src/pages/notyou.astro
@@ -9,9 +9,6 @@ const permalink = `https://${import.meta.env.HOST}/`;
 
 const user = await authData(Astro.cookies);
 
-if (user && user.nickname.toLowerCase() === "cmjchrisjones") {
-	Astro.redi
-}
 ---
 
 <html>

diff --git a/src/pages/register.astro b/src/pages/register.astro
diff --git a/src/pages/signin.astro b/src/pages/signin.astro
diff --git a/src/scripts/twitch.ts b/src/scripts/twitch.ts
@@ -86,20 +86,28 @@ export async function isOnline(): Promise<string> {
 	return thumbnail;
 }
 
-export async function isSub(userId: string): Promise<boolean> {
+export async function subCheck(userId: string): Promise<{isSub: boolean, err: any}> {
 	const headers = await getATHeaders();
 	const response = await fetch(
 		`https://api.twitch.tv/helix/subscriptions?broadcaster_id=${import.meta.env.TWITCH_CHANNEL_ID}&user_id=${userId}`,
 		{
 			headers,
 		},
 	);
+
+
 	const body = await response.text();
 	const { data: subscribers } = JSON.parse(body);
 
 	if (subscribers && subscribers.length > 0) {
-		return true;
+		return {
+			isSub: true,
+			err: null
+		};
 	}
 
-	return false;
+	return {
+		isSub: false,
+		err: {status: response.status, message: response.statusText}
+	};
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,9 +9,6 @@ const permalink = `https://${import.meta.env.HOST}/`; @@
     const user = await authData(Astro.cookies);
-    if (user && user.nickname.toLowerCase() === "cmjchrisjones") {
-    	Astro.redi
-    }
     ---
     <html>
@@ Expand Down @@