From a11f3c04096f9019ce0cee11e853ea98d92afc45 Mon Sep 17 00:00:00 2001 From: CyberL1 Date: Tue, 12 Nov 2024 13:48:52 +0100 Subject: [PATCH] fix: return user profile theme colors as numbers --- .eslintrc | 14 --------- eslint.config.mjs | 45 +++++++++++++++++++++++++++++ package-lock.json | 38 ++++++++++++++++++++---- package.json | 3 ++ src/api/routes/users/#id/profile.ts | 4 +-- 5 files changed, 82 insertions(+), 22 deletions(-) delete mode 100644 .eslintrc create mode 100644 eslint.config.mjs diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 40eac134..00000000 --- a/.eslintrc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"], - "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint"], - "root": true, - "rules": { - "no-mixed-spaces-and-tabs": "off", - "@typescript-eslint/no-inferrable-types": "off", // Required by typeorm - "@typescript-eslint/no-var-requires": "off" // Sometimes requred by typeorm to resolve circular deps - }, - "env": { - "node": true - } -} diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 00000000..0d6cfbba --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,45 @@ +import typescriptEslint from "@typescript-eslint/eslint-plugin"; +import globals from "globals"; +import tsParser from "@typescript-eslint/parser"; +import path from "node:path"; +import { fileURLToPath } from "node:url"; +import js from "@eslint/js"; +import { FlatCompat } from "@eslint/eslintrc"; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); +const compat = new FlatCompat({ + baseDirectory: __dirname, + recommendedConfig: js.configs.recommended, + allConfig: js.configs.all +}); + +export default [{ + ignores: [ + "**/node_modules", + "**/dist", + "**/README.md", + "**/COPYING", + "src/webrtc", + "**/scripts/", + "**/assets", + ], +}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), { + plugins: { + "@typescript-eslint": typescriptEslint, + }, + + languageOptions: { + globals: { + ...globals.node, + }, + + parser: tsParser, + }, + + rules: { + "no-mixed-spaces-and-tabs": "off", + "@typescript-eslint/no-inferrable-types": "off", + "@typescript-eslint/no-var-requires": "off", + }, +}]; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9d91c0e6..c8f04aa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,6 +53,8 @@ "ws": "^8.18.0" }, "devDependencies": { + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "^9.14.0", "@types/amqplib": "^0.10.5", "@types/bcrypt": "^5.0.2", "@types/body-parser": "^1.19.5", @@ -76,6 +78,7 @@ "@typescript-eslint/parser": "^8.12.2", "eslint": "^9.13.0", "express": "^4.21.1", + "globals": "^15.12.0", "husky": "^9.1.6", "prettier": "^3.3.3", "pretty-quick": "^4.0.0", @@ -1249,6 +1252,19 @@ "concat-map": "0.0.1" } }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1270,9 +1286,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.13.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz", - "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==", + "version": "9.14.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz", + "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==", "dev": true, "license": "MIT", "engines": { @@ -5878,6 +5894,16 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/@eslint/js": { + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz", + "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/eslint/node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -6735,9 +6761,9 @@ } }, "node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "version": "15.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.12.0.tgz", + "integrity": "sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index b87dc6fc..c2f3536d 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,8 @@ }, "homepage": "https://spacebar.chat", "devDependencies": { + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "^9.14.0", "@types/amqplib": "^0.10.5", "@types/bcrypt": "^5.0.2", "@types/body-parser": "^1.19.5", @@ -61,6 +63,7 @@ "@typescript-eslint/parser": "^8.12.2", "eslint": "^9.13.0", "express": "^4.21.1", + "globals": "^15.12.0", "husky": "^9.1.6", "prettier": "^3.3.3", "pretty-quick": "^4.0.0", diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts index 44271cad..ffae3b17 100644 --- a/src/api/routes/users/#id/profile.ts +++ b/src/api/routes/users/#id/profile.ts @@ -82,7 +82,7 @@ router.get( ? await Member.findOneOrFail({ where: { id: req.params.id, guild_id: guild_id }, relations: ["roles"], - }) + }) : undefined; // TODO: make proper DTO's in util? @@ -92,7 +92,7 @@ router.get( accent_color: user.accent_color, banner: user.banner, pronouns: user.pronouns, - theme_colors: user.theme_colors, + theme_colors: user.theme_colors?.map((t) => Number(t)), // these are strings for some reason, they should be numbers }; const guildMemberProfile = {