Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions .github/workflows/github-languages.yml

This file was deleted.

19 changes: 0 additions & 19 deletions scripts/update-github-languages.mjs

This file was deleted.

43 changes: 15 additions & 28 deletions src/lib/services/home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { env } from "$env/dynamic/private";
import {
fetchPinnedGitHubProjects,
fetchGitHubContributions,
fetchGitHubCommitTotal,
fetchGitHubLanguages,
} from "$lib/services/github";
import languageSnapshot from "$lib/data/github-languages.json";
Expand Down Expand Up @@ -50,37 +51,23 @@ async function fetchVerifications() {
}
}

const LANGUAGE_SNAPSHOT_URL =
"https://raw.githubusercontent.com/ewanc26/website/data/github-languages.json";

type LanguageSnapshot = typeof languageSnapshot & { commits?: number | null };

const usable = (snap: LanguageSnapshot | null | undefined, username: string) =>
!!snap &&
snap.username?.toLowerCase() === username.toLowerCase() &&
Array.isArray(snap.languages) &&
snap.languages.length > 0;
type LanguageSnapshot = typeof languageSnapshot;

async function loadSnapshot(username: string) {
try {
const res = await fetch(LANGUAGE_SNAPSHOT_URL);
if (res.ok) {
const remote = (await res.json()) as LanguageSnapshot;
if (usable(remote, username)) {
return { languages: remote.languages, commits: remote.commits ?? null };
}
}
} catch {}
const token = env.GITHUB_TOKEN;
const bundled = languageSnapshot as LanguageSnapshot;
if (usable(bundled, username)) {
return { languages: bundled.languages, commits: bundled.commits ?? null };
}
const languages = await fetchGitHubLanguages(
username,
fetch,
env.GITHUB_TOKEN,
).catch(() => []);
return { languages, commits: null };
const hasBundled =
bundled.username?.toLowerCase() === username.toLowerCase() &&
bundled.languages.length > 0;
const [languages, commits] = await Promise.all([
hasBundled
? Promise.resolve(bundled.languages)
: fetchGitHubLanguages(username, fetch, token).catch(() => []),
token
? fetchGitHubCommitTotal(username, fetch, token).catch(() => null)
: Promise.resolve(null),
]);
return { languages, commits };
}

export async function getHomeData() {
Expand Down
Loading