fix: read notes

- stripe onboarding should be finished, still need some testing but should be finished
- certain dynamic images have a simplified setup now

Author: Torwent

src/lib/client/supabase.ts

@@ -93,7 +93,7 @@ export async function getScripter(supabase: SupabaseClient, slug: string) {
 		.schema("profiles")
 		.from("scripters")
 		.select(
-			`id, stripe, realname, description, content, url, github, paypal, content, profiles (username, avatar)`
+			`id, stripe, realname, description, content, url, github, paypal, content, profiles (username, discord, avatar)`
 		)
 		.eq(UUID_V4_REGEX.test(slug) ? "id" : "url", slug)
 		.single<Scripter>()

src/lib/components/NewScriptCard.svelte

@@ -3,28 +3,16 @@
 	import type { ScriptMetaData, ScriptPublic } from "$lib/types/collection"
 	import { cropString, encodeSEO, scriptCategories, scriptStatus, scriptTypes } from "$lib/utils"
 	import { Tooltip } from "@skeletonlabs/skeleton-svelte"
-	import { onMount } from "svelte"
 
 	let {
 		script,
 		metadata,
 		customCover = $bindable(undefined)
 	}: { script: ScriptPublic; metadata: ScriptMetaData; customCover: string | undefined } = $props()
 
-	let imgLink = $state(customCover ?? "/cover.jpg")
+	let imgLink = $derived(customCover ?? "/cover.jpg")
 	const username = page.data.profile?.username ?? "USERNAME"
 
-	$effect(() => {
-		imgLink = customCover ?? "/cover.jpg"
-	})
-
-	onMount(async () => {
-		if (imgLink !== "") {
-			const response = await fetch(imgLink)
-			if (response.status != 200) imgLink = "/cover.jpg"
-		} else imgLink = "/cover.jpg"
-	})
-
 	const categoriesTooltip: boolean[] = $state(new Array(metadata.categories.length).fill(false))
 	let status = $state(false)
 	let type = $state(false)

src/lib/components/ScriptCard.svelte

@@ -4,31 +4,13 @@
 	import type { Script } from "$lib/types/collection"
 	import { cropString, encodeSEO, scriptCategories, scriptStatus, scriptTypes } from "$lib/utils"
 	import { Tooltip } from "@skeletonlabs/skeleton-svelte"
-	import { onMount } from "svelte"
 
 	let { script, customCover, link }: { script: Script; customCover?: string; link?: string } = $props()
 
-	let imgLink = $state(
+	let imgLink = $derived(
 		customCover ?? PUBLIC_SUPABASE_URL + "/storage/v1/object/public/imgs/scripts/" + script.id + "/cover.jpg"
 	)
 
-	$effect(() => {
-		imgLink =
-			customCover ??
-			PUBLIC_SUPABASE_URL + "/storage/v1/object/public/imgs/scripts/" + script.id + "/cover.jpg"
-	})
-
-	$effect(() => {
-		imgLink = PUBLIC_SUPABASE_URL + "/storage/v1/object/public/imgs/scripts/" + script.id + "/cover.jpg"
-	})
-
-	onMount(async () => {
-		if (imgLink !== "") {
-			const response = await fetch(imgLink)
-			if (response.status != 200) imgLink = "/cover.jpg"
-		} else imgLink = "/cover.jpg"
-	})
-
 	const categoriesTooltip: boolean[] = $state(new Array(script?.metadata.categories.length).fill(false))
 	let status = $state(false)
 	let type = $state(false)

src/lib/server/stripe.server.ts

@@ -1,6 +1,6 @@
 import { STRIPE_KEY } from "$env/static/private"
 import type { BundleSchema, NewScriptSchema, PriceSchema } from "$lib/client/schemas"
-import type { Bundle, Price, Scripter } from "$lib/types/collection"
+import type { Interval, Price, Scripter } from "$lib/types/collection"
 import type { Database } from "$lib/types/supabase"
 import type { SupabaseClient } from "@supabase/supabase-js"
 import Stripe from "stripe"
@@ -74,52 +74,44 @@ export async function createCheckoutSession(
 	return session.url
 }
 
-export async function getStripeConnectAccount(id: string | null | undefined) {
-	if (!id) return null
+export async function getStripeConnectAccount(scripter: Scripter) {
+	if (scripter.id == scripter.stripe) return null
 	let stripeAccount: Stripe.Account | null = null
 
 	try {
-		stripeAccount = await stripe.accounts.retrieve(id)
+		stripeAccount = await stripe.accounts.retrieve(scripter.stripe)
 	} catch (error) {
 		console.error("An error occurred when calling the Stripe API to create an account session", error)
 	}
 
 	return stripeAccount
 }
 
-export async function getStripeConnectAccountBalance(id: string | null | undefined) {
-	if (!id) return null
+export async function getStripeConnectAccountBalance(scripter: Scripter) {
+	if (scripter.id == scripter.stripe) return null
 	let stripeBalance: Stripe.Balance | null = null
 	try {
-		stripeBalance = await stripe.balance.retrieve({
-			stripeAccount: id
-		})
+		stripeBalance = await stripe.balance.retrieve({ stripeAccount: scripter.stripe })
 	} catch (error) {
 		console.error("An error occurred when calling the Stripe API to create an account session", error)
 	}
 
 	return stripeBalance
 }
 
-export async function getStripeSession(account: string | null | undefined) {
-	if (!account) return null
-	let accountSession: Stripe.Response<Stripe.AccountSession> | null = null
+export async function getStripeSession(scripter: Scripter) {
+	if (scripter.id == scripter.stripe) return null
+	let session: Stripe.Response<Stripe.AccountSession> | null = null
 
 	try {
-		accountSession = await stripe.accountSessions.create({
-			account: account,
+		session = await stripe.accountSessions.create({
+			account: scripter.stripe,
 			components: {
 				payments: {
 					enabled: true,
-					features: {
-						refund_management: true,
-						dispute_management: true,
-						capture_payments: true
-					}
-				},
-				payouts: {
-					enabled: true
+					features: { refund_management: true, dispute_management: true, capture_payments: true }
 				},
+				payouts: { enabled: true },
 				payment_details: {
 					enabled: true,
 					features: { refund_management: true, capture_payments: true, dispute_management: true }
@@ -130,7 +122,7 @@ export async function getStripeSession(account: string | null | undefined) {
 		console.error("An error occurred when calling the Stripe API to create an account session", error)
 	}
 
-	return accountSession?.client_secret ?? null
+	return session?.client_secret ?? null
 }
 
 export async function createStripeCustomer(id: string, email: string, discord: string, username: string) {
@@ -157,39 +149,45 @@ export async function createStripeConnectAccount(
 	supabase: SupabaseClient,
 	baseURL: string,
 	scripter: Scripter,
-	email: string | undefined,
+	email: string,
 	country: string
 ) {
 	let account: Stripe.Response<Stripe.Account>
 	let accountLink: Stripe.Response<Stripe.AccountLink>
 
-	try {
-		account = await stripe.accounts.create({
-			type: "custom",
-			country: country,
-			email: email,
-			business_type: "individual",
-			individual: { full_name_aliases: [scripter.id, scripter.profiles.username] },
-			capabilities: {
-				card_payments: { requested: true },
-				link_payments: { requested: true },
-				transfers: { requested: true }
-			},
-			business_profile: {
-				mcc: "5734",
-				name: scripter.profiles.username,
-				support_url: "https://waspscripts.dev/scripters/" + scripter.url,
-				url: "https://waspscripts.dev/scripters/" + scripter.url,
-				support_email: "[email protected]"
-			},
-			metadata: { id: scripter.id, username: scripter.profiles.username },
-			settings: {
-				payouts: {
-					schedule: { interval: "monthly", delay_days: 15, monthly_anchor: 31 },
-					statement_descriptor: "waspscripts.dev"
-				}
+	const profile = scripter.profiles
+	const requested = { requested: true }
+	const params: Stripe.AccountCreateParams = {
+		controller: {
+			fees: { payer: "application" },
+			losses: { payments: "application" },
+			stripe_dashboard: { type: "express" },
+			requirement_collection: "stripe"
+		},
+		email: email,
+		country: country,
+		business_type: "individual",
+		business_profile: {
+			mcc: "5734",
+			name: profile.username,
+			url: "https://waspscripts.dev/",
+			support_url: "https://waspscripts.dev/",
+			support_email: "[email protected]"
+		},
+		individual: { full_name_aliases: [profile.username, scripter.id, profile.discord] },
+		capabilities: { card_payments: requested, link_payments: requested, transfers: requested },
+		settings: {
+			payouts: {
+				schedule: { interval: "monthly", delay_days: 15, monthly_anchor: 31 },
+				statement_descriptor: "waspscripts.dev",
+				debit_negative_balances: false
 			}
-		})
+		},
+		metadata: { id: scripter.id, discord: profile.discord, email: email }
+	}
+
+	try {
+		account = await stripe.accounts.create(params)
 	} catch (err) {
 		console.error(err)
 		return
@@ -262,8 +260,6 @@ export async function updateStripeProduct(id: string, name: string) {
 	}
 }
 
-type Interval = "week" | "month" | "year"
-
 async function createStripePriceEx(product: string, amount: number, interval: Interval) {
 	if (amount === 0) return
 	await stripe.prices

src/lib/server/supabase.server.ts

@@ -30,11 +30,6 @@ export async function doLogin(supabase: SupabaseClient, origin: string, searchPa
 	redirect(303, data.url)
 }
 
-export async function updateScriptFile(file: File) {
-	let fileString = await file.text()
-	return new File([fileString], file.name, { type: "text/plain" })
-}
-
 export async function uploadFile(supabase: SupabaseClient, bucket: string, path: string, file: File) {
 	const contentType = path.endsWith(".jpg") || path.endsWith(".jpeg") ? "image/jpeg" : undefined
 

src/lib/types/collection.ts

@@ -22,6 +22,7 @@ export interface ScripterBase {
 	url: string
 	profiles: {
 		username: string
+		discord: string
 		avatar: string
 	}
 }
@@ -32,11 +33,11 @@ export interface SimpleScripter {
 }
 
 export interface Scripter extends ScripterBase {
-	id: string
-	stripe: string | undefined
-	github: string | undefined
-	paypal: string | undefined
-	content: string | undefined
+	id: Database["profiles"]["Tables"]["scripters"]["Row"]["id"]
+	stripe: Database["profiles"]["Tables"]["scripters"]["Row"]["stripe"]
+	github: Database["profiles"]["Tables"]["scripters"]["Row"]["github"]
+	paypal: Database["profiles"]["Tables"]["scripters"]["Row"]["paypal"]
+	content: Database["profiles"]["Tables"]["scripters"]["Row"]["content"]
 }
 
 export interface ScripterProfile {
@@ -143,32 +144,6 @@ export interface ScriptSimple {
 	metadata: { type: TScriptTypes }
 }
 
-export interface ScriptFeatured {
-	scripts: {
-		url: string
-		title: string
-		description: string
-		tooltip_emojis: string
-		protected: {
-			username: string
-			avatar: string
-		}
-	}
-}
-
-export interface CheckboxType {
-	id: number
-	name: string
-	emoji: string
-	main: boolean
-	checked: boolean
-}
-
-export interface Tooltip {
-	name: string
-	emoji: string
-}
-
 export interface ProductData {
 	id: string
 	user_id: string
@@ -238,11 +213,4 @@ export interface ScriptProduct {
 	active: boolean
 }
 
-export interface Category {
-	name: string
-	emoji: string
-}
-
-export interface SubCategory extends Category {
-	category: string
-}
+export type Interval = "week" | "month" | "year"