refactor(Database): separate providers

38 files changed, 38 insertions, 41 deletions

diff --git a/src/lib/Data/AniList/activity.ts b/src/lib/Data/AniList/activity.ts
index fb15521e..b1f43b7d 100644
--- a/src/lib/Data/AniList/activity.ts
+++ b/src/lib/Data/AniList/activity.ts
@@ -1,4 +1,4 @@
-import { database } from '$lib/Database/activities';
+import { database } from '$lib/Database/IndexedDB/activities';
 import type { User } from './follow';
 import type { AniListAuthorisation, UserIdentity } from './identity';
 
diff --git a/src/lib/Database/activities.ts b/src/lib/Database/IndexedDB/activities.ts
index 6a505ff3..6a505ff3 100644
--- a/src/lib/Database/activities.ts
+++ b/src/lib/Database/IndexedDB/activities.ts
diff --git a/src/lib/Database/chapters.ts b/src/lib/Database/IndexedDB/chapters.ts
index 0f77f0a0..0f77f0a0 100644
--- a/src/lib/Database/chapters.ts
+++ b/src/lib/Database/IndexedDB/chapters.ts
diff --git a/src/lib/Database/user.ts b/src/lib/Database/IndexedDB/user.ts
index df68bc91..e7285a07 100644
--- a/src/lib/Database/user.ts
+++ b/src/lib/Database/IndexedDB/user.ts
@@ -1,4 +1,4 @@
-import { type AniListAuthorisation } from '$lib/Data/AniList/identity';
+import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 import Dexie, { type Table } from 'dexie';
 
 export interface User {
diff --git a/src/lib/Database/badges.ts b/src/lib/Database/Supabase/badges.ts
index 145d0bc1..022d4d14 100644
--- a/src/lib/Database/badges.ts
+++ b/src/lib/Database/Supabase/badges.ts
@@ -1,4 +1,4 @@
-import supabase from './supabase';
+import supabase from '../supabase';
 
 interface Badge {
 	id: number;
diff --git a/src/lib/Database/events.ts b/src/lib/Database/Supabase/events.ts
index 8f507a83..e87fe011 100644
--- a/src/lib/Database/events.ts
+++ b/src/lib/Database/Supabase/events.ts
@@ -1,5 +1,5 @@
 import type Group from '$lib/Events/Group.svelte';
-import supabase from './supabase';
+import supabase from '../supabase';
 
 export interface Event {
 	id: number;
diff --git a/src/lib/Database/groups.ts b/src/lib/Database/Supabase/groups.ts
index 097d6f89..b2770e4a 100644
--- a/src/lib/Database/groups.ts
+++ b/src/lib/Database/Supabase/groups.ts
@@ -1,4 +1,4 @@
-import supabase from './supabase';
+import supabase from '../supabase';
 
 export interface Group {
 	id: number;
diff --git a/src/lib/Database/userBadges.ts b/src/lib/Database/Supabase/userBadges.ts
index d21c3527..eef8490c 100644
--- a/src/lib/Database/userBadges.ts
+++ b/src/lib/Database/Supabase/userBadges.ts
@@ -1,5 +1,5 @@
 import { databaseTimeToDate } from '$lib/Utility/time';
-import supabase from './supabase';
+import supabase from '../supabase';
 
 export interface Badge {
 	post?: string;
diff --git a/src/lib/Database/userConfiguration.ts b/src/lib/Database/Supabase/userConfiguration.ts
index 6a22105a..cb2e4060 100644
--- a/src/lib/Database/userConfiguration.ts
+++ b/src/lib/Database/Supabase/userConfiguration.ts
@@ -1,4 +1,4 @@
-import supabase from './supabase';
+import supabase from '../supabase';
 
 interface UserConfiguration {
 	user_id: number;
diff --git a/src/lib/Database/userNotifications.ts b/src/lib/Database/Supabase/userNotifications.ts
index 6516b813..48cd73c9 100644
--- a/src/lib/Database/userNotifications.ts
+++ b/src/lib/Database/Supabase/userNotifications.ts
@@ -1,4 +1,4 @@
-import supabase from './supabase';
+import supabase from '../supabase';
 
 export interface UserNotifications {
 	created_at: string;
diff --git a/src/lib/Database/userPreferences.ts b/src/lib/Database/Supabase/userPreferences.ts
index ca2d62be..a717953f 100644
--- a/src/lib/Database/userPreferences.ts
+++ b/src/lib/Database/Supabase/userPreferences.ts
@@ -1,4 +1,4 @@
-import supabase from './supabase';
+import supabase from '../supabase';
 
 export interface UserPreferences {
 	created_at: string;
diff --git a/src/lib/Events/Event.svelte b/src/lib/Events/Event.svelte
index 9905cd4b..49fd2b15 100644
--- a/src/lib/Events/Event.svelte
+++ b/src/lib/Events/Event.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Event } from '$lib/Database/events';
+	import type { Event } from '$lib/Database/Supabase/events';
 	import root from '$lib/Utility/root';
 	import locale from '$stores/locale';
 
diff --git a/src/lib/Events/Group.svelte b/src/lib/Events/Group.svelte
index 3f07d979..843d1c18 100644
--- a/src/lib/Events/Group.svelte
+++ b/src/lib/Events/Group.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Group } from '$lib/Database/groups';
+	import type { Group } from '$lib/Database/Supabase/groups';
 	import tooltip from '$lib/Tooltip/tooltip';
 
 	export let group: Group;
diff --git a/src/lib/List/Manga/MangaListTemplate.svelte b/src/lib/List/Manga/MangaListTemplate.svelte
index 073cf44c..88ee4e70 100644
--- a/src/lib/List/Manga/MangaListTemplate.svelte
+++ b/src/lib/List/Manga/MangaListTemplate.svelte
@@ -6,7 +6,7 @@
 	import { chapterCount } from '$lib/Media/Manga/chapters';
 	import { pruneAllManga } from '$lib/Media/Manga/cache';
 	import manga from '$stores/manga';
-	import { database } from '$lib/Database/chapters';
+	import { database } from '$lib/Database/IndexedDB/chapters';
 	import settings from '$stores/settings';
 	import lastPruneTimes from '$stores/lastPruneTimes';
 	import ListTitle from '../ListTitle.svelte';
diff --git a/src/lib/Media/Manga/cache.ts b/src/lib/Media/Manga/cache.ts
index e6c024ff..9cea6f74 100644
--- a/src/lib/Media/Manga/cache.ts
+++ b/src/lib/Media/Manga/cache.ts
@@ -1,4 +1,4 @@
-import { database } from '../../Database/chapters';
+import { database } from '../../Database/IndexedDB/chapters';
 import manga from '$stores/manga';
 
 export const pruneAllManga = async () => {
diff --git a/src/lib/Media/Manga/chapters.ts b/src/lib/Media/Manga/chapters.ts
index f9ae1b64..bee7d032 100644
--- a/src/lib/Media/Manga/chapters.ts
+++ b/src/lib/Media/Manga/chapters.ts
@@ -3,7 +3,7 @@ import { getChapterCount } from '$lib/Data/Manga/raw';
 import proxy from '$lib/Utility/proxy';
 import settings from '$stores/settings';
 import type { UserIdentity } from '../../Data/AniList/identity';
-import { database } from '../../Database/chapters';
+import { database } from '../../Database/IndexedDB/chapters';
 
 const getManga = async (
 	statusIn: string,
diff --git a/src/lib/Media/Manga/volumes.ts b/src/lib/Media/Manga/volumes.ts
index bc73bbf4..f3e4e493 100644
--- a/src/lib/Media/Manga/volumes.ts
+++ b/src/lib/Media/Manga/volumes.ts
@@ -1,5 +1,5 @@
 import type { Media } from '$lib/Data/AniList/media';
-import { database } from '../../Database/chapters';
+import { database } from '../../Database/IndexedDB/chapters';
 
 export const volumeCount = async (manga: Media): Promise<number | null> =>
 	(await database.chapters.get(manga.id))?.volumes as number | null;
diff --git a/src/lib/Settings/Categories/Display.svelte b/src/lib/Settings/Categories/Display.svelte
index 45f9a585..cdcc90a1 100644
--- a/src/lib/Settings/Categories/Display.svelte
+++ b/src/lib/Settings/Categories/Display.svelte
@@ -4,7 +4,6 @@
 	import SettingHint from '../SettingHint.svelte';
 	import root from '$lib/Utility/root';
 	import locale from '$stores/locale';
-	import { browser } from '$app/environment';
 	import { requestNotifications } from '$lib/Utility/notifications';
 
 	const onHelperChange = () => {
diff --git a/src/lib/Tools/Wrapped/Tool.svelte b/src/lib/Tools/Wrapped/Tool.svelte
index b6e3f934..af90692b 100644
--- a/src/lib/Tools/Wrapped/Tool.svelte
+++ b/src/lib/Tools/Wrapped/Tool.svelte
@@ -17,7 +17,7 @@
 	import { page } from '$app/stores';
 	import { clearAllParameters } from '../../Utility/parameters';
 	import SettingHint from '$lib/Settings/SettingHint.svelte';
-	import { database } from '$lib/Database/activities';
+	import { database } from '$lib/Database/IndexedDB/activities';
 	import Activity from './Top/Activity.svelte';
 	import Anime from './Top/Anime.svelte';
 	import Manga from './Top/Manga.svelte';
diff --git a/src/lib/User/BadgeWall/AWC.svelte b/src/lib/User/BadgeWall/AWC.svelte
index d80ae72a..70f58b3e 100644
--- a/src/lib/User/BadgeWall/AWC.svelte
+++ b/src/lib/User/BadgeWall/AWC.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { AWCBadgesGroup } from '$lib/Data/awc';
-	import type { UserPreferences } from '$lib/Database/userPreferences';
+	import type { UserPreferences } from '$lib/Database/Supabase/userPreferences';
 	import { cdn, thumbnail } from '$lib/Utility/image';
 	import FallbackBadge from './FallbackBadge.svelte';
 	import './badges.css';
diff --git a/src/lib/User/BadgeWall/BadgePreview.svelte b/src/lib/User/BadgeWall/BadgePreview.svelte
index f606cfc9..3b1ec194 100644
--- a/src/lib/User/BadgeWall/BadgePreview.svelte
+++ b/src/lib/User/BadgeWall/BadgePreview.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { thumbnail } from '$lib/Utility/image.js';
-	import type { Badge } from '$lib/Database/userBadges';
+	import type { Badge } from '$lib/Database/Supabase/userBadges';
 	import { cdn } from '$lib/Utility/image';
 	import { databaseTimeToDate } from '$lib/Utility/time';
 	import locale from '$stores/locale';
diff --git a/src/lib/User/BadgeWall/Badges.svelte b/src/lib/User/BadgeWall/Badges.svelte
index 8d52d034..6c7d1c73 100644
--- a/src/lib/User/BadgeWall/Badges.svelte
+++ b/src/lib/User/BadgeWall/Badges.svelte
@@ -6,7 +6,7 @@
 	import FallbackImage from '$lib/Image/FallbackImage.svelte';
 	import { cdn, thumbnail } from '$lib/Utility/image';
 	import FallbackBadge from './FallbackBadge.svelte';
-	import type { UserPreferences } from '$lib/Database/userPreferences';
+	import type { UserPreferences } from '$lib/Database/Supabase/userPreferences';
 	import type { IndexedBadge } from './badge';
 
 	export let ungroupedBadges: IndexedBadge[];
diff --git a/src/lib/User/BadgeWall/FallbackBadge.svelte b/src/lib/User/BadgeWall/FallbackBadge.svelte
index 7e0420ea..b9b45aad 100644
--- a/src/lib/User/BadgeWall/FallbackBadge.svelte
+++ b/src/lib/User/BadgeWall/FallbackBadge.svelte
@@ -2,12 +2,12 @@
 	import { classifyDesignerName } from './badge';
 	import locale from '$stores/locale';
 	import { tweened } from 'svelte/motion';
-	import type { Badge } from '../../Database/userBadges';
+	import type { Badge } from '../../Database/Supabase/userBadges';
 	import Tooltip from '../../Tooltip/LinkedTooltip.svelte';
 	import { databaseTimeToDate } from '../../Utility/time';
 	import { cubicOut } from 'svelte/easing';
 	import { dev } from '$app/environment';
-	import type { UserPreferences } from '$lib/Database/userPreferences';
+	import type { UserPreferences } from '$lib/Database/Supabase/userPreferences';
 
 	export let source: string | null | undefined;
 	export let alternative: string | null | undefined;
diff --git a/src/lib/User/BadgeWall/badge.ts b/src/lib/User/BadgeWall/badge.ts
index fb02f3c5..308a6014 100644
--- a/src/lib/User/BadgeWall/badge.ts
+++ b/src/lib/User/BadgeWall/badge.ts
@@ -1,4 +1,4 @@
-import type { Badge } from '$lib/Database/userBadges';
+import type { Badge } from '$lib/Database/Supabase/userBadges';
 
 export interface IndexedBadge extends Badge {
 	index: number;
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index e1381ff0..66f290d6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -28,9 +28,8 @@
 	import settingsSyncTimes from '$stores/settingsSyncTimes';
 	import Announcement from '$lib/Announcement.svelte';
 	import Message from '$lib/Loading/Message.svelte';
-	import { notifications } from '$lib/Data/AniList/notifications';
 	import { requestNotifications } from '$lib/Utility/notifications';
-	import { database as userDatabase } from '$lib/Database/user';
+	import { database as userDatabase } from '$lib/Database/IndexedDB/user';
 
 	injectSpeedInsights();
 
@@ -39,7 +38,6 @@
 	let isHeaderVisible = true;
 	let previousScrollPosition = 0;
 	let notificationInterval: NodeJS.Timeout | undefined = undefined;
-	let lastNotificationId = 0;
 
 	addMessages('en', english as unknown as LocaleDictionary);
 	addMessages('ja', japanese as unknown as LocaleDictionary);
diff --git a/src/routes/api/badges/+server.ts b/src/routes/api/badges/+server.ts
index 483d0b9c..7d800f4b 100644
--- a/src/routes/api/badges/+server.ts
+++ b/src/routes/api/badges/+server.ts
@@ -10,7 +10,7 @@ import {
 	setShadowHidden,
 	setShadowHiddenBadge,
 	incrementClickCount
-} from '$lib/Database/userBadges';
+} from '$lib/Database/Supabase/userBadges';
 import authorisedJson from '$lib/Data/Static/authorised.json';
 
 const unauthorised = new Response('Unauthorised', { status: 401 });
diff --git a/src/routes/api/configuration/+server.ts b/src/routes/api/configuration/+server.ts
index 8b37628f..d5d3f600 100644
--- a/src/routes/api/configuration/+server.ts
+++ b/src/routes/api/configuration/+server.ts
@@ -3,7 +3,7 @@ import {
 	deleteUserConfiguration,
 	getUserConfiguration,
 	setUserConfiguration
-} from '$lib/Database/userConfiguration.js';
+} from '$lib/Database/Supabase/userConfiguration.js';
 
 const unauthorised = new Response('Unauthorised', { status: 401 });
 
diff --git a/src/routes/api/events/+server.ts b/src/routes/api/events/+server.ts
index 65347874..b09d4e98 100644
--- a/src/routes/api/events/+server.ts
+++ b/src/routes/api/events/+server.ts
@@ -1,4 +1,4 @@
-import { getEvents, getGroupEvents } from '$lib/Database/events';
+import { getEvents, getGroupEvents } from '$lib/Database/Supabase/events';
 
 export const GET = async ({ url }) =>
 	Response.json(
diff --git a/src/routes/api/events/group/+server.ts b/src/routes/api/events/group/+server.ts
index b79895fd..20637de0 100644
--- a/src/routes/api/events/group/+server.ts
+++ b/src/routes/api/events/group/+server.ts
@@ -1,4 +1,4 @@
-import { getGroup } from '$lib/Database/groups';
+import { getGroup } from '$lib/Database/Supabase/groups';
 
 export const GET = async ({ url }) =>
 	Response.json(await getGroup(url.searchParams.get('slug') || ''));
diff --git a/src/routes/api/events/groups/+server.ts b/src/routes/api/events/groups/+server.ts
index 512dde37..7ed9c344 100644
--- a/src/routes/api/events/groups/+server.ts
+++ b/src/routes/api/events/groups/+server.ts
@@ -1,3 +1,3 @@
-import { getGroups } from '$lib/Database/groups';
+import { getGroups } from '$lib/Database/Supabase/groups';
 
 export const GET = async () => Response.json(await getGroups());
diff --git a/src/routes/api/notifications/subscribe/+server.ts b/src/routes/api/notifications/subscribe/+server.ts
index 98bd5c4d..d7b4b6a4 100644
--- a/src/routes/api/notifications/subscribe/+server.ts
+++ b/src/routes/api/notifications/subscribe/+server.ts
@@ -1,5 +1,5 @@
 import { userIdentity } from '$lib/Data/AniList/identity';
-import { setUserSubscription } from '$lib/Database/userNotifications';
+import { setUserSubscription } from '$lib/Database/Supabase/userNotifications';
 
 const unauthorised = new Response('Unauthorised', { status: 401 });
 
diff --git a/src/routes/api/notifications/unsubscribe/+server.ts b/src/routes/api/notifications/unsubscribe/+server.ts
index f122625d..0961fbad 100644
--- a/src/routes/api/notifications/unsubscribe/+server.ts
+++ b/src/routes/api/notifications/unsubscribe/+server.ts
@@ -1,5 +1,5 @@
 import { userIdentity } from '$lib/Data/AniList/identity';
-import { deleteUserSubscription } from '$lib/Database/userNotifications';
+import { deleteUserSubscription } from '$lib/Database/Supabase/userNotifications';
 
 const unauthorised = new Response('Unauthorised', { status: 401 });
 
diff --git a/src/routes/api/preferences/+server.ts b/src/routes/api/preferences/+server.ts
index 37e8af29..9de8ae8e 100644
--- a/src/routes/api/preferences/+server.ts
+++ b/src/routes/api/preferences/+server.ts
@@ -7,7 +7,7 @@ import {
 	toggleHideAWCBadges,
 	togglePinnedBadgeWallCategory,
 	setPinnedBadgeWallCategories
-} from '$lib/Database/userPreferences';
+} from '$lib/Database/Supabase/userPreferences';
 
 const unauthorised = new Response('Unauthorised', { status: 401 });
 
diff --git a/src/routes/api/preferences/pin/+server.ts b/src/routes/api/preferences/pin/+server.ts
index 90dfce62..3b17a4ed 100644
--- a/src/routes/api/preferences/pin/+server.ts
+++ b/src/routes/api/preferences/pin/+server.ts
@@ -1,5 +1,5 @@
 import { userIdentity } from '$lib/Data/AniList/identity';
-import { toggleHololiveStreamPinning } from '$lib/Database/userPreferences';
+import { toggleHololiveStreamPinning } from '$lib/Database/Supabase/userPreferences';
 
 const unauthorised = new Response('Unauthorised', { status: 401 });
 
diff --git a/src/routes/events/group/[group]/+page.svelte b/src/routes/events/group/[group]/+page.svelte
index ef920254..6cd0c8ba 100644
--- a/src/routes/events/group/[group]/+page.svelte
+++ b/src/routes/events/group/[group]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import type { Group as GroupType } from '$lib/Database/groups';
-	import type { Event as EventType } from '$lib/Database/events';
+	import type { Group as GroupType } from '$lib/Database/Supabase/groups';
+	import type { Event as EventType } from '$lib/Database/Supabase/events';
 	import Message from '$lib/Loading/Message.svelte';
 	import root from '$lib/Utility/root';
 	import { onMount } from 'svelte';
diff --git a/src/routes/events/groups/+page.svelte b/src/routes/events/groups/+page.svelte
index 9c08b63c..a6e56b0e 100644
--- a/src/routes/events/groups/+page.svelte
+++ b/src/routes/events/groups/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Group as GroupType } from '$lib/Database/groups';
+	import type { Group as GroupType } from '$lib/Database/Supabase/groups';
 	import Message from '$lib/Loading/Message.svelte';
 	import root from '$lib/Utility/root';
 	import { onMount } from 'svelte';
diff --git a/src/routes/user/[user]/+page.svelte b/src/routes/user/[user]/+page.svelte
index 5cff3ca8..c75852b8 100644
--- a/src/routes/user/[user]/+page.svelte
+++ b/src/routes/user/[user]/+page.svelte
@@ -16,7 +16,7 @@
 	import SettingHint from '$lib/Settings/SettingHint.svelte';
 	import proxy from '$lib/Utility/proxy';
 	import { parseScheduleHtml } from '$lib/Data/hololive';
-	import type { UserPreferences } from '$lib/Database/userPreferences.js';
+	import type { UserPreferences } from '$lib/Database/Supabase/userPreferences.js';
 	import SvelteMarkdown from 'svelte-markdown';
 	import MarkdownLink from '$lib/MarkdownLink.svelte';
 	import LinkedTooltip from '$lib/Tooltip/LinkedTooltip.svelte';
diff --git a/src/routes/user/[user]/badges/+page.svelte b/src/routes/user/[user]/badges/+page.svelte
index e226fc8a..07e032ab 100644
--- a/src/routes/user/[user]/badges/+page.svelte
+++ b/src/routes/user/[user]/badges/+page.svelte
@@ -2,7 +2,7 @@
 	import AWC from './../../../../lib/User/BadgeWall/AWC.svelte';
 	import { userIdentity } from '$lib/Data/AniList/identity';
 	import { user, type User } from '$lib/Data/AniList/user';
-	import type { Badge } from '$lib/Database/userBadges';
+	import type { Badge } from '$lib/Database/Supabase/userBadges';
 	// import { domToBlob } from 'modern-screenshot';
 	import { onDestroy, onMount } from 'svelte';
 	import HeadTitle from '$lib/Home/HeadTitle.svelte';
@@ -18,7 +18,7 @@
 	import SettingHint from '$lib/Settings/SettingHint.svelte';
 	import Popup from '$lib/Layout/Popup.svelte';
 	import { page } from '$app/stores';
-	import type { UserPreferences } from '$lib/Database/userPreferences.js';
+	import type { UserPreferences } from '$lib/Database/Supabase/userPreferences.js';
 	import { browser } from '$app/environment';
 	// import { io } from 'socket.io-client';
 	import BadgePreview from '$lib/User/BadgeWall/BadgePreview.svelte';