feat: SkyClient Part 1

Polyfrost · Dec 7, 2024 · f49dc71 · f49dc71
1 parent 2554d23
commit f49dc71
Show file tree

Hide file tree

Showing 15 changed files with 410 additions and 85 deletions.
diff --git a/apps/frontend/src/assets/logos/skyclient.png b/apps/frontend/src/assets/logos/skyclient.png
diff --git a/apps/frontend/src/ui/components/content/ProviderIcon.tsx b/apps/frontend/src/ui/components/content/ProviderIcon.tsx
@@ -1,6 +1,7 @@
 import type { ManagedPackage, Providers } from '@onelauncher/client/bindings';
 import CurseforgeIcon from '~assets/logos/curseforge.svg?component-solid';
 import ModrinthImage from '~assets/logos/modrinth.svg?component-solid';
+import SkyClientImage from '~assets/logos/skyclient.png';
 import { type Component, type JSX, Match, Show, splitProps, Switch } from 'solid-js';
 
 export function getProviderLogoElement(provider: ManagedPackage | Providers): string | Component {
@@ -10,6 +11,7 @@ export function getProviderLogoElement(provider: ManagedPackage | Providers): st
 	const mapping: Record<Lowercase<Providers>, string | Component> = {
 		modrinth: ModrinthImage,
 		curseforge: CurseforgeIcon,
+		skyclient: SkyClientImage,
 	};
 
 	return mapping[providerName];

diff --git a/apps/frontend/src/ui/components/content/SearchResults.tsx b/apps/frontend/src/ui/components/content/SearchResults.tsx
@@ -160,16 +160,18 @@ function PackageItem(props: SearchResult & { provider: Providers; row?: boolean
 				<p class="max-h-22 flex-1 overflow-hidden text-sm text-fg-secondary line-height-snug">{props.description}</p>
 
 				<div class="flex flex-row gap-4 text-xs">
-					<div class="flex flex-row items-center gap-2">
-						<Download01Icon class="h-4 w-4" />
-						{abbreviateNumber(props.downloads)}
-					</div>
-
-					<Show when={props.follows > 0}>
+					<Show when={props.provider !== 'SkyClient'}>
 						<div class="flex flex-row items-center gap-2">
-							<HeartIcon class="h-4 w-4" />
-							{abbreviateNumber(props.follows)}
+							<Download01Icon class="h-4 w-4" />
+							{abbreviateNumber(props.downloads)}
 						</div>
+
+						<Show when={props.follows > 0}>
+							<div class="flex flex-row items-center gap-2">
+								<HeartIcon class="h-4 w-4" />
+								{abbreviateNumber(props.follows)}
+							</div>
+						</Show>
 					</Show>
 				</div>
 			</div>

diff --git a/apps/frontend/src/ui/pages/browser/BrowserPackage.tsx b/apps/frontend/src/ui/pages/browser/BrowserPackage.tsx
@@ -137,8 +137,8 @@ export default BrowserPackage;
 
 function BrowserSidebar(props: { package: ManagedPackage }) {
 	const [authors] = useCommand(() => props.package, () => bridge.commands.getProviderAuthors(props.package.provider, props.package.author));
-	const createdAt = () => new Date(props.package.created);
-	const updatedAt = () => new Date(props.package.updated);
+	const createdAt = createMemo(() => props.package.created ? new Date(props.package.created) : null);
+	const updatedAt = createMemo(() => props.package.updated ? new Date(props.package.updated) : null);
 	const promptOpen = usePromptOpener();
 
 	return (
@@ -166,16 +166,18 @@ function BrowserSidebar(props: { package: ManagedPackage }) {
 					<p class="max-h-22 flex-1 overflow-hidden text-sm text-fg-secondary line-height-snug">{props.package.description}</p>
 
 					<div class="flex flex-row gap-4 text-xs">
-						<div class="flex flex-row items-center gap-2">
-							<Download01Icon class="h-4 w-4" />
-							{abbreviateNumber(props.package.downloads)}
-						</div>
-
-						<Show when={props.package.followers > 0}>
+						<Show when={props.package.provider !== 'SkyClient'}>
 							<div class="flex flex-row items-center gap-2">
-								<HeartIcon class="h-4 w-4" />
-								{abbreviateNumber(props.package.followers)}
+								<Download01Icon class="h-4 w-4" />
+								{abbreviateNumber(props.package.downloads)}
 							</div>
+
+							<Show when={props.package.followers > 0}>
+								<div class="flex flex-row items-center gap-2">
+									<HeartIcon class="h-4 w-4" />
+									{abbreviateNumber(props.package.followers)}
+								</div>
+							</Show>
 						</Show>
 					</div>
 				</div>
@@ -235,25 +237,29 @@ function BrowserSidebar(props: { package: ManagedPackage }) {
 					</div>
 				</Show>
 
-				<Tooltip text={createdAt().toLocaleString()}>
-					<div class="flex flex-row items-center gap-x-1">
-						<CalendarIcon class="h-3 min-w-3 w-3" />
-						Created
-						<span class="text-fg-primary font-medium">
-							{formatAsRelative(createdAt().getTime(), 'en', 'long')}
-						</span>
-					</div>
-				</Tooltip>
+				<Show when={createdAt() !== null}>
+					<Tooltip text={createdAt()!.toLocaleString()}>
+						<div class="flex flex-row items-center gap-x-1">
+							<CalendarIcon class="h-3 min-w-3 w-3" />
+							Created
+							<span class="text-fg-primary font-medium">
+								{formatAsRelative(createdAt()!.getTime(), 'en', 'long')}
+							</span>
+						</div>
+					</Tooltip>
+				</Show>
 
-				<Tooltip text={updatedAt().toLocaleString()}>
-					<div class="flex flex-row items-center gap-x-1">
-						<ClockRewindIcon class="h-3 min-w-3 w-3" />
-						Last Updated
-						<span class="text-fg-primary font-medium">
-							{formatAsRelative(updatedAt().getTime(), 'en', 'long')}
-						</span>
-					</div>
-				</Tooltip>
+				<Show when={updatedAt() !== null}>
+					<Tooltip text={updatedAt()!.toLocaleString()}>
+						<div class="flex flex-row items-center gap-x-1">
+							<ClockRewindIcon class="h-3 min-w-3 w-3" />
+							Last Updated
+							<span class="text-fg-primary font-medium">
+								{formatAsRelative(updatedAt()!.getTime(), 'en', 'long')}
+							</span>
+						</div>
+					</Tooltip>
+				</Show>
 			</div>
 
 		</div>

diff --git a/apps/frontend/src/ui/pages/browser/BrowserRoot.tsx b/apps/frontend/src/ui/pages/browser/BrowserRoot.tsx
@@ -7,7 +7,7 @@ import ProviderIcon from '~ui/components/content/ProviderIcon';
 import useBrowser from '~ui/hooks/useBrowser';
 import { PROVIDERS } from '~utils';
 import { browserCategories } from '~utils/browser';
-import { For, type JSX, type ParentProps } from 'solid-js';
+import { createMemo, For, type JSX, type ParentProps, Show } from 'solid-js';
 import BrowserMain from './BrowserMain';
 import BrowserPackage from './BrowserPackage';
 import BrowserSearch from './BrowserSearch';
@@ -87,23 +87,29 @@ function BrowserCategories() {
 			browser.search();
 	};
 
+	const categories = createMemo(() => {
+		return browserCategories.byPackageType(browser.packageType(), browser.searchQuery().provider);
+	});
+
 	return (
 		<div class="top-0 grid grid-cols-[1fr_auto] h-fit min-w-50 gap-y-6">
 			<div />
 			<div class="flex flex-col gap-y-6">
-				<div class="flex flex-col gap-y-2">
-					<h6 class="my-1">Categories</h6>
-					<For each={browserCategories.byPackageType(browser.packageType(), browser.searchQuery().provider)}>
-						{category => (
-							<p
-								class={`text-md capitalize text-fg-primary hover:text-fg-primary-hover line-height-snug ${isEnabled(category.id) ? 'text-opacity-100! hover:text-opacity-90!' : 'text-opacity-60! hover:text-opacity-70!'}`}
-								onClick={() => toggleCategory(category.id)}
-							>
-								{category.display}
-							</p>
-						)}
-					</For>
-				</div>
+				<Show when={categories().length > 0}>
+					<div class="flex flex-col gap-y-2">
+						<h6 class="my-1">Categories</h6>
+						<For each={categories()}>
+							{category => (
+								<p
+									class={`text-md capitalize text-fg-primary hover:text-fg-primary-hover line-height-snug ${isEnabled(category.id) ? 'text-opacity-100! hover:text-opacity-90!' : 'text-opacity-60! hover:text-opacity-70!'}`}
+									onClick={() => toggleCategory(category.id)}
+								>
+									{category.display}
+								</p>
+							)}
+						</For>
+					</div>
+				</Show>
 			</div>
 		</div>
 	);

diff --git a/apps/frontend/src/utils/browser.ts b/apps/frontend/src/utils/browser.ts
@@ -93,4 +93,5 @@ const modMapping: Record<Providers, CategoryItem[]> = {
 		{ display: 'Utility', id: 'utility' },
 		{ display: 'World Generation', id: 'worldgen' },
 	],
+	SkyClient: [],
 };
diff --git a/apps/frontend/src/utils/index.ts b/apps/frontend/src/utils/index.ts
@@ -174,13 +174,14 @@ export function getPackageUrl(pkg: ManagedPackage): string {
 
 			return `https://www.curseforge.com/minecraft/${packageTypeMapping[pkg.package_type]}/${pkg.main}`;
 		},
+		SkyClient: () => 'TODO',
 	};
 
 	return mapping[pkg.provider]();
 }
 
 export const LOADERS: Loader[] = ['vanilla', 'fabric', 'forge', 'neoforge', 'quilt'] as const;
-export const PROVIDERS: Providers[] = ['Modrinth', 'Curseforge'] as const;
+export const PROVIDERS: Providers[] = ['Modrinth', 'Curseforge', 'SkyClient'] as const;
 export const PACKAGE_TYPES: PackageType[] = ['mod', 'resourcepack', 'datapack', 'shaderpack'] as const;
 export const LAUNCHER_IMPORT_TYPES: ImportType[] = [
 	'PrismLauncher',

diff --git a/packages/client/src/bindings.ts b/packages/client/src/bindings.ts
diff --git a/packages/core/src/api/package/content/curseforge.rs b/packages/core/src/api/package/content/curseforge.rs
@@ -146,8 +146,8 @@ impl From<CurseforgePackage> for ManagedPackage {
 			game_versions: vec![],
 			loaders: vec![],
 			icon_url: package.logo.and_then(|l| Some(l.url)),
-			created: package.date_created,
-			updated: package.date_modified,
+			created: Some(package.date_created),
+			updated: Some(package.date_modified),
 			client: crate::store::PackageSide::Unknown,
 			server: crate::store::PackageSide::Unknown,
 			downloads: package.download_count,
@@ -193,11 +193,10 @@ impl Into<SearchResult> for CurseforgePackage {
 			downloads: self.download_count,
 			icon_url: self.logo.map_or(String::new(), |l| l.url),
 			categories: vec![], // TODO
-			display_categories: vec![],
 			versions: vec![],
 			follows: self.thumbs_up_count,
-			date_created: self.date_created,
-			date_modified: self.date_modified,
+			date_created: Some(self.date_created),
+			date_modified: Some(self.date_modified),
 		}
 	}
 }

diff --git a/packages/core/src/api/package/content/mod.rs b/packages/core/src/api/package/content/mod.rs
@@ -17,13 +17,15 @@ use crate::{Result, State};
 
 mod curseforge;
 mod modrinth;
+mod skyclient;
 
 /// Providers for content packages
 #[cfg_attr(feature = "specta", derive(specta::Type))]
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
 pub enum Providers {
 	Modrinth,
 	Curseforge,
+	SkyClient,
 }
 
 impl std::fmt::Display for Providers {
@@ -39,6 +41,7 @@ impl Providers {
 		match self {
 			Self::Modrinth => "Modrinth",
 			Self::Curseforge => "Curseforge",
+			Self::SkyClient => "SkyClient",
 		}
 	}
 
@@ -48,11 +51,12 @@ impl Providers {
 		match self {
 			Self::Modrinth => "https://modrinth.com",
 			Self::Curseforge => "https://curseforge.com",
+			Self::SkyClient => "https://skyclient.co",
 		}
 	}
 
 	pub const fn get_providers() -> &'static [Providers] {
-		&[Self::Modrinth, Self::Curseforge]
+		&[Self::Modrinth, Self::Curseforge, Self::SkyClient]
 	}
 
 	#[allow(clippy::too_many_arguments)]
@@ -98,35 +102,37 @@ impl Providers {
 				)
 				.await
 			}
+			Self::SkyClient => {
+				skyclient::search(
+					query,
+					limit,
+					offset,
+					game_versions,
+					loaders
+				).await
+			},
 		}
 	}
 
 	pub async fn get(&self, slug_or_id: &str) -> Result<ManagedPackage> {
 		Ok(match self {
 			Self::Modrinth => modrinth::get(slug_or_id).await?.into(),
-			Self::Curseforge => curseforge::get(
-				slug_or_id
-					.parse::<u32>()
-					.map_err(|err| anyhow::anyhow!(err))?,
-			)
-			.await?
-			.into(),
+			Self::Curseforge => curseforge::get(slug_or_id.parse::<u32>().map_err(|err| anyhow::anyhow!(err))?).await?.into(),
+			Self::SkyClient => skyclient::get(slug_or_id).await?.into(),
 		})
 	}
 
 	pub async fn get_multiple(&self, slug_or_ids: &[String]) -> Result<Vec<ManagedPackage>> {
-		Ok(match self {
-			Self::Modrinth => {
-				if slug_or_ids.len() <= 0 {
-					return Ok(vec![]);
-				}
+		if slug_or_ids.len() <= 0 {
+			return Ok(vec![]);
+		}
 
-				modrinth::get_multiple(slug_or_ids)
+		Ok(match self {
+			Self::Modrinth => modrinth::get_multiple(slug_or_ids)
 					.await?
 					.into_iter()
 					.map(Into::into)
-					.collect()
-			},
+					.collect(),
 			Self::Curseforge => {
 				let parsed_ids = slug_or_ids
 					.iter()
@@ -145,6 +151,11 @@ impl Providers {
 					.map(Into::into)
 					.collect()
 			},
+			Self::SkyClient => skyclient::get_multiple(slug_or_ids)
+				.await?
+				.into_iter()
+				.map(Into::into)
+				.collect(),
 		})
 	}
 
@@ -166,6 +177,8 @@ impl Providers {
 				let data = curseforge::get_all_versions(project_id, game_versions, loaders, page, page_size).await?;
 				(data.0.into_iter().map(Into::into).collect(), data.1)
 			}
+
+			Self::SkyClient => todo!(),
 		})
 	}
 
@@ -181,6 +194,7 @@ impl Providers {
 				.into_iter()
 				.map(Into::into)
 				.collect(),
+			Self::SkyClient => todo!(),
 		})
 	}
 
@@ -215,7 +229,8 @@ impl Providers {
 				.await?
 				.into_iter()
 				.map(|(hash, version)| (hash, version.into()))
-				.collect()
+				.collect(),
+			Self::SkyClient => todo!(),
 		})
 	}
 }

diff --git a/packages/core/src/api/package/content/modrinth.rs b/packages/core/src/api/package/content/modrinth.rs
@@ -75,8 +75,8 @@ impl From<ModrinthPackage> for ManagedPackage {
 			game_versions: value.game_versions,
 			loaders: value.loaders,
 			icon_url: value.icon_url,
-			created: value.published,
-			updated: value.updated,
+			created: Some(value.published),
+			updated: Some(value.updated),
 			client: value.client_side,
 			server: value.server_side,
 			downloads: value.downloads as u64,