From 17ed84c223620c23064bdcf8dabc9edd02760be8 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 25 Jul 2024 00:24:50 -0700 Subject: refactor(Database): move Supabase user modules to User module --- src/lib/Database/Supabase/User/badges.ts | 106 ++++++++++++++++ src/lib/Database/Supabase/User/configuration.ts | 50 ++++++++ src/lib/Database/Supabase/User/notifications.ts | 32 +++++ src/lib/Database/Supabase/User/preferences.ts | 156 ++++++++++++++++++++++++ src/lib/Database/Supabase/userBadges.ts | 106 ---------------- src/lib/Database/Supabase/userConfiguration.ts | 50 -------- src/lib/Database/Supabase/userNotifications.ts | 32 ----- src/lib/Database/Supabase/userPreferences.ts | 156 ------------------------ 8 files changed, 344 insertions(+), 344 deletions(-) create mode 100644 src/lib/Database/Supabase/User/badges.ts create mode 100644 src/lib/Database/Supabase/User/configuration.ts create mode 100644 src/lib/Database/Supabase/User/notifications.ts create mode 100644 src/lib/Database/Supabase/User/preferences.ts delete mode 100644 src/lib/Database/Supabase/userBadges.ts delete mode 100644 src/lib/Database/Supabase/userConfiguration.ts delete mode 100644 src/lib/Database/Supabase/userNotifications.ts delete mode 100644 src/lib/Database/Supabase/userPreferences.ts (limited to 'src/lib/Database/Supabase') diff --git a/src/lib/Database/Supabase/User/badges.ts b/src/lib/Database/Supabase/User/badges.ts new file mode 100644 index 00000000..25fae9b7 --- /dev/null +++ b/src/lib/Database/Supabase/User/badges.ts @@ -0,0 +1,106 @@ +import { databaseTimeToDate } from '$lib/Utility/time'; +import supabase from '../../supabase'; + +export interface Badge { + post?: string; + image?: string; + description?: string | null; + id?: number; + time?: string; + category?: string | null; + hidden?: boolean; + source?: string | null; + designer?: string | null; + shadow_hidden?: boolean; + click_count?: number; +} + +export const getUserBadges = async (userId: number): Promise => { + const { data, error } = await supabase.from('user_badges').select('*').eq('user_id', userId); + + if (error) return []; + + return data.sort((a, b) => + databaseTimeToDate((a as Badge).time ?? '').getTime() > + databaseTimeToDate((b as Badge).time ?? '').getTime() + ? -1 + : 1 + ) as Badge[]; +}; + +export const addUserBadge = async (userId: number, badge: Badge) => { + const { post, image, description, time, category, hidden, source, designer } = 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 + }); + } else { + await supabase + .from('user_badges') + .insert({ user_id: userId, post, image, description, category, hidden, source, designer }); + } +}; + +export const removeUserBadge = async (userId: number, id: number) => { + if (!isNaN(id)) await supabase.from('user_badges').delete().eq('id', id).eq('user_id', userId); +}; + +export const updateUserBadge = async (userId: number, id: number, badge: Badge) => { + if (badge.post === undefined || badge.image === undefined) return; + + await supabase + .from('user_badges') + .update({ + post: badge.post, + image: badge.image, + description: badge.description, + category: badge.category, + time: badge.time, + hidden: badge.hidden, + source: badge.source, + designer: badge.designer + }) + .eq('id', id) + .eq('user_id', userId); +}; + +export const renameCategory = async (userId: number, oldName: string, newName: string) => + await supabase + .from('user_badges') + .update({ category: newName }) + .eq('category', oldName) + .eq('user_id', userId); + +export const removeAllUserBadges = async (userId: number) => + await supabase.from('user_badges').delete().eq('user_id', userId); + +export const migrateCategory = async (userId: number, oldName: string, newName: string) => + await supabase + .from('user_badges') + .update({ category: newName }) + .eq('category', oldName) + .eq('user_id', userId); + +export const setShadowHidden = async (userId: number, shadowHide: boolean) => + await supabase.from('user_badges').update({ shadow_hidden: shadowHide }).eq('user_id', userId); + +export const setShadowHiddenBadge = async (userId: number, id: number, shadowHide: boolean) => + await supabase + .from('user_badges') + .update({ shadow_hidden: shadowHide }) + .eq('id', id) + .eq('user_id', userId); + +export const incrementClickCount = async (id: number) => + await supabase.rpc('user_badges_increment_click_count', { user_badge_id: id }); diff --git a/src/lib/Database/Supabase/User/configuration.ts b/src/lib/Database/Supabase/User/configuration.ts new file mode 100644 index 00000000..36da1963 --- /dev/null +++ b/src/lib/Database/Supabase/User/configuration.ts @@ -0,0 +1,50 @@ +import supabase from '../../supabase'; + +interface UserConfiguration { + user_id: number; + configuration: object; + created_at: string; + updated_at: string; +} + +interface NewUserConfiguration { + configuration: object; + updated_at?: string; +} + +export const getUserConfiguration = async (userId: number) => { + const { data, error } = await supabase + .from('user_configuration') + .select('*') + .eq('user_id', userId); + + if (error || data.length === 0 || data[0].user_id !== userId) return null; + + return data[0] as UserConfiguration; +}; + +export const setUserConfiguration = async (userId: number, configuration: NewUserConfiguration) => { + const { data, error } = await supabase + .from('user_configuration') + .upsert( + { + user_id: userId, + configuration: configuration.configuration, + updated_at: configuration.updated_at || new Date().toISOString() + }, + { onConflict: 'user_id' } + ) + .select(); + + if (error || !data || (data as []).length === 0) return null; + + return data[0].configuration as UserConfiguration; +}; + +export const deleteUserConfiguration = async (userId: number) => { + const { data, error } = await supabase.from('user_configuration').delete().eq('user_id', userId); + + if (error || !data) return null; + + return data; +}; diff --git a/src/lib/Database/Supabase/User/notifications.ts b/src/lib/Database/Supabase/User/notifications.ts new file mode 100644 index 00000000..d8cd75ee --- /dev/null +++ b/src/lib/Database/Supabase/User/notifications.ts @@ -0,0 +1,32 @@ +import supabase from '../../supabase'; + +export interface UserNotifications { + created_at: string; + updated_at: string; + user_id: number; + subscription: JSON; +} + +export const getUserSubscription = async (userId: number) => + await supabase.from('user_notifications').select('*').eq('user_id', userId); + +export const getUserSubscriptions = async () => { + const { data, error } = await supabase.from('user_notifications').select('*'); + + if (error) return []; + + return data as UserNotifications[]; +}; + +export const deleteUserSubscription = async (userId: number) => + await supabase.from('user_notifications').delete().eq('user_id', userId); + +export const setUserSubscription = async (userId: number, subscription: JSON) => + await supabase.from('user_notifications').upsert( + { + user_id: userId, + updated_at: new Date().toISOString(), + subscription: subscription + }, + { onConflict: 'user_id' } + ); diff --git a/src/lib/Database/Supabase/User/preferences.ts b/src/lib/Database/Supabase/User/preferences.ts new file mode 100644 index 00000000..0eaebef7 --- /dev/null +++ b/src/lib/Database/Supabase/User/preferences.ts @@ -0,0 +1,156 @@ +import supabase from '../../supabase'; + +export interface UserPreferences { + created_at: string; + updated_at: string; + user_id: number; + pinned_hololive_streams: string[]; + hide_missing_badges: boolean; + biography: string | null; + badge_wall_css: string; + hide_awc_badges: boolean; + pinned_badge_wall_categories: string[]; +} + +interface NewUserPreferences { + updated_at?: string; + pinned_hololive_streams?: string[]; + hide_missing_badges?: boolean; + badge_wall_css?: string; + biography?: string; + hide_awc_badges?: boolean; + pinned_badge_wall_categories?: string[]; +} + +export const getUserPreferences = async (userId: number) => { + const { data, error } = await supabase.from('user_preferences').select('*').eq('user_id', userId); + + if (error || data.length === 0 || data[0].user_id !== userId) return null; + + return data[0] as UserPreferences; +}; + +export const setUserPreferences = async (userId: number, preferences: NewUserPreferences) => { + const userPreferences = await getUserPreferences(userId); + const { data, error } = await supabase + .from('user_preferences') + .upsert( + { + user_id: userId, + updated_at: preferences.updated_at || new Date().toISOString(), + pinned_hololive_streams: + preferences.pinned_hololive_streams || + (userPreferences ? userPreferences.pinned_hololive_streams : []), + hide_missing_badges: preferences.hide_missing_badges || false, + biography: preferences.biography || (userPreferences ? userPreferences.biography : null), + badge_wall_css: + preferences.badge_wall_css || (userPreferences ? userPreferences.badge_wall_css : ''), + hide_awc_badges: preferences.hide_awc_badges || false, + pinned_badge_wall_categories: + preferences.pinned_badge_wall_categories || + (userPreferences ? userPreferences.pinned_badge_wall_categories : '') + }, + { onConflict: 'user_id' } + ) + .select(); + + if (error || !data || (data as []).length === 0) return null; + + return data[0] as UserPreferences; +}; + +export const toggleHololiveStreamPinning = async (userId: number, streamId: string) => { + const userPreferences = await getUserPreferences(userId); + + if (!userPreferences) return null; + + const pinnedStreams = userPreferences.pinned_hololive_streams; + const index = pinnedStreams.indexOf(streamId); + + if (index === -1) pinnedStreams.push(streamId); + else pinnedStreams.splice(index, 1); + + return await setUserPreferences(userId, { + updated_at: new Date().toISOString(), + pinned_hololive_streams: pinnedStreams, + hide_missing_badges: userPreferences.hide_missing_badges + }); +}; + +export const toggleHideMissingBadges = async (userId: number) => { + const userPreferences = await getUserPreferences(userId); + + return await setUserPreferences(userId, { + updated_at: new Date().toISOString(), + pinned_hololive_streams: userPreferences ? userPreferences.pinned_hololive_streams : [], + hide_missing_badges: userPreferences ? !userPreferences.hide_missing_badges : false + }); +}; + +export const toggleHideAWCBadges = async (userId: number) => { + const userPreferences = await getUserPreferences(userId); + + return await setUserPreferences(userId, { + updated_at: new Date().toISOString(), + hide_awc_badges: userPreferences ? !userPreferences.hide_awc_badges : false + }); +}; + +export const setCSS = async (userId: number, css: string) => { + const userPreferences = await getUserPreferences(userId); + + return await setUserPreferences(userId, { + updated_at: new Date().toISOString(), + pinned_hololive_streams: userPreferences ? userPreferences.pinned_hololive_streams : [], + hide_missing_badges: userPreferences ? userPreferences.hide_missing_badges : false, + badge_wall_css: + css || + "/* Use classes and IDs such as .badges, #badges, .badge, or standard elements like body and details, or anything, as long as it's valid CSS! */" + }); +}; + +export const setBiography = async (userId: number, biography: string) => { + const userPreferences = await getUserPreferences(userId); + + return await setUserPreferences(userId, { + updated_at: new Date().toISOString(), + pinned_hololive_streams: userPreferences ? userPreferences.pinned_hololive_streams : [], + hide_missing_badges: userPreferences ? userPreferences.hide_missing_badges : false, + badge_wall_css: userPreferences ? userPreferences.badge_wall_css : '', + biography: biography || '\n' + }); +}; + +export const togglePinnedBadgeWallCategory = async (userId: number, category: string) => { + const userPreferences = await getUserPreferences(userId); + + if (!userPreferences) return null; + + const pinnedCategories = userPreferences.pinned_badge_wall_categories; + const index = pinnedCategories.indexOf(category); + + if (index === -1) pinnedCategories.push(category); + else pinnedCategories.splice(index, 1); + + return await setUserPreferences(userId, { + updated_at: new Date().toISOString(), + pinned_hololive_streams: userPreferences.pinned_hololive_streams, + hide_missing_badges: userPreferences.hide_missing_badges, + badge_wall_css: userPreferences.badge_wall_css, + pinned_badge_wall_categories: pinnedCategories + }); +}; + +export const setPinnedBadgeWallCategories = async (userId: number, categories: string[]) => { + const userPreferences = await getUserPreferences(userId); + + if (!userPreferences) return null; + + return await setUserPreferences(userId, { + updated_at: new Date().toISOString(), + pinned_hololive_streams: userPreferences.pinned_hololive_streams, + hide_missing_badges: userPreferences.hide_missing_badges, + badge_wall_css: userPreferences.badge_wall_css, + pinned_badge_wall_categories: categories + }); +}; diff --git a/src/lib/Database/Supabase/userBadges.ts b/src/lib/Database/Supabase/userBadges.ts deleted file mode 100644 index eef8490c..00000000 --- a/src/lib/Database/Supabase/userBadges.ts +++ /dev/null @@ -1,106 +0,0 @@ -import { databaseTimeToDate } from '$lib/Utility/time'; -import supabase from '../supabase'; - -export interface Badge { - post?: string; - image?: string; - description?: string | null; - id?: number; - time?: string; - category?: string | null; - hidden?: boolean; - source?: string | null; - designer?: string | null; - shadow_hidden?: boolean; - click_count?: number; -} - -export const getUserBadges = async (userId: number): Promise => { - const { data, error } = await supabase.from('user_badges').select('*').eq('user_id', userId); - - if (error) return []; - - return data.sort((a, b) => - databaseTimeToDate((a as Badge).time ?? '').getTime() > - databaseTimeToDate((b as Badge).time ?? '').getTime() - ? -1 - : 1 - ) as Badge[]; -}; - -export const addUserBadge = async (userId: number, badge: Badge) => { - const { post, image, description, time, category, hidden, source, designer } = 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 - }); - } else { - await supabase - .from('user_badges') - .insert({ user_id: userId, post, image, description, category, hidden, source, designer }); - } -}; - -export const removeUserBadge = async (userId: number, id: number) => { - if (!isNaN(id)) await supabase.from('user_badges').delete().eq('id', id).eq('user_id', userId); -}; - -export const updateUserBadge = async (userId: number, id: number, badge: Badge) => { - if (badge.post === undefined || badge.image === undefined) return; - - await supabase - .from('user_badges') - .update({ - post: badge.post, - image: badge.image, - description: badge.description, - category: badge.category, - time: badge.time, - hidden: badge.hidden, - source: badge.source, - designer: badge.designer - }) - .eq('id', id) - .eq('user_id', userId); -}; - -export const renameCategory = async (userId: number, oldName: string, newName: string) => - await supabase - .from('user_badges') - .update({ category: newName }) - .eq('category', oldName) - .eq('user_id', userId); - -export const removeAllUserBadges = async (userId: number) => - await supabase.from('user_badges').delete().eq('user_id', userId); - -export const migrateCategory = async (userId: number, oldName: string, newName: string) => - await supabase - .from('user_badges') - .update({ category: newName }) - .eq('category', oldName) - .eq('user_id', userId); - -export const setShadowHidden = async (userId: number, shadowHide: boolean) => - await supabase.from('user_badges').update({ shadow_hidden: shadowHide }).eq('user_id', userId); - -export const setShadowHiddenBadge = async (userId: number, id: number, shadowHide: boolean) => - await supabase - .from('user_badges') - .update({ shadow_hidden: shadowHide }) - .eq('id', id) - .eq('user_id', userId); - -export const incrementClickCount = async (id: number) => - await supabase.rpc('user_badges_increment_click_count', { user_badge_id: id }); diff --git a/src/lib/Database/Supabase/userConfiguration.ts b/src/lib/Database/Supabase/userConfiguration.ts deleted file mode 100644 index cb2e4060..00000000 --- a/src/lib/Database/Supabase/userConfiguration.ts +++ /dev/null @@ -1,50 +0,0 @@ -import supabase from '../supabase'; - -interface UserConfiguration { - user_id: number; - configuration: object; - created_at: string; - updated_at: string; -} - -interface NewUserConfiguration { - configuration: object; - updated_at?: string; -} - -export const getUserConfiguration = async (userId: number) => { - const { data, error } = await supabase - .from('user_configuration') - .select('*') - .eq('user_id', userId); - - if (error || data.length === 0 || data[0].user_id !== userId) return null; - - return data[0] as UserConfiguration; -}; - -export const setUserConfiguration = async (userId: number, configuration: NewUserConfiguration) => { - const { data, error } = await supabase - .from('user_configuration') - .upsert( - { - user_id: userId, - configuration: configuration.configuration, - updated_at: configuration.updated_at || new Date().toISOString() - }, - { onConflict: 'user_id' } - ) - .select(); - - if (error || !data || (data as []).length === 0) return null; - - return data[0].configuration as UserConfiguration; -}; - -export const deleteUserConfiguration = async (userId: number) => { - const { data, error } = await supabase.from('user_configuration').delete().eq('user_id', userId); - - if (error || !data) return null; - - return data; -}; diff --git a/src/lib/Database/Supabase/userNotifications.ts b/src/lib/Database/Supabase/userNotifications.ts deleted file mode 100644 index 48cd73c9..00000000 --- a/src/lib/Database/Supabase/userNotifications.ts +++ /dev/null @@ -1,32 +0,0 @@ -import supabase from '../supabase'; - -export interface UserNotifications { - created_at: string; - updated_at: string; - user_id: number; - subscription: JSON; -} - -export const getUserSubscription = async (userId: number) => - await supabase.from('user_notifications').select('*').eq('user_id', userId); - -export const getUserSubscriptions = async () => { - const { data, error } = await supabase.from('user_notifications').select('*'); - - if (error) return []; - - return data as UserNotifications[]; -}; - -export const deleteUserSubscription = async (userId: number) => - await supabase.from('user_notifications').delete().eq('user_id', userId); - -export const setUserSubscription = async (userId: number, subscription: JSON) => - await supabase.from('user_notifications').upsert( - { - user_id: userId, - updated_at: new Date().toISOString(), - subscription: subscription - }, - { onConflict: 'user_id' } - ); diff --git a/src/lib/Database/Supabase/userPreferences.ts b/src/lib/Database/Supabase/userPreferences.ts deleted file mode 100644 index a717953f..00000000 --- a/src/lib/Database/Supabase/userPreferences.ts +++ /dev/null @@ -1,156 +0,0 @@ -import supabase from '../supabase'; - -export interface UserPreferences { - created_at: string; - updated_at: string; - user_id: number; - pinned_hololive_streams: string[]; - hide_missing_badges: boolean; - biography: string | null; - badge_wall_css: string; - hide_awc_badges: boolean; - pinned_badge_wall_categories: string[]; -} - -interface NewUserPreferences { - updated_at?: string; - pinned_hololive_streams?: string[]; - hide_missing_badges?: boolean; - badge_wall_css?: string; - biography?: string; - hide_awc_badges?: boolean; - pinned_badge_wall_categories?: string[]; -} - -export const getUserPreferences = async (userId: number) => { - const { data, error } = await supabase.from('user_preferences').select('*').eq('user_id', userId); - - if (error || data.length === 0 || data[0].user_id !== userId) return null; - - return data[0] as UserPreferences; -}; - -export const setUserPreferences = async (userId: number, preferences: NewUserPreferences) => { - const userPreferences = await getUserPreferences(userId); - const { data, error } = await supabase - .from('user_preferences') - .upsert( - { - user_id: userId, - updated_at: preferences.updated_at || new Date().toISOString(), - pinned_hololive_streams: - preferences.pinned_hololive_streams || - (userPreferences ? userPreferences.pinned_hololive_streams : []), - hide_missing_badges: preferences.hide_missing_badges || false, - biography: preferences.biography || (userPreferences ? userPreferences.biography : null), - badge_wall_css: - preferences.badge_wall_css || (userPreferences ? userPreferences.badge_wall_css : ''), - hide_awc_badges: preferences.hide_awc_badges || false, - pinned_badge_wall_categories: - preferences.pinned_badge_wall_categories || - (userPreferences ? userPreferences.pinned_badge_wall_categories : '') - }, - { onConflict: 'user_id' } - ) - .select(); - - if (error || !data || (data as []).length === 0) return null; - - return data[0] as UserPreferences; -}; - -export const toggleHololiveStreamPinning = async (userId: number, streamId: string) => { - const userPreferences = await getUserPreferences(userId); - - if (!userPreferences) return null; - - const pinnedStreams = userPreferences.pinned_hololive_streams; - const index = pinnedStreams.indexOf(streamId); - - if (index === -1) pinnedStreams.push(streamId); - else pinnedStreams.splice(index, 1); - - return await setUserPreferences(userId, { - updated_at: new Date().toISOString(), - pinned_hololive_streams: pinnedStreams, - hide_missing_badges: userPreferences.hide_missing_badges - }); -}; - -export const toggleHideMissingBadges = async (userId: number) => { - const userPreferences = await getUserPreferences(userId); - - return await setUserPreferences(userId, { - updated_at: new Date().toISOString(), - pinned_hololive_streams: userPreferences ? userPreferences.pinned_hololive_streams : [], - hide_missing_badges: userPreferences ? !userPreferences.hide_missing_badges : false - }); -}; - -export const toggleHideAWCBadges = async (userId: number) => { - const userPreferences = await getUserPreferences(userId); - - return await setUserPreferences(userId, { - updated_at: new Date().toISOString(), - hide_awc_badges: userPreferences ? !userPreferences.hide_awc_badges : false - }); -}; - -export const setCSS = async (userId: number, css: string) => { - const userPreferences = await getUserPreferences(userId); - - return await setUserPreferences(userId, { - updated_at: new Date().toISOString(), - pinned_hololive_streams: userPreferences ? userPreferences.pinned_hololive_streams : [], - hide_missing_badges: userPreferences ? userPreferences.hide_missing_badges : false, - badge_wall_css: - css || - "/* Use classes and IDs such as .badges, #badges, .badge, or standard elements like body and details, or anything, as long as it's valid CSS! */" - }); -}; - -export const setBiography = async (userId: number, biography: string) => { - const userPreferences = await getUserPreferences(userId); - - return await setUserPreferences(userId, { - updated_at: new Date().toISOString(), - pinned_hololive_streams: userPreferences ? userPreferences.pinned_hololive_streams : [], - hide_missing_badges: userPreferences ? userPreferences.hide_missing_badges : false, - badge_wall_css: userPreferences ? userPreferences.badge_wall_css : '', - biography: biography || '\n' - }); -}; - -export const togglePinnedBadgeWallCategory = async (userId: number, category: string) => { - const userPreferences = await getUserPreferences(userId); - - if (!userPreferences) return null; - - const pinnedCategories = userPreferences.pinned_badge_wall_categories; - const index = pinnedCategories.indexOf(category); - - if (index === -1) pinnedCategories.push(category); - else pinnedCategories.splice(index, 1); - - return await setUserPreferences(userId, { - updated_at: new Date().toISOString(), - pinned_hololive_streams: userPreferences.pinned_hololive_streams, - hide_missing_badges: userPreferences.hide_missing_badges, - badge_wall_css: userPreferences.badge_wall_css, - pinned_badge_wall_categories: pinnedCategories - }); -}; - -export const setPinnedBadgeWallCategories = async (userId: number, categories: string[]) => { - const userPreferences = await getUserPreferences(userId); - - if (!userPreferences) return null; - - return await setUserPreferences(userId, { - updated_at: new Date().toISOString(), - pinned_hololive_streams: userPreferences.pinned_hololive_streams, - hide_missing_badges: userPreferences.hide_missing_badges, - badge_wall_css: userPreferences.badge_wall_css, - pinned_badge_wall_categories: categories - }); -}; -- cgit v1.2.3