From 192d6a2237a4aa3138872ce244b1274de6c794cf Mon Sep 17 00:00:00 2001
From: thororen <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 5 Dec 2025 20:33:17 -0500
Subject: [PATCH] ShikiCodeBlocks: Update assets (#3785)

Co-authored-by: V <vendicated@riseup.net>
---
 .../shikiCodeblocks.desktop/api/languages.ts  | 31 +++++++++++--------
 .../shikiCodeblocks.desktop/api/themes.ts     | 10 ++++--
 .../shikiCodeblocks.desktop/devicon.css       |  2 +-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/plugins/shikiCodeblocks.desktop/api/languages.ts b/src/plugins/shikiCodeblocks.desktop/api/languages.ts
index baf7a548..140d9c53 100644
--- a/src/plugins/shikiCodeblocks.desktop/api/languages.ts
+++ b/src/plugins/shikiCodeblocks.desktop/api/languages.ts
@@ -18,11 +18,12 @@
 
 import { ILanguageRegistration } from "@vap/shiki";
 
-export const VPC_REPO = "Vap0r1ze/vapcord";
-export const VPC_REPO_COMMIT = "4d0e4b420fb1e4358852bbd18c804a6f5e54c0d7";
-export const vpcRepoAssets = `https://raw.githubusercontent.com/${VPC_REPO}/${VPC_REPO_COMMIT}/assets/shiki-codeblocks`;
-export const vpcRepoGrammar = (fileName: string) => `${vpcRepoAssets}/${fileName}`;
-export const vpcRepoLanguages = `${vpcRepoAssets}/languages.json`;
+import { SHIKI_REPO, SHIKI_REPO_COMMIT } from "./themes";
+
+export const JSON_REPO = "Vencord/ShikiPluginAssets";
+export const JSON_REPO_COMMIT = "75d69df9fdf596a31eef8b7f6f891231a6feab44";
+export const JSON_URL = `https://cdn.jsdelivr.net/gh/${JSON_REPO}@${JSON_REPO_COMMIT}/grammars.json`;
+export const shikiRepoGrammar = (name: string) => `https://cdn.jsdelivr.net/gh/${SHIKI_REPO}@${SHIKI_REPO_COMMIT}/packages/tm-grammars/grammars/${name}.json`;
 
 export interface Language {
     name: string;
@@ -36,22 +37,26 @@ export interface Language {
 }
 export interface LanguageJson {
     name: string;
-    id: string;
-    fileName: string;
-    devicon?: string;
+    displayName: string;
     scopeName: string;
+    devicon?: string;
     aliases?: string[];
 }
 
 export const languages: Record<string, Language> = {};
 
 export const loadLanguages = async () => {
-    const langsJson: LanguageJson[] = await fetch(vpcRepoLanguages).then(res => res.ok ? res.json() : []);
+    const langsJson: LanguageJson[] = await fetch(JSON_URL).then(res => res.ok ? res.json() : []);
     const loadedLanguages = Object.fromEntries(
-        langsJson.map(lang => [lang.id, {
-            ...lang,
-            grammarUrl: vpcRepoGrammar(lang.fileName),
-        }])
+        langsJson.map(lang => {
+            const { name, displayName, ...rest } = lang;
+            return [name, {
+                ...rest,
+                id: name,
+                name: displayName,
+                grammarUrl: shikiRepoGrammar(name),
+            }];
+        })
     );
     Object.assign(languages, loadedLanguages);
 };
diff --git a/src/plugins/shikiCodeblocks.desktop/api/themes.ts b/src/plugins/shikiCodeblocks.desktop/api/themes.ts
index bc1dd184..4c2f8b68 100644
--- a/src/plugins/shikiCodeblocks.desktop/api/themes.ts
+++ b/src/plugins/shikiCodeblocks.desktop/api/themes.ts
@@ -19,8 +19,8 @@
 import { IShikiTheme } from "@vap/shiki";
 
 export const SHIKI_REPO = "shikijs/textmate-grammars-themes";
-export const SHIKI_REPO_COMMIT = "2d87559c7601a928b9f7e0f0dda243d2fb6d4499";
-export const shikiRepoTheme = (name: string) => `https://raw.githubusercontent.com/${SHIKI_REPO}/${SHIKI_REPO_COMMIT}/packages/tm-themes/themes/${name}.json`;
+export const SHIKI_REPO_COMMIT = "bc5436518111d87ea58eb56d97b3f9bec30e6b83";
+export const shikiRepoTheme = (name: string) => `https://cdn.jsdelivr.net/gh/${SHIKI_REPO}@${SHIKI_REPO_COMMIT}/packages/tm-themes/themes/${name}.json`;
 
 export const themes = {
     // Default
@@ -48,6 +48,12 @@ export const themes = {
     GithubLightDefault: shikiRepoTheme("github-light-default"),
     GithubLightHighContrast: shikiRepoTheme("github-light-high-contrast"),
     GithubLight: shikiRepoTheme("github-light"),
+    GruvBoxDarkHard: shikiRepoTheme("gruvbox-dark-hard"),
+    GruvBoxDarkMedium: shikiRepoTheme("gruvbox-dark-medium"),
+    GruvBoxDarkSoft: shikiRepoTheme("gruvbox-dark-soft"),
+    GruvBoxLightHard: shikiRepoTheme("gruvbox-light-hard"),
+    GruvBoxLightMedium: shikiRepoTheme("gruvbox-light-medium"),
+    GruvBoxLightSoft: shikiRepoTheme("gruvbox-light-soft"),
     Houston: shikiRepoTheme("houston"),
     KanagawaDragon: shikiRepoTheme("kanagawa-dragon"),
     KanagawaLotus: shikiRepoTheme("kanagawa-lotus"),
diff --git a/src/plugins/shikiCodeblocks.desktop/devicon.css b/src/plugins/shikiCodeblocks.desktop/devicon.css
index ed1014e3..be0893f0 100644
--- a/src/plugins/shikiCodeblocks.desktop/devicon.css
+++ b/src/plugins/shikiCodeblocks.desktop/devicon.css
@@ -1 +1 @@
-@import url("https://cdn.jsdelivr.net/gh/devicons/devicon@v2.10.1/devicon.min.css");
+@import url("https://cdn.jsdelivr.net/gh/devicons/devicon@v2.17.0/devicon.min.css");
\ No newline at end of file