From 9f0317fed28fba2501a7deb0314f3966e921d8e1 Mon Sep 17 00:00:00 2001 From: Sainan Date: Mon, 6 May 2024 15:19:42 +0200 Subject: [PATCH] chore: resolve various eslint complaints (#169) --- package.json | 1 + src/controllers/api/addFriendImageController.ts | 2 +- src/controllers/api/claimCompletedRecipeController.ts | 2 +- src/controllers/api/createGuildController.ts | 6 +++--- src/controllers/api/findSessionsController.ts | 8 ++++---- src/controllers/api/hostSessionController.ts | 2 +- src/controllers/api/inventorySlotsController.ts | 2 +- src/controllers/api/joinSessionController.ts | 4 ++-- src/controllers/api/saveLoadout.ts | 1 - src/controllers/api/trainingResultController.ts | 1 - src/controllers/api/updateSessionController.ts | 1 - src/controllers/dynamic/worldStateController.ts | 1 - src/controllers/stats/viewController.ts | 2 +- src/helpers/purchaseHelpers.ts | 1 - src/helpers/stringHelpers.ts | 2 +- src/managers/sessionManager.ts | 2 +- src/middleware/middleware.ts | 2 +- src/models/inventoryModels/inventoryModel.ts | 2 +- src/models/shipModel.ts | 4 ++-- src/services/recipeService.ts | 2 +- src/types/guildTypes.ts | 3 --- src/types/inventoryTypes/inventoryTypes.ts | 1 - 22 files changed, 22 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index dc9459735..bb769968f 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "dev": "ts-node-dev --openssl-legacy-provider -r tsconfig-paths/register src/index.ts ", "build": "tsc", "lint": "eslint --ext .ts .", + "lint:fix": "eslint --fix --ext .ts .", "prettier": "prettier --write ." }, "license": "GNU", diff --git a/src/controllers/api/addFriendImageController.ts b/src/controllers/api/addFriendImageController.ts index f671493c8..a5a164c6d 100644 --- a/src/controllers/api/addFriendImageController.ts +++ b/src/controllers/api/addFriendImageController.ts @@ -6,7 +6,7 @@ import { getInventory } from "@/src/services/inventoryService"; const addFriendImageController: RequestHandler = async (req, res) => { const accountId = req.query.accountId as string; const json = getJSONfromString(req.body.toString()) as IUpdateGlyphRequest; - let inventory = await getInventory(accountId); + const inventory = await getInventory(accountId); inventory.ActiveAvatarImageType = json.AvatarImageType; await inventory.save(); res.json({}); diff --git a/src/controllers/api/claimCompletedRecipeController.ts b/src/controllers/api/claimCompletedRecipeController.ts index 02120194c..37a8536bf 100644 --- a/src/controllers/api/claimCompletedRecipeController.ts +++ b/src/controllers/api/claimCompletedRecipeController.ts @@ -1,7 +1,7 @@ //this is a controller for the claimCompletedRecipe route //it will claim a recipe for the user -import { Request, RequestHandler, Response } from "express"; +import { RequestHandler } from "express"; import { logger } from "@/src/utils/logger"; import { getItemByBlueprint, getItemCategoryByUniqueName } from "@/src/services/itemDataService"; import { IOid } from "@/src/types/commonTypes"; diff --git a/src/controllers/api/createGuildController.ts b/src/controllers/api/createGuildController.ts index c8828b03a..cb101aba7 100644 --- a/src/controllers/api/createGuildController.ts +++ b/src/controllers/api/createGuildController.ts @@ -5,16 +5,16 @@ import { Guild } from "@/src/models/guildModel"; import { IGuild, ICreateGuildRequest } from "@/src/types/guildTypes"; const createGuildController: RequestHandler = async (req, res) => { - let payload: ICreateGuildRequest = getJSONfromString(req.body.toString()); + const payload: ICreateGuildRequest = getJSONfromString(req.body.toString()); // Create guild on database - let guild = new Guild({ + const guild = new Guild({ Name: payload.guildName } satisfies IGuild); await guild.save(); // Update inventory - let inventory = await Inventory.findOne({ accountOwnerId: req.query.accountId }); + const inventory = await Inventory.findOne({ accountOwnerId: req.query.accountId }); if (inventory) { // Set GuildId inventory.GuildId = guild._id; diff --git a/src/controllers/api/findSessionsController.ts b/src/controllers/api/findSessionsController.ts index f69839104..c35b9607b 100644 --- a/src/controllers/api/findSessionsController.ts +++ b/src/controllers/api/findSessionsController.ts @@ -6,23 +6,23 @@ import { logger } from "@/src/utils/logger"; const findSessionsController: RequestHandler = (_req, res) => { const reqBody = JSON.parse(_req.body); logger.debug("FindSession Request ", { reqBody }); - let req = JSON.parse(_req.body); + const req = JSON.parse(_req.body); if (req.id != undefined) { logger.debug("Found ID"); - let session = getSession(req.id); + const session = getSession(req.id); if (session) res.json({ queryId: req.queryId, Sessions: session }); else res.json({}); } else if (req.originalSessionId != undefined) { logger.debug("Found OriginalSessionID"); - let session = getSession(req.originalSessionId); + const session = getSession(req.originalSessionId); if (session) res.json({ queryId: req.queryId, Sessions: session }); else res.json({}); } else { logger.debug("Found SessionRequest"); - let session = getSession(_req.body); + const session = getSession(_req.body); if (session) res.json({ queryId: req.queryId, Sessions: session }); else res.json({}); } diff --git a/src/controllers/api/hostSessionController.ts b/src/controllers/api/hostSessionController.ts index f602503e1..7adaee907 100644 --- a/src/controllers/api/hostSessionController.ts +++ b/src/controllers/api/hostSessionController.ts @@ -6,7 +6,7 @@ import { ISession } from "@/src/types/session"; const hostSessionController: RequestHandler = (req, res) => { const hostSessionRequest = JSON.parse(req.body as string) as ISession; logger.debug("HostSession Request", { hostSessionRequest }); - let session = createNewSession(hostSessionRequest, req.query.accountId as string); + const session = createNewSession(hostSessionRequest, req.query.accountId as string); logger.debug(`New Session Created`, { session }); res.json({ sessionId: { $oid: session.sessionId }, rewardSeed: 99999999 }); diff --git a/src/controllers/api/inventorySlotsController.ts b/src/controllers/api/inventorySlotsController.ts index 9da2751f5..ad2165a96 100644 --- a/src/controllers/api/inventorySlotsController.ts +++ b/src/controllers/api/inventorySlotsController.ts @@ -1,5 +1,5 @@ import { parseString } from "@/src/helpers/general"; -import { getInventory, updateCurrency } from "@/src/services/inventoryService"; +import { updateCurrency } from "@/src/services/inventoryService"; import { RequestHandler } from "express"; import { updateSlots } from "@/src/services/inventoryService"; import { SlotNameToInventoryName } from "@/src/types/purchaseTypes"; diff --git a/src/controllers/api/joinSessionController.ts b/src/controllers/api/joinSessionController.ts index 7bf6785c5..848376923 100644 --- a/src/controllers/api/joinSessionController.ts +++ b/src/controllers/api/joinSessionController.ts @@ -5,8 +5,8 @@ import { logger } from "@/src/utils/logger"; const joinSessionController: RequestHandler = (_req, res) => { const reqBody = JSON.parse(_req.body); logger.debug(`JoinSession Request`, { reqBody }); - let req = JSON.parse(_req.body); - let session = getSessionByID(req.sessionIds[0]); + const req = JSON.parse(_req.body); + const session = getSessionByID(req.sessionIds[0]); res.json({ rewardSeed: session?.rewardSeed, sessionId: { $oid: session?.sessionId } }); }; diff --git a/src/controllers/api/saveLoadout.ts b/src/controllers/api/saveLoadout.ts index 7d15593a0..3942a3ea4 100644 --- a/src/controllers/api/saveLoadout.ts +++ b/src/controllers/api/saveLoadout.ts @@ -1,5 +1,4 @@ import { RequestHandler } from "express"; -import util from "util"; import { ISaveLoadoutRequest } from "@/src/types/saveLoadoutTypes"; import { handleInventoryItemConfigChange } from "@/src/services/saveLoadoutService"; import { parseString } from "@/src/helpers/general"; diff --git a/src/controllers/api/trainingResultController.ts b/src/controllers/api/trainingResultController.ts index db2965bf7..09aa0fc61 100644 --- a/src/controllers/api/trainingResultController.ts +++ b/src/controllers/api/trainingResultController.ts @@ -1,6 +1,5 @@ import { parseString } from "@/src/helpers/general"; import { getJSONfromString } from "@/src/helpers/stringHelpers"; -import { Inventory } from "@/src/models/inventoryModels/inventoryModel"; import { getInventory } from "@/src/services/inventoryService"; import { IMongoDate } from "@/src/types/commonTypes"; import { RequestHandler } from "express"; diff --git a/src/controllers/api/updateSessionController.ts b/src/controllers/api/updateSessionController.ts index c6a5f555d..e949d83e8 100644 --- a/src/controllers/api/updateSessionController.ts +++ b/src/controllers/api/updateSessionController.ts @@ -1,6 +1,5 @@ import { RequestHandler } from "express"; import { updateSession } from "@/src/managers/sessionManager"; -import { logger } from "@/src/utils/logger"; const updateSessionGetController: RequestHandler = (_req, res) => { res.json({}); diff --git a/src/controllers/dynamic/worldStateController.ts b/src/controllers/dynamic/worldStateController.ts index 7bdc6a93a..5b4ead6bb 100644 --- a/src/controllers/dynamic/worldStateController.ts +++ b/src/controllers/dynamic/worldStateController.ts @@ -1,5 +1,4 @@ import { RequestHandler } from "express"; -import config from "@/config.json"; import worldState from "@/static/fixed_responses/worldState.json"; const worldStateController: RequestHandler = (_req, res) => { diff --git a/src/controllers/stats/viewController.ts b/src/controllers/stats/viewController.ts index 482e3fdef..822826113 100644 --- a/src/controllers/stats/viewController.ts +++ b/src/controllers/stats/viewController.ts @@ -5,7 +5,7 @@ import view from "@/static/fixed_responses/view.json"; import allScans from "@/static/fixed_responses/allScans.json"; const viewController: RequestHandler = (_req, res) => { - let responseJson: IStatsView = view; + const responseJson: IStatsView = view; if (config.unlockAllScans) { responseJson.Scans = allScans; } diff --git a/src/helpers/purchaseHelpers.ts b/src/helpers/purchaseHelpers.ts index 8eb82c17e..2b208221f 100644 --- a/src/helpers/purchaseHelpers.ts +++ b/src/helpers/purchaseHelpers.ts @@ -1,5 +1,4 @@ import { parseBoolean, parseNumber, parseString } from "@/src/helpers/general"; -import { weapons } from "@/src/services/itemDataService"; import { slotPurchaseNameToSlotName } from "@/src/services/purchaseService"; import { IPurchaseRequest, SlotPurchaseName } from "@/src/types/purchaseTypes"; diff --git a/src/helpers/stringHelpers.ts b/src/helpers/stringHelpers.ts index 75b421368..ea6e47ef4 100644 --- a/src/helpers/stringHelpers.ts +++ b/src/helpers/stringHelpers.ts @@ -1,4 +1,4 @@ -export const getJSONfromString = (str: string) => { +export const getJSONfromString = (str: string): any => { const jsonSubstring = str.substring(0, str.lastIndexOf("}") + 1); return JSON.parse(jsonSubstring); }; diff --git a/src/managers/sessionManager.ts b/src/managers/sessionManager.ts index 1138b3104..54fae2e5b 100644 --- a/src/managers/sessionManager.ts +++ b/src/managers/sessionManager.ts @@ -60,7 +60,7 @@ function getSession(sessionIdOrRequest: string | IFindSessionRequest): any[] { return []; } - const request = sessionIdOrRequest as IFindSessionRequest; + const request = sessionIdOrRequest; const matchingSessions = sessions.filter(session => { for (const key in request) { if (key !== "eloRating" && key !== "queryId" && request[key] !== session[key as keyof ISession]) { diff --git a/src/middleware/middleware.ts b/src/middleware/middleware.ts index 92a69de73..0a4066725 100644 --- a/src/middleware/middleware.ts +++ b/src/middleware/middleware.ts @@ -1,5 +1,5 @@ import { logger } from "@/src/utils/logger"; -import { NextFunction, Request, Response } from "express"; +import { /*NextFunction,*/ Request, Response } from "express"; const unknownEndpointHandler = (request: Request, response: Response) => { logger.error(`unknown endpoint ${request.method} ${request.path}`); diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index 547c56aa0..287ce62ee 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -38,7 +38,7 @@ import { IPeriodicMissionCompletionResponse, ILoreFragmentScan } from "../../types/inventoryTypes/inventoryTypes"; -import { IMongoDate, IOid } from "../../types/commonTypes"; +import { IOid } from "../../types/commonTypes"; import { ISuitDatabase } from "@/src/types/inventoryTypes/SuitTypes"; import { IWeaponDatabase } from "@/src/types/inventoryTypes/weaponTypes"; import { diff --git a/src/models/shipModel.ts b/src/models/shipModel.ts index cf2486a46..4b63bfb83 100644 --- a/src/models/shipModel.ts +++ b/src/models/shipModel.ts @@ -1,5 +1,5 @@ -import { Model, Schema, StringSchemaDefinition, Types, model } from "mongoose"; -import { IApartment, IPlacedDecosDatabase, IRooms, IShipDatabase } from "../types/shipTypes"; +import { Schema, model } from "mongoose"; +import { IShipDatabase } from "../types/shipTypes"; import { toOid } from "@/src/helpers/inventoryHelpers"; import { colorSchema } from "@/src/models/inventoryModels/inventoryModel"; import { IShipInventory } from "@/src/types/inventoryTypes/inventoryTypes"; diff --git a/src/services/recipeService.ts b/src/services/recipeService.ts index 8bfdcc930..953992f68 100644 --- a/src/services/recipeService.ts +++ b/src/services/recipeService.ts @@ -1,6 +1,6 @@ import { unixTimesInMs } from "@/src/constants/timeConstants"; import { getInventory } from "@/src/services/inventoryService"; -import { getItemByBlueprint, getItemCategoryByUniqueName } from "@/src/services/itemDataService"; +import { getItemByBlueprint } from "@/src/services/itemDataService"; import { logger } from "@/src/utils/logger"; import { Types } from "mongoose"; diff --git a/src/types/guildTypes.ts b/src/types/guildTypes.ts index 4e4e5f740..c5f1f6f2c 100644 --- a/src/types/guildTypes.ts +++ b/src/types/guildTypes.ts @@ -1,6 +1,3 @@ -import { Types } from "mongoose"; -import { IOid } from "@/src/types/commonTypes"; - export interface IGuild { Name: string; } diff --git a/src/types/inventoryTypes/inventoryTypes.ts b/src/types/inventoryTypes/inventoryTypes.ts index 99792a20a..86d2b008d 100644 --- a/src/types/inventoryTypes/inventoryTypes.ts +++ b/src/types/inventoryTypes/inventoryTypes.ts @@ -11,7 +11,6 @@ import { } from "@/src/types/inventoryTypes/commonInventoryTypes"; import { ISuitDatabase } from "@/src/types/inventoryTypes/SuitTypes"; import { IOperatorLoadOutSigcol, IWeaponDatabase } from "@/src/types/inventoryTypes/weaponTypes"; -import { Colour } from "warframe-items"; //Document extends will be deleted soon. TODO: delete and migrate uses to ... export interface IInventoryDatabaseDocument extends IInventoryDatabase, Document {}