feat: Linted and formatted the code

dm94 · Dec 3, 2024 · ba56a4d · ba56a4d
1 parent 3640641
commit ba56a4d
Show file tree

Hide file tree

Showing 62 changed files with 297 additions and 277 deletions.
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
diff --git a/biome.json b/biome.json
@@ -17,7 +17,7 @@
   "linter": {
     "enabled": true,
     "rules": {
-      "recommended": false,
+      "recommended": true,
       "complexity": {
         "noExtraBooleanCast": "error",
         "noMultipleSpacesInRegularExpressionLiterals": "error",

diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "stiletto-node-api",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "API for [Stiletto Web](https://github.com/dm94/stiletto-web)",
   "type": "module",
   "scripts": {
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
+    "lint": "biome lint --write ./src",
+    "format": "biome format --write ./src",
     "check:types": "tsc --noEmit",
     "build": "esbuild `find src \\( -name '*.ts' \\)` --platform=node --outdir=build --resolve-extensions=.js",
     "build:docker:prod": "docker build . -t my-fastify-app --build-arg APP_ENV=production",

diff --git a/src/plugins/config.ts b/src/plugins/config.ts
@@ -48,7 +48,7 @@ const configPlugin: FastifyPluginAsync = async (server) => {
   const validate = ajv.compile(ConfigSchema);
   const valid = validate(process.env);
   if (!valid) {
-    throw new Error('.env file validation failed - ' + JSON.stringify(validate.errors, null, 2));
+    throw new Error(`.env file validation failed - ${JSON.stringify(validate.errors, null, 2)}`);
   }
   server.decorate('config', process.env);
 };

diff --git a/src/routes/bot/clans/_discordid/index.ts b/src/routes/bot/clans/_discordid/index.ts
@@ -4,16 +4,16 @@ import {
   Error404Default,
   Error503Default,
 } from '@customtypes/errors';
-import { Permission, Permissions, PermissionsSchema } from '@customtypes/permissions';
-import { RelationshipInfo, RelationshipSchema } from '@customtypes/relationships';
-import {
+import { Permission, type Permissions, PermissionsSchema } from '@customtypes/permissions';
+import { type RelationshipInfo, RelationshipSchema } from '@customtypes/relationships';
+import type {
   GetDiscordServerRequest,
   KickFromClanRequest,
   LinkClanRequest,
 } from '@customtypes/requests/bot';
 import { hasPermissions } from '@services/permission';
 import { Type } from '@sinclair/typebox';
-import { FastifyPluginAsync } from 'fastify';
+import type { FastifyPluginAsync } from 'fastify';
 
 const routes: FastifyPluginAsync = async (server) => {
   server.post<LinkClanRequest>(
@@ -71,7 +71,7 @@ const routes: FastifyPluginAsync = async (server) => {
         'select users.discordID, users.clanid clanid, clans.leaderid from users, clans where users.clanid=clans.clanid and users.discordID=?',
         [memberId],
         (e, r) => {
-          if (r && r[0]) {
+          if (r?.[0]) {
             const clanId = r[0].clanid;
             const leaderId = r[0].leaderid;
 
@@ -156,7 +156,7 @@ const routes: FastifyPluginAsync = async (server) => {
         'select users.discordID, users.clanid from users, clans where users.clanid=clans.clanid and users.nickname=? and clans.discordid=?',
         [nick, serverDiscordId],
         (e, r) => {
-          if (r && r[0]) {
+          if (r?.[0]) {
             const clanId = r[0].clanid;
             const discordId = r[0].discordID;
 
@@ -167,14 +167,15 @@ const routes: FastifyPluginAsync = async (server) => {
               ]);
               server.mysql.query('update users set clanid=null where discordID=?', [discordId]);
               return reply.code(204).send();
-            } else {
-              return reply.code(401).send();
             }
-          } else if (e) {
+            return reply.code(401).send();
+          }
+
+          if (e) {
             return reply.code(503).send();
-          } else {
-            return reply.code(404).send();
           }
+
+          return reply.code(404).send();
         },
       );
     },

diff --git a/src/routes/bot/config/index.ts b/src/routes/bot/config/index.ts
@@ -1,13 +1,20 @@
-import { DiscordConfigBot, DiscordConfigBotSchema, Languages } from '@customtypes/discordconfig';
+import {
+  type DiscordConfigBot,
+  DiscordConfigBotSchema,
+  Languages,
+} from '@customtypes/discordconfig';
 import {
   Error400Default,
   Error401Default,
   Error404Default,
   Error503Default,
 } from '@customtypes/errors';
-import { GetDiscordServerRequest, UpdateBotConfigByServerRequest } from '@customtypes/requests/bot';
+import type {
+  GetDiscordServerRequest,
+  UpdateBotConfigByServerRequest,
+} from '@customtypes/requests/bot';
 import { Type } from '@sinclair/typebox';
-import { FastifyPluginAsync } from 'fastify';
+import type { FastifyPluginAsync } from 'fastify';
 
 const routes: FastifyPluginAsync = async (server) => {
   server.get<{ Reply: DiscordConfigBot[] }>(
@@ -31,7 +38,7 @@ const routes: FastifyPluginAsync = async (server) => {
         },
       },
     },
-    (request, reply) => {
+    (_request, reply) => {
       server.mysql.query(
         'select serverdiscordid, botlanguaje, readclanlog, automatickick, setnotreadypvp, walkeralarm from botconfigs',
         (err, result: DiscordConfigBot[]) => {
@@ -85,13 +92,13 @@ const routes: FastifyPluginAsync = async (server) => {
         'select serverdiscordid, botlanguaje, readclanlog, automatickick, setnotreadypvp, walkeralarm from botconfigs where serverdiscordid=?',
         [serverDiscordId],
         (err, result) => {
-          if (result && result[0]) {
+          if (result?.[0]) {
             return reply.code(200).send(result[0]);
-          } else if (err) {
+          }
+          if (err) {
             return reply.code(503).send();
-          } else {
-            return reply.code(404).send();
           }
+          return reply.code(404).send();
         },
       );
     },

diff --git a/src/routes/bot/index.ts b/src/routes/bot/index.ts
@@ -4,17 +4,17 @@ import {
   Error404Default,
   Error503Default,
 } from '@customtypes/errors';
-import { CreateTradefromBotRequest, GetWhoHasLearnRequest } from '@customtypes/requests/bot';
+import type { CreateTradefromBotRequest, GetWhoHasLearnRequest } from '@customtypes/requests/bot';
 import {
-  TechTreeInfo,
+  type TechTreeInfo,
   TechTreeSchema,
-  TechUserInfo,
+  type TechUserInfo,
   TechUserSchema,
   Tree,
 } from '@customtypes/techtree';
 import { TradeType } from '@customtypes/trades';
 import { Type } from '@sinclair/typebox';
-import { FastifyPluginAsync } from 'fastify';
+import type { FastifyPluginAsync } from 'fastify';
 
 const routes: FastifyPluginAsync = async (server) => {
   server.get<GetWhoHasLearnRequest, { Reply: TechUserInfo[] }>(
@@ -161,7 +161,7 @@ const routes: FastifyPluginAsync = async (server) => {
           'select discordTag from users where discordID=?',
           [request.params.discordid],
           (e, rows) => {
-            if (rows && rows[0] && rows[0].discordTag) {
+            if (rows?.[0]?.discordTag) {
               const discordtag = rows[0].discordTag;
 
               const techCollection = server.mongo.client.db('lastoasis').collection('tech');
@@ -175,9 +175,8 @@ const routes: FastifyPluginAsync = async (server) => {
                   techCollection.findOne({ discordtag: discordtag }).then((techTree) => {
                     if (techTree) {
                       return reply.code(200).send(techTree);
-                    } else {
-                      return reply.code(201).send();
                     }
+                    return reply.code(201).send();
                   });
                 });
             } else if (e) {

diff --git a/src/routes/bot/walkers/index.ts b/src/routes/bot/walkers/index.ts
@@ -1,12 +1,12 @@
 import { Error400Default, Error401Default, Error503Default } from '@customtypes/errors';
-import {
+import type {
   AddWalkerRequest,
   BotEditWalkerRequest,
   GetWalkersByServerRequest,
 } from '@customtypes/requests/bot';
-import { WalkerInfo, WalkerSchema, WalkerUse, WalkerType } from '@customtypes/walkers';
+import { type WalkerInfo, WalkerSchema, WalkerUse, WalkerType } from '@customtypes/walkers';
 import { Type } from '@sinclair/typebox';
-import { FastifyPluginAsync } from 'fastify';
+import type { FastifyPluginAsync } from 'fastify';
 
 const routes: FastifyPluginAsync = async (server) => {
   server.get<GetWalkersByServerRequest, { Reply: WalkerInfo[] }>(
@@ -155,7 +155,8 @@ const routes: FastifyPluginAsync = async (server) => {
         console.log('result', result);
         if (result) {
           return reply.code(200).send(result as WalkerInfo[]);
-        } else if (err) {
+        }
+        if (err) {
           console.log('err', err);
           return reply.code(503).send();
         }
@@ -225,7 +226,7 @@ const routes: FastifyPluginAsync = async (server) => {
         'select * from walkers where name=? and discorid=?',
         [name, discordid],
         (err, result) => {
-          if (result && result[0]) {
+          if (result?.[0]) {
             server.mysql.query(
               'update walkers set datelastuse=?, lastUser=?, walkerID=? where name=? and discorid=?',
               [date, lastuser, walkerid, name, discordid],

diff --git a/src/routes/clans/_clanid/discordbot/index.ts b/src/routes/clans/_clanid/discordbot/index.ts
@@ -1,8 +1,11 @@
-import { DiscordConfig, DiscordConfigSchema, Languages } from '@customtypes/discordconfig';
-import { GetDiscordConfigRequest, UpdateDiscordConfigRequest } from '@customtypes/requests/clans';
+import { type DiscordConfig, DiscordConfigSchema, Languages } from '@customtypes/discordconfig';
+import type {
+  GetDiscordConfigRequest,
+  UpdateDiscordConfigRequest,
+} from '@customtypes/requests/clans';
 import { Permission } from '@customtypes/permissions';
 import { Type } from '@sinclair/typebox';
-import { FastifyPluginAsync } from 'fastify';
+import type { FastifyPluginAsync } from 'fastify';
 import { addPermissions } from '@services/permission';
 import {
   Error400Default,
@@ -55,7 +58,7 @@ const routes: FastifyPluginAsync = async (server) => {
             'select serverdiscordid, botlanguaje, readclanlog, automatickick, setnotreadypvp, walkeralarm from botconfigs where serverdiscordid=?',
             request.dbuser.serverdiscord,
             (err, result) => {
-              if (result && result[0]) {
+              if (result?.[0]) {
                 return reply.code(200).send({
                   discordid: result[0].serverdiscordid,
                   botLanguaje: result[0].botlanguaje,
@@ -64,11 +67,11 @@ const routes: FastifyPluginAsync = async (server) => {
                   setNotReadyPVP: result[0].setnotreadypvp,
                   walkerAlarm: result[0].walkeralarm,
                 });
-              } else if (err) {
+              }
+              if (err) {
                 return reply.code(503).send();
-              } else {
-                return reply.code(404).send();
               }
+              return reply.code(404).send();
             },
           );
         } else {
@@ -85,7 +88,7 @@ const routes: FastifyPluginAsync = async (server) => {
     {
       onRequest: [
         server.authenticate,
-        (request, reply, done) => addPermissions(server, request, done),
+        (request, _reply, done) => addPermissions(server, request, done),
       ],
       schema: {
         description: ' Update the bot Config',
@@ -184,7 +187,8 @@ const routes: FastifyPluginAsync = async (server) => {
                 return reply.code(200).send({
                   message: 'Config updated',
                 });
-              } else if (err) {
+              }
+              if (err) {
                 return reply.code(503).send();
               }
             },

diff --git a/src/routes/clans/_clanid/index.ts b/src/routes/clans/_clanid/index.ts
@@ -1,14 +1,18 @@
-import { ClanInfo, ClanSchema } from '@customtypes/clans';
+import { type ClanInfo, ClanSchema } from '@customtypes/clans';
 import {
   Error400Default,
   Error401Default,
   Error404Default,
   Error405Default,
   Error503Default,
 } from '@customtypes/errors';
-import { DeleteClanRequest, GetClanRequest, UpdateClanRequest } from '@customtypes/requests/clans';
+import type {
+  DeleteClanRequest,
+  GetClanRequest,
+  UpdateClanRequest,
+} from '@customtypes/requests/clans';
 import { Type } from '@sinclair/typebox';
-import { FastifyPluginAsync } from 'fastify';
+import type { FastifyPluginAsync } from 'fastify';
 
 const routes: FastifyPluginAsync = async (server) => {
   server.get<GetClanRequest, { Reply: ClanInfo }>(
@@ -40,13 +44,13 @@ const routes: FastifyPluginAsync = async (server) => {
           'select clans.clanid, clans.name, clans.discordid, clans.leaderid, clans.invitelink, clans.recruitment, clans.flagcolor, clans.symbol, clans.region, users.discordTag from clans, users where clans.leaderid=users.discordID and clans.clanid=?',
           clanId,
           (err, result) => {
-            if (result && result[0]) {
+            if (result?.[0]) {
               return reply.code(200).send(result[0]);
-            } else if (err) {
+            }
+            if (err) {
               return reply.code(503).send();
-            } else {
-              return reply.code(404).send();
             }
+            return reply.code(404).send();
           },
         );
       } else {
@@ -162,7 +166,8 @@ const routes: FastifyPluginAsync = async (server) => {
               return reply.code(200).send({
                 message: 'Clan updated',
               });
-            } else if (err) {
+            }
+            if (err) {
               return reply.code(503).send();
             }
           },
@@ -249,9 +254,8 @@ const routes: FastifyPluginAsync = async (server) => {
         });
 
         return reply.code(204).send();
-      } else {
-        return reply.code(400).send();
       }
+      return reply.code(400).send();
     },
   );
 };

diff --git a/src/routes/clans/_clanid/members/_memberid/index.ts b/src/routes/clans/_clanid/members/_memberid/index.ts
@@ -6,18 +6,18 @@ import {
 } from '@customtypes/errors';
 import { MemberActions } from '@customtypes/members';
 import { Permission } from '@customtypes/permissions';
-import { GetMemberRequest } from '@customtypes/requests/members';
+import type { GetMemberRequest } from '@customtypes/requests/members';
 import { addPermissions } from '@services/permission';
 import { Type } from '@sinclair/typebox';
-import { FastifyPluginAsync } from 'fastify';
+import type { FastifyPluginAsync } from 'fastify';
 
 const routes: FastifyPluginAsync = async (server) => {
   server.put<GetMemberRequest>(
     '/',
     {
       onRequest: [
         server.authenticate,
-        (request, reply, done) => addPermissions(server, request, done),
+        (request, _reply, done) => addPermissions(server, request, done),
       ],
       schema: {
         description:
@@ -107,7 +107,8 @@ const routes: FastifyPluginAsync = async (server) => {
               return reply.code(202).send({
                 message: 'The change has been made correctly',
               });
-            } else if (err) {
+            }
+            if (err) {
               return reply.code(503).send();
             }
           },