diff --git a/.vscode/settings.json b/.vscode/settings.json index 4a841f7..25117cc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "github-enterprise.uri": "https://git.creations.works" + "github-enterprise.uri": "https://git.creations.works" } diff --git a/biome.json b/biome.json deleted file mode 100644 index 3c4d4f1..0000000 --- a/biome.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", - "vcs": { - "enabled": true, - "clientKind": "git", - "useIgnoreFile": false - }, - "files": { - "ignoreUnknown": false, - "ignore": [] - }, - "formatter": { - "enabled": true, - "indentStyle": "tab", - "lineEnding": "lf" - }, - "organizeImports": { - "enabled": true - }, - "linter": { - "enabled": true, - "rules": { - "recommended": true - } - }, - "javascript": { - "formatter": { - "quoteStyle": "double", - "indentStyle": "tab", - "lineEnding": "lf", - "jsxQuoteStyle": "double", - "semicolons": "always" - } - } -} diff --git a/config/environment.ts b/config/environment.ts index 239d2c3..c584b45 100644 --- a/config/environment.ts +++ b/config/environment.ts @@ -1,8 +1,9 @@ export const environment: Environment = { - port: Number.parseInt(process.env.PORT || "8080", 10), + port: parseInt(process.env.PORT || "8080", 10), host: process.env.HOST || "0.0.0.0", development: - process.env.NODE_ENV === "development" || process.argv.includes("--dev"), + process.env.NODE_ENV === "development" || + process.argv.includes("--dev"), }; export const lanyardConfig: LanyardConfig = { diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 0000000..d43df76 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,132 @@ +import pluginJs from "@eslint/js"; +import tseslintPlugin from "@typescript-eslint/eslint-plugin"; +import tsParser from "@typescript-eslint/parser"; +import prettier from "eslint-plugin-prettier"; +import promisePlugin from "eslint-plugin-promise"; +import simpleImportSort from "eslint-plugin-simple-import-sort"; +import unicorn from "eslint-plugin-unicorn"; +import unusedImports from "eslint-plugin-unused-imports"; +import globals from "globals"; + +/** @type {import('eslint').Linter.FlatConfig[]} */ +export default [ + { + files: ["**/*.{js,mjs,cjs}"], + languageOptions: { + globals: globals.node, + }, + ...pluginJs.configs.recommended, + plugins: { + "simple-import-sort": simpleImportSort, + "unused-imports": unusedImports, + promise: promisePlugin, + prettier: prettier, + unicorn: unicorn, + }, + rules: { + "eol-last": ["error", "always"], + "no-multiple-empty-lines": ["error", { max: 1, maxEOF: 1 }], + "no-mixed-spaces-and-tabs": ["error", "smart-tabs"], + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error", + "unused-imports/no-unused-imports": "error", + "unused-imports/no-unused-vars": [ + "warn", + { + vars: "all", + varsIgnorePattern: "^_", + args: "after-used", + argsIgnorePattern: "^_", + }, + ], + "promise/always-return": "error", + "promise/no-return-wrap": "error", + "promise/param-names": "error", + "promise/catch-or-return": "error", + "promise/no-nesting": "warn", + "promise/no-promise-in-callback": "warn", + "promise/no-callback-in-promise": "warn", + "prettier/prettier": [ + "error", + { + useTabs: true, + tabWidth: 4, + }, + ], + indent: ["error", "tab", { SwitchCase: 1 }], + "unicorn/filename-case": [ + "error", + { + case: "camelCase", + }, + ], + }, + }, + { + files: ["**/*.{ts,tsx}"], + languageOptions: { + parser: tsParser, + globals: globals.node, + }, + plugins: { + "@typescript-eslint": tseslintPlugin, + "simple-import-sort": simpleImportSort, + "unused-imports": unusedImports, + promise: promisePlugin, + prettier: prettier, + unicorn: unicorn, + }, + rules: { + ...tseslintPlugin.configs.recommended.rules, + quotes: ["error", "double"], + "eol-last": ["error", "always"], + "no-multiple-empty-lines": ["error", { max: 1, maxEOF: 1 }], + "no-mixed-spaces-and-tabs": ["error", "smart-tabs"], + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error", + "unused-imports/no-unused-imports": "error", + "unused-imports/no-unused-vars": [ + "warn", + { + vars: "all", + varsIgnorePattern: "^_", + args: "after-used", + argsIgnorePattern: "^_", + }, + ], + "promise/always-return": "error", + "promise/no-return-wrap": "error", + "promise/param-names": "error", + "promise/catch-or-return": "error", + "promise/no-nesting": "warn", + "promise/no-promise-in-callback": "warn", + "promise/no-callback-in-promise": "warn", + "prettier/prettier": [ + "error", + { + useTabs: true, + tabWidth: 4, + }, + ], + indent: ["error", "tab", { SwitchCase: 1 }], + "unicorn/filename-case": [ + "error", + { + case: "camelCase", + }, + ], + "@typescript-eslint/explicit-function-return-type": ["error"], + "@typescript-eslint/explicit-module-boundary-types": ["error"], + "@typescript-eslint/typedef": [ + "error", + { + arrowParameter: true, + variableDeclaration: true, + propertyDeclaration: true, + memberVariableDeclaration: true, + parameter: true, + }, + ], + }, + }, +]; diff --git a/package.json b/package.json index 793fe71..8d6e543 100644 --- a/package.json +++ b/package.json @@ -5,15 +5,24 @@ "scripts": { "start": "bun run src/index.ts", "dev": "bun run --hot src/index.ts --dev", - "lint": "bunx biome check", - "lint:fix": "bunx biome check --fix", + "lint": "eslint", + "lint:fix": "bun lint --fix", "cleanup": "rm -rf logs node_modules bun.lockdb" }, "devDependencies": { - "@biomejs/biome": "^1.9.4", + "@eslint/js": "^9.24.0", "@types/bun": "^1.2.8", "@types/ejs": "^3.1.5", - "globals": "^16.0.0" + "@typescript-eslint/eslint-plugin": "^8.29.0", + "@typescript-eslint/parser": "^8.29.0", + "eslint": "^9.24.0", + "eslint-plugin-prettier": "^5.2.6", + "eslint-plugin-promise": "^7.2.1", + "eslint-plugin-simple-import-sort": "^12.1.1", + "eslint-plugin-unicorn": "^58.0.0", + "eslint-plugin-unused-imports": "^4.1.4", + "globals": "^16.0.0", + "prettier": "^3.5.3" }, "peerDependencies": { "typescript": "^5.8.3" diff --git a/public/css/error.css b/public/css/error.css index 65dce6b..a8e591d 100644 --- a/public/css/error.css +++ b/public/css/error.css @@ -12,7 +12,7 @@ body { padding: 2rem; background: #1a1a1d; border-radius: 12px; - box-shadow: 0 0 20px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 20px rgba(0,0,0,0.3); } .error-title { font-size: 2rem; diff --git a/public/css/index.css b/public/css/index.css index 7a1a288..e4acc03 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -1,38 +1,7 @@ -:root { - --background: #0e0e10; - --card-bg: #1e1f22; - --card-hover-bg: #2a2a2d; - --border-color: #2e2e30; - - --text-color: #ffffff; - --text-subtle: #bbb; - --text-secondary: #b5bac1; - --text-muted: #888; - --link-color: #00b0f4; - - --status-online: #23a55a; - --status-idle: #f0b232; - --status-dnd: #e03e3e; - --status-offline: #747f8d; - --status-streaming: #b700ff; - - --progress-bg: #f23f43; - --progress-fill: #5865f2; - - --button-bg: #5865f2; - --button-hover-bg: #4752c4; - --button-disabled-bg: #2d2e31; - - --blockquote-color: #aaa; - --code-bg: #2e2e30; - - --readme-bg: #1a1a1d; -} - body { font-family: system-ui, sans-serif; - background-color: var(--background); - color: var(--text-color); + background-color: #0e0e10; + color: #ffffff; margin: 0; padding: 2rem; display: flex; @@ -83,30 +52,26 @@ body { width: 24px; height: 24px; border-radius: 50%; - border: 4px solid var(--background); + border: 4px solid #0e0e10; display: flex; align-items: center; justify-content: center; } .status-indicator.online { - background-color: var(--status-online); + background-color: #23a55a; } .status-indicator.idle { - background-color: var(--status-idle); + background-color: #f0b232; } .status-indicator.dnd { - background-color: var(--status-dnd); + background-color: #f23f43; } .status-indicator.offline { - background-color: var(--status-offline); -} - -.status-indicator.streaming { - background-color: var(--status-streaming); + background-color: #747f8d; } .platform-icon.mobile-only { @@ -126,12 +91,12 @@ body { h1 { font-size: 2.5rem; margin: 0; - color: var(--link-color); + color: #00b0f4; } .custom-status { font-size: 1.2rem; - color: var(--text-subtle); + color: #bbb; margin-top: 0.25rem; word-break: break-word; overflow-wrap: anywhere; @@ -142,6 +107,7 @@ h1 { flex-wrap: wrap; } + .custom-status .custom-emoji { width: 20px; height: 20px; @@ -176,14 +142,14 @@ ul { display: flex; flex-direction: row; gap: 1rem; - background-color: var(--card-bg); + background-color: #1e1f22; padding: 0.75rem 1rem; border-radius: 10px; - border: 1px solid var(--border-color); + box-shadow: 0 1px 0 0 #2e2e30; } .activity:hover { - background: var(--card-hover-bg); + background: #2a2a2d; } .activity-wrapper { @@ -198,28 +164,7 @@ ul { gap: 1rem; } -.activity-image-wrapper { - position: relative; - width: 80px; - height: 80px; -} - -.activity-image-small { - width: 25px; - height: 25px; - border-radius: 50%; - object-fit: cover; - flex-shrink: 0; - border-color: var(--card-bg); - border-width: 2px; - border-style: solid; - - position: absolute; - bottom: -6px; - right: -10px; -} - -.activity-image { +.activity-art { width: 80px; height: 80px; border-radius: 6px; @@ -257,17 +202,17 @@ ul { .activity-name { font-weight: 600; font-size: 1rem; - color: var(--text-color); + color: #fff; } .activity-detail { font-size: 0.875rem; - color: var(--text-secondary); + color: #b5bac1; } .activity-timestamp { font-size: 0.75rem; - color: var(--text-secondary); + color: #b5bac1; text-align: right; margin-left: auto; white-space: nowrap; @@ -275,14 +220,14 @@ ul { .progress-bar { height: 4px; - background-color: var(--border-color); + background-color: #2e2e30; border-radius: 2px; - margin-top: 1rem; + margin-top: 0.5rem; overflow: hidden; } .progress-fill { - background-color: var(--progress-fill); + background-color: #5865f2; transition: width 0.4s ease; height: 100%; } @@ -290,13 +235,14 @@ ul { .progress-bar, .progress-time-labels { width: 100%; + margin-top: 0.5rem; } .progress-time-labels { display: flex; justify-content: space-between; font-size: 0.75rem; - color: var(--text-muted); + color: #888; margin-top: 0.25rem; } @@ -310,7 +256,7 @@ ul { font-size: 0.75rem; text-transform: uppercase; font-weight: 600; - color: var(--blockquote-color); + color: #aaa; margin-bottom: 0.50rem; display: block; } @@ -321,7 +267,7 @@ ul { .progress-time-labels.paused .progress-current::after { content: " ⏸"; - color: var(--status-idle); + color: #f0b232; } .activity-buttons { @@ -332,7 +278,7 @@ ul { } .activity-button { - background-color: var(--progress-fill); + background-color: #5865f2; color: white; border: none; border-radius: 3px; @@ -345,12 +291,12 @@ ul { } .activity-button:hover { - background-color: var(--button-hover-bg); + background-color: #4752c4; text-decoration: none; } .activity-button:disabled { - background-color: var(--button-disabled-bg); + background-color: #2d2e31; cursor: not-allowed; opacity: 0.8; } @@ -379,13 +325,6 @@ ul { width: 100%; } - .activity-image-wrapper { - max-width: 100%; - max-height: 100%; - width: 100%; - height: 100%; - } - .avatar-wrapper { width: 96px; height: 96px; @@ -440,31 +379,21 @@ ul { align-items: center; text-align: center; padding: 1rem; - border-radius: 0; + border-radius:0; } - .activity-image { + .activity-art { width: 100%; - max-width: 100%; + max-width: 300px; height: auto; border-radius: 8px; } - .activity-image-small { - width: 40px; - height: 40px; - } - .activity-content { width: 100%; align-items: center; } - .activity-wrapper-inner { - flex-direction: column; - align-items: center; - } - .activity-header { flex-direction: column; align-items: center; @@ -501,12 +430,12 @@ ul { /* readme :p */ .readme { - max-width: 700px; + max-width: 600px; width: 100%; - background: var(--readme-bg); + background: #1a1a1d; padding: 1.5rem; border-radius: 8px; - border: 1px solid var(--border-color); + box-shadow: 0 0 0 1px #2e2e30; margin-top: 2rem; @@ -517,13 +446,13 @@ ul { .readme h2 { margin-top: 0; - color: var(--link-color); + color: #00b0f4; } .markdown-body { font-size: 1rem; line-height: 1.6; - color: var(--text-color); + color: #ddd; } .markdown-body h1, @@ -532,7 +461,7 @@ ul { .markdown-body h4, .markdown-body h5, .markdown-body h6 { - color: var(--text-color); + color: #ffffff; margin-top: 1.25rem; margin-bottom: 0.5rem; } @@ -542,7 +471,7 @@ ul { } .markdown-body a { - color: var(--link-color); + color: #00b0f4; text-decoration: none; } @@ -551,7 +480,7 @@ ul { } .markdown-body code { - background: var(--border-color); + background: #2e2e30; padding: 0.2em 0.4em; border-radius: 4px; font-family: monospace; @@ -559,7 +488,7 @@ ul { } .markdown-body pre { - background: var(--border-color); + background: #2e2e30; padding: 1rem; border-radius: 6px; overflow-x: auto; @@ -574,9 +503,9 @@ ul { } .markdown-body blockquote { - border-left: 4px solid var(--link-color); + border-left: 4px solid #00b0f4; padding-left: 1rem; - color: var(--blockquote-color); + color: #aaa; margin: 1rem 0; } diff --git a/public/js/index.js b/public/js/index.js index e6a9afe..35dbe32 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,3 +1,5 @@ +/* eslint-disable indent */ + const activityProgressMap = new Map(); function formatTime(ms) { @@ -21,19 +23,19 @@ function formatVerbose(ms) { function updateElapsedAndProgress() { const now = Date.now(); - for (const el of document.querySelectorAll(".activity-timestamp")) { + document.querySelectorAll(".activity-timestamp").forEach((el) => { const start = Number(el.dataset.start); - if (!start) continue; + if (!start) return; const elapsed = now - start; const display = el.querySelector(".elapsed"); if (display) display.textContent = `(${formatVerbose(elapsed)} ago)`; - } + }); - for (const bar of document.querySelectorAll(".progress-bar")) { + document.querySelectorAll(".progress-bar").forEach((bar) => { const start = Number(bar.dataset.start); const end = Number(bar.dataset.end); - if (!start || !end || end <= start) continue; + if (!start || !end || end <= start) return; const duration = end - start; const elapsed = Math.min(now - start, duration); @@ -44,12 +46,12 @@ function updateElapsedAndProgress() { const fill = bar.querySelector(".progress-fill"); if (fill) fill.style.width = `${progress}%`; - } + }); - for (const label of document.querySelectorAll(".progress-time-labels")) { + document.querySelectorAll(".progress-time-labels").forEach((label) => { const start = Number(label.dataset.start); const end = Number(label.dataset.end); - if (!start || !end || end <= start) continue; + if (!start || !end || end <= start) return; const isPaused = now > end; const current = isPaused ? end - start : Math.max(0, now - start); @@ -75,14 +77,14 @@ function updateElapsedAndProgress() { : formatTime(current); } if (totalEl) totalEl.textContent = formatTime(total); - } + }); } updateElapsedAndProgress(); setInterval(updateElapsedAndProgress, 1000); const head = document.querySelector("head"); -const userId = head?.dataset.userId; +let userId = head?.dataset.userId; let instanceUri = head?.dataset.instanceUri; if (userId && instanceUri) { @@ -130,25 +132,6 @@ if (userId && instanceUri) { }); } -function resolveActivityImage(img, applicationId) { - if (!img) return null; - - if (img.startsWith("mp:external/")) { - return `https://media.discordapp.net/external/${img.slice("mp:external/".length)}`; - } - - if (img.includes("/https/")) { - const clean = img.split("/https/")[1]; - return clean ? `https://${clean}` : null; - } - - if (img.startsWith("spotify:")) { - return `https://i.scdn.co/image/${img.split(":")[1]}`; - } - - return `https://cdn.discordapp.com/app-assets/${applicationId}/${img}.png`; -} - function buildActivityHTML(activity) { const start = activity.timestamps?.start; const end = activity.timestamps?.end; @@ -160,18 +143,18 @@ function buildActivityHTML(activity) { ? Math.min(100, Math.floor((elapsed / total) * 100)) : null; + const img = activity.assets?.large_image; let art = null; - let smallArt = null; - if (activity.assets) { - art = resolveActivityImage( - activity.assets.large_image, - activity.application_id, - ); - smallArt = resolveActivityImage( - activity.assets.small_image, - activity.application_id, - ); + if (img?.startsWith("mp:external/")) { + art = `https://media.discordapp.net/external/${img.slice("mp:external/".length)}`; + } else if (img?.includes("/https/")) { + const clean = img.split("/https/")[1]; + if (clean) art = `https://${clean}`; + } else if (img?.startsWith("spotify:")) { + art = `https://i.scdn.co/image/${img.split(":")[1]}`; + } else if (img) { + art = `https://cdn.discordapp.com/app-assets/${activity.application_id}/${img}.png`; } const activityTypeMap = { @@ -206,7 +189,10 @@ function buildActivityHTML(activity) { ? `