diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Database/userBadges.ts | 34 | ||||
| -rw-r--r-- | src/lib/FallbackBadge.svelte | 8 | ||||
| -rw-r--r-- | src/lib/FallbackImage.svelte | 8 | ||||
| -rw-r--r-- | src/routes/api/badges/+server.ts | 10 |
4 files changed, 29 insertions, 31 deletions
diff --git a/src/lib/Database/userBadges.ts b/src/lib/Database/userBadges.ts index 36bf7955..5d90404d 100644 --- a/src/lib/Database/userBadges.ts +++ b/src/lib/Database/userBadges.ts @@ -4,13 +4,13 @@ import supabase from './supabase'; export interface Badge { post?: string; image?: string; - description?: string; + description?: string | null; id?: number; time?: string; - category?: string; - hidden?: boolean; - source: string; - designer: string; + category?: string | null; + hidden?: boolean | false; + source?: string | null; + designer?: string | null; } export const getUserBadges = async (userId: number): Promise<Badge[]> => { @@ -32,19 +32,17 @@ export const addUserBadge = async (userId: number, badge: Badge) => { if (post === undefined || image === undefined) return; if (time) { - await supabase - .from('user_badges') - .insert({ - user_id: userId, - post, - image, - description, - time, - category, - hidden, - source, - designer - }); + await supabase.from('user_badges').insert({ + user_id: userId, + post, + image, + description, + time, + category, + hidden, + source, + designer + }); } else { await supabase .from('user_badges') diff --git a/src/lib/FallbackBadge.svelte b/src/lib/FallbackBadge.svelte index 3f87b9f2..3a5e39e3 100644 --- a/src/lib/FallbackBadge.svelte +++ b/src/lib/FallbackBadge.svelte @@ -4,9 +4,9 @@ import tooltip from './Tooltip/tooltip'; import { databaseTimeToDate } from './Utility/time'; - export let source: string | undefined; - export let alternative: string | undefined; - export let fallback: string | undefined; + export let source: string | null | undefined; + export let alternative: string | null | undefined; + export let fallback: string | null | undefined; export let maxReplaceCount = 1; export let replaceDelay = 1000; export let error = 'https://i2.kym-cdn.com/photos/images/newsfeed/000/290/992/0aa.jpg'; @@ -19,7 +19,7 @@ let mouseX = 0; let mouseY = 0; - const delayedReplace = (event: Event, image: string | undefined) => { + const delayedReplace = (event: Event, image: string | undefined | null) => { if (replaceCount >= maxReplaceCount) return; setTimeout(() => { diff --git a/src/lib/FallbackImage.svelte b/src/lib/FallbackImage.svelte index 52f0324d..3f5e8758 100644 --- a/src/lib/FallbackImage.svelte +++ b/src/lib/FallbackImage.svelte @@ -1,7 +1,7 @@ <script lang="ts"> - export let source: string | undefined; - export let alternative: string | undefined; - export let fallback: string | undefined; + export let source: string | undefined | null; + export let alternative: string | undefined | null; + export let fallback: string | undefined | null; export let maxReplaceCount = 1; export let replaceDelay = 1000; export let error = 'https://i2.kym-cdn.com/photos/images/newsfeed/000/290/992/0aa.jpg'; @@ -10,7 +10,7 @@ let replaceCount = 0; - const delayedReplace = (event: Event, image: string | undefined) => { + const delayedReplace = (event: Event, image: string | undefined | null) => { if (replaceCount >= maxReplaceCount) return; setTimeout(() => { diff --git a/src/routes/api/badges/+server.ts b/src/routes/api/badges/+server.ts index 31d7dc26..a941f145 100644 --- a/src/routes/api/badges/+server.ts +++ b/src/routes/api/badges/+server.ts @@ -102,12 +102,12 @@ export const PUT = async ({ cookies, url, request }) => { const badge = { post: url.searchParams.get('post') || undefined, image: url.searchParams.get('image') || undefined, - description: url.searchParams.get('description') || undefined, + description: url.searchParams.get('description') || null, time: url.searchParams.get('time') || undefined, - category: url.searchParams.get('category') || undefined, - hidden: url.searchParams.get('hidden') || undefined, - source: url.searchParams.get('source') || undefined, - designer: url.searchParams.get('designer') || undefined + category: url.searchParams.get('category') || null, + hidden: url.searchParams.get('hidden') || false, + source: url.searchParams.get('source') || null, + designer: url.searchParams.get('designer') || null }; if ( |