From ca9dd29320ce7b1d9b56723c25b13dbfc787021a Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 11 Jun 2026 16:34:12 -0700
Subject: [PATCH] update derakkuma for new lexicons

---
 .../DerakkumaCards/DerakkumaCircleCard.svelte |  2 +-
 .../DerakkumaProfileCard.svelte               |  2 +-
 .../DerakkumaCards/DerakkumaScoresCard.svelte |  5 ++-
 src/lib/cards/media/DerakkumaCards/shared.ts  | 42 ++++++++++++++++++-
 4 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/lib/cards/media/DerakkumaCards/DerakkumaCircleCard.svelte b/src/lib/cards/media/DerakkumaCards/DerakkumaCircleCard.svelte
index 612918c..163c7f9 100644
--- a/src/lib/cards/media/DerakkumaCards/DerakkumaCircleCard.svelte
+++ b/src/lib/cards/media/DerakkumaCards/DerakkumaCircleCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { Item } from '$lib/types';
 	import { onMount } from 'svelte';
-	import { getAdditionalUserData, getDidContext, getHandleContext } from '$lib/website/context';
+	import { getAdditionalUserData, getDidContext, getHandleContext } from '$lib/website/data/context';
 	import { CardDefinitionsByType } from '../..';
 	import { blobUrl, type DerakkumaCircleValue, type RepoRecord } from './shared';
 
diff --git a/src/lib/cards/media/DerakkumaCards/DerakkumaProfileCard.svelte b/src/lib/cards/media/DerakkumaCards/DerakkumaProfileCard.svelte
index 106a695..d87f124 100644
--- a/src/lib/cards/media/DerakkumaCards/DerakkumaProfileCard.svelte
+++ b/src/lib/cards/media/DerakkumaCards/DerakkumaProfileCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { Item } from '$lib/types';
 	import { onMount } from 'svelte';
-	import { getAdditionalUserData, getDidContext, getHandleContext } from '$lib/website/context';
+	import { getAdditionalUserData, getDidContext, getHandleContext } from '$lib/website/data/context';
 	import { CardDefinitionsByType } from '../..';
 	import { blobUrl, type DerakkumaProfileValue, type RepoRecord } from './shared';
 
diff --git a/src/lib/cards/media/DerakkumaCards/DerakkumaScoresCard.svelte b/src/lib/cards/media/DerakkumaCards/DerakkumaScoresCard.svelte
index cd13a6e..e967bd1 100644
--- a/src/lib/cards/media/DerakkumaCards/DerakkumaScoresCard.svelte
+++ b/src/lib/cards/media/DerakkumaCards/DerakkumaScoresCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { Item } from '$lib/types';
 	import { onMount } from 'svelte';
-	import { getAdditionalUserData, getDidContext, getHandleContext } from '$lib/website/context';
+	import { getAdditionalUserData, getDidContext, getHandleContext } from '$lib/website/data/context';
 	import { CardDefinitionsByType } from '../..';
 	import { RelativeTime } from '@foxui/time';
 	import { scoreMeta, scoreSubtitle, scoreTitle, type EnrichedDerakkumaScore } from './shared';
@@ -22,7 +22,8 @@
 	});
 
 	function dateFor(score: EnrichedDerakkumaScore): Date | undefined {
-		const value = score.value.playedAt ?? score.value.updatedAt ?? score.value.createdAt;
+		const value =
+			score.value.playedAt ?? score.value.lastPlayed ?? score.value.updatedAt ?? score.value.createdAt;
 		if (!value) return;
 		return new Date(value);
 	}
diff --git a/src/lib/cards/media/DerakkumaCards/shared.ts b/src/lib/cards/media/DerakkumaCards/shared.ts
index 171257e..87daeae 100644
--- a/src/lib/cards/media/DerakkumaCards/shared.ts
+++ b/src/lib/cards/media/DerakkumaCards/shared.ts
@@ -40,11 +40,20 @@ export type DerakkumaProfileValue = {
 
 export type DerakkumaScoreValue = {
 	chart?: StrongRef | Record<string, unknown>;
+	songName?: string;
+	chartSongName?: string;
+	chartSongId?: string;
+	chartDifficulty?: string;
+	chartLevel?: string;
+	chartType?: string;
 	achievement?: string | number;
 	scoreRank?: string;
 	fcStatus?: string;
 	syncStatus?: string;
+	dxScore?: DerakkumaDxScoreValue;
+	dxStar?: number;
 	playedAt?: string;
+	lastPlayed?: string;
 	createdAt?: string;
 	updatedAt?: string;
 	playCount?: number;
@@ -67,17 +76,31 @@ export type DerakkumaCircleValue = {
 };
 
 type DerakkumaSongValue = {
+	songId?: string;
 	title?: string;
 	artist?: string;
+	category?: string;
+	bpm?: number;
+	imageName?: string;
 	coverArt?: BlobRef;
+	charts?: string[];
 };
 
 type DerakkumaChartValue = {
 	song?: StrongRef | Record<string, unknown>;
 	songId?: string;
 	songName?: string;
+	type?: string;
 	difficulty?: string;
 	level?: string;
+	levelValue?: string;
+	internalLevel?: string | null;
+	internalLevelValue?: string | null;
+};
+
+type DerakkumaDxScoreValue = {
+	achieved?: number;
+	total?: number;
 };
 
 export type EnrichedDerakkumaScore = RepoRecord<DerakkumaScoreValue> & {
@@ -192,22 +215,37 @@ export function scoreTitle(score: EnrichedDerakkumaScore): string {
 		score.song?.value.title ??
 		score.chart?.value.songName ??
 		score.chart?.value.songId ??
+		score.value.songName ??
+		score.value.chartSongName ??
+		score.value.chartSongId ??
+		strongRefUri(score.value.chart) ??
 		'Unknown song'
 	);
 }
 
 export function scoreSubtitle(score: EnrichedDerakkumaScore): string {
-	return [score.chart?.value.difficulty, score.chart?.value.level, score.value.achievement]
+	return [
+		score.chart?.value.difficulty ?? score.value.chartDifficulty,
+		score.chart?.value.level ?? score.value.chartLevel,
+		score.value.achievement
+	]
 		.filter(Boolean)
 		.join(' · ');
 }
 
+function dxScoreString(score?: DerakkumaDxScoreValue): string | undefined {
+	if (!score || (!score.achieved && !score.total)) return;
+	return `DX ${score.achieved ?? 0}/${score.total ?? 0}`;
+}
+
 export function scoreMeta(score: EnrichedDerakkumaScore): string {
 	return [
 		score.song?.value.artist,
 		score.value.scoreRank?.toUpperCase(),
 		score.value.fcStatus?.toUpperCase(),
-		score.value.syncStatus?.toUpperCase()
+		score.value.syncStatus?.toUpperCase(),
+		dxScoreString(score.value.dxScore),
+		score.value.dxStar ? `DX ✦${score.value.dxStar}` : undefined
 	]
 		.filter(Boolean)
 		.join(' · ');
-- 
2.51.2