From 3403d496b4efe4e3803bf2d27cbe0107eabd2917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis?= <97699850+janisslsm@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:21:09 +0300 Subject: [PATCH] fix lint --- src/app.ts | 12 +- src/controllers/api/getGuildController.ts | 6 +- src/controllers/api/inventoryController.ts | 12 +- src/controllers/api/loginController.ts | 4 +- src/controllers/api/tauntHistoryController.ts | 6 +- .../api/updateInventoryController.ts | 13 +- src/helpers/loginHelpers.ts | 7 +- src/models/inventoryModels/inventoryModel.ts | 124 +----------------- src/routes/api.ts | 14 +- src/routes/cache.ts | 1 - 10 files changed, 29 insertions(+), 170 deletions(-) diff --git a/src/app.ts b/src/app.ts index 178ef8d0..c388cd05 100644 --- a/src/app.ts +++ b/src/app.ts @@ -15,7 +15,7 @@ import { statsRouter } from "@/src/routes/stats"; import { webuiRouter } from "@/src/routes/webui"; import { connectDatabase } from "@/src/services/mongoService"; import { registerLogFileCreationListener } from "@/src/utils/logger"; -import * as zlib from 'zlib'; +import * as zlib from "zlib"; void registerLogFileCreationListener(); void connectDatabase(); @@ -23,17 +23,17 @@ void connectDatabase(); const app = express(); app.use(function (req, _res, next) { - var buffer: Buffer[] = [] - req.on('data', function (chunk: Buffer) { + const buffer: Buffer[] = []; + req.on("data", function (chunk: Buffer) { if (chunk !== undefined && chunk.length > 2 && chunk[0] == 0x1f && chunk[1] == 0x8b) { buffer.push(Buffer.from(chunk)); } }); - req.on('end', function () { + req.on("end", function () { zlib.gunzip(Buffer.concat(buffer), function (_err, dezipped) { - if (typeof dezipped != 'undefined') { - req.body = dezipped.toString('utf-8'); + if (typeof dezipped != "undefined") { + req.body = dezipped.toString("utf-8"); } next(); diff --git a/src/controllers/api/getGuildController.ts b/src/controllers/api/getGuildController.ts index 006968a9..45486f16 100644 --- a/src/controllers/api/getGuildController.ts +++ b/src/controllers/api/getGuildController.ts @@ -1,10 +1,6 @@ import { RequestHandler } from "express"; -import { Inventory } from "@/src/models/inventoryModels/inventoryModel"; -import { Guild } from "@/src/models/guildModel"; -import { getAccountIdForRequest } from "@/src/services/loginService"; -import { toOid } from "@/src/helpers/inventoryHelpers"; -const getGuildController: RequestHandler = async (_, res) => { +const getGuildController: RequestHandler = (_, res) => { res.json({}); }; diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index bb554d83..eb952b2f 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -3,13 +3,8 @@ import { getAccountIdForRequest } from "@/src/services/loginService"; import { toInventoryResponse } from "@/src/helpers/inventoryHelpers"; import { Inventory } from "@/src/models/inventoryModels/inventoryModel"; import { config } from "@/src/services/configService"; -import allDialogue from "@/static/fixed_responses/allDialogue.json"; -import allMissions from "@/static/fixed_responses/allMissions.json"; -import { ILoadoutDatabase } from "@/src/types/saveLoadoutTypes"; -import { IInventoryDatabase, IShipInventory, equipmentKeys } from "@/src/types/inventoryTypes/inventoryTypes"; -import { IPolarity, ArtifactPolarity } from "@/src/types/inventoryTypes/commonInventoryTypes"; -import { ExportCustoms, ExportFlavour, ExportKeys, ExportResources } from "warframe-public-export-plus"; -import { IFlavourItem } from "@/src/types/inventoryTypes/inventoryTypes"; +import { IInventoryDatabase } from "@/src/types/inventoryTypes/inventoryTypes"; +import { ExportCustoms, ExportFlavour } from "warframe-public-export-plus"; // eslint-disable-next-line @typescript-eslint/no-misused-promises const inventoryController: RequestHandler = async (request, response) => { @@ -90,11 +85,12 @@ const inventoryController: RequestHandler = async (request, response) => { response.json(inventoryResponse); }; +/* const addString = (arr: string[], str: string): void => { if (!arr.find(x => x == str)) { arr.push(str); } -}; +};*/ const getExpRequiredForMr = (rank: number): number => { if (rank <= 30) { diff --git a/src/controllers/api/loginController.ts b/src/controllers/api/loginController.ts index 7711c33f..0c4e2ea4 100644 --- a/src/controllers/api/loginController.ts +++ b/src/controllers/api/loginController.ts @@ -25,7 +25,7 @@ const loginController: RequestHandler = async (request, response) => { email: loginRequest.email, password: loginRequest.password, DisplayName: loginRequest.email.substring(0, loginRequest.email.indexOf("@")), - Nonce: nonce, + Nonce: nonce }); logger.debug("created new account"); // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -55,7 +55,7 @@ const loginController: RequestHandler = async (request, response) => { if (account.Nonce == 0 || loginRequest.ClientType != "webui") { account.Nonce = nonce; } - + await account.save(); const { email, password, ...databaseAccount } = account.toJSON(); diff --git a/src/controllers/api/tauntHistoryController.ts b/src/controllers/api/tauntHistoryController.ts index 91350732..8081dc98 100644 --- a/src/controllers/api/tauntHistoryController.ts +++ b/src/controllers/api/tauntHistoryController.ts @@ -8,8 +8,7 @@ import { logger } from "@/src/utils/logger"; export const tauntHistoryController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); const inventory = await getInventory(accountId); - if(req.body !== undefined) - { + if (req.body !== undefined) { const clientTaunt = JSON.parse(String(req.body)) as ITaunt; logger.debug(`updating taunt ${clientTaunt.node} to state ${clientTaunt.state}`); inventory.TauntHistory ??= []; @@ -21,8 +20,7 @@ export const tauntHistoryController: RequestHandler = async (req, res) => { } await inventory.save(); res.end(); - }else - { + } else { res.json({}); } }; diff --git a/src/controllers/api/updateInventoryController.ts b/src/controllers/api/updateInventoryController.ts index 1357eb8b..2b3d8634 100644 --- a/src/controllers/api/updateInventoryController.ts +++ b/src/controllers/api/updateInventoryController.ts @@ -1,25 +1,20 @@ import { getAccountIdForRequest } from "@/src/services/loginService"; -import { getJSONfromString } from "@/src/helpers/stringHelpers"; -import { startRecipe } from "@/src/services/recipeService"; -import { logger } from "@/src/utils/logger"; import { RequestHandler } from "express"; import { getInventory } from "@/src/services/inventoryService"; - // eslint-disable-next-line @typescript-eslint/no-misused-promises export const updateInventoryController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); - const body = JSON.parse(req.body); + const body: any = JSON.parse(req.body as string); const inventory = await getInventory(accountId); - inventory.Missions.push({Tag: body.Missions.Tag, Completes: body.Missions.Completes, BestRating: 0.2 }) + inventory.Missions.push({ Tag: body.Missions.Tag, Completes: body.Missions.Completes, BestRating: 0.2 }); await inventory.save(); console.log(body); - res.json({}) + res.json({}); }; - /* { "LongGuns" : [ @@ -148,4 +143,4 @@ export const updateInventoryController: RequestHandler = async (req, res) => { } } } -*/ \ No newline at end of file +*/ diff --git a/src/helpers/loginHelpers.ts b/src/helpers/loginHelpers.ts index 49e20a99..15104122 100644 --- a/src/helpers/loginHelpers.ts +++ b/src/helpers/loginHelpers.ts @@ -1,5 +1,5 @@ import { ILoginRequest } from "@/src/types/loginTypes"; -import { parseEmail, parseNumber, parseString } from "./general"; +import { parseEmail, parseString } from "./general"; const toLoginRequest = (loginRequest: unknown): ILoginRequest => { if (!loginRequest || typeof loginRequest !== "object") { @@ -7,10 +7,7 @@ const toLoginRequest = (loginRequest: unknown): ILoginRequest => { } // TODO: function that checks whether every field of interface is in object - if ( - "email" in loginRequest && - "password" in loginRequest - ) { + if ("email" in loginRequest && "password" in loginRequest) { return { email: parseEmail(loginRequest.email), password: parseString(loginRequest.password) diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index d22b9cbe..cabb89da 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -13,30 +13,18 @@ import { IPendingRecipe as IPendingRecipeDatabase, IPendingRecipeResponse, ITypeCount, - IFocusXP, - IFocusUpgrades, ITypeXPItem, IChallengeProgress, IStepSequencer, - IAffiliation, INotePacks, - ICompletedJobChain, - ISeasonChallenge, IPlayerSkills, ISettings, - IInfestedFoundry, - IConsumedSuit, IQuestProgress, IQuestKeyDatabase, IQuestKeyResponse, - IFusionTreasure, - ISpectreLoadout, IWeaponSkinDatabase, - ITaunt, IPeriodicMissionCompletionDatabase, - IPeriodicMissionCompletionResponse, - ILoreFragmentScan, - IEvolutionProgress + IPeriodicMissionCompletionResponse } from "../../types/inventoryTypes/inventoryTypes"; import { IOid } from "../../types/commonTypes"; import { @@ -53,26 +41,6 @@ import { toMongoDate, toOid } from "@/src/helpers/inventoryHelpers"; const typeCountSchema = new Schema({ ItemType: String, ItemCount: Number }, { _id: false }); -const focusXPSchema = new Schema( - { - AP_POWER: Number, - AP_TACTIC: Number, - AP_DEFENSE: Number, - AP_ATTACK: Number, - AP_WARD: Number - }, - { _id: false } -); - -const focusUpgradesSchema = new Schema( - { - ItemType: String, - Level: Number, - IsUniversal: Boolean - }, - { _id: false } -); - const pendingRecipeSchema = new Schema( { ItemType: String, @@ -394,34 +362,6 @@ StepSequencersSchema.set("toJSON", { } }); -const affiliationsSchema = new Schema( - { - Initiated: Boolean, - Standing: Number, - Title: Number, - FreeFavorsEarned: { type: [Number], default: undefined }, - FreeFavorsUsed: { type: [Number], default: undefined }, - Tag: String - }, - { _id: false } -); - -const completedJobChainsSchema = new Schema( - { - LocationTag: String, - Jobs: [String] - }, - { _id: false } -); - -const seasonChallengeHistorySchema = new Schema( - { - challenge: String, - id: String - }, - { _id: false } -); - //TODO: check whether this is complete const playerSkillsSchema = new Schema( { @@ -449,25 +389,6 @@ const settingsSchema = new Schema({ TradingRulesConfirmed: Boolean }); -const consumedSchuitsSchema = new Schema({ - s: String, - c: colorSchema -}); - -const infestedFoundrySchema = new Schema( - { - Name: String, - Resources: { type: [typeCountSchema], default: undefined }, - Slots: Number, - XP: Number, - ConsumedSuits: { type: [consumedSchuitsSchema], default: undefined }, - InvigorationIndex: Number, - InvigorationSuitOfferings: { type: [String], default: undefined }, - InvigorationsApplied: Number - }, - { _id: false } -); - const questProgressSchema = new Schema({ c: Number, i: Boolean, @@ -499,21 +420,6 @@ questKeysSchema.set("toJSON", { } }); -const fusionTreasuresSchema = new Schema().add(typeCountSchema).add({ Sockets: Number }); - -const spectreLoadoutsSchema = new Schema( - { - LongGuns: String, - Melee: String, - Pistols: String, - PistolsFeatures: Number, - PistolsModularParts: [String], - Suits: String, - ItemType: String - }, - { _id: false } -); - const weaponSkinsSchema = new Schema( { ItemType: String @@ -533,14 +439,6 @@ weaponSkinsSchema.set("toJSON", { } }); -const tauntSchema = new Schema( - { - node: String, - state: String - }, - { _id: false } -); - const periodicMissionCompletionsSchema = new Schema( { date: Date, @@ -560,24 +458,6 @@ periodicMissionCompletionsSchema.set("toJSON", { } }); -const loreFragmentScansSchema = new Schema( - { - Progress: Number, - Region: String, - ItemType: String - }, - { _id: false } -); - -const evolutionProgressSchema = new Schema( - { - Progress: Number, - Rank: Number, - ItemType: String - }, - { _id: false } -); - const inventorySchema = new Schema( { accountOwnerId: Schema.Types.ObjectId, @@ -656,7 +536,6 @@ const inventorySchema = new Schema( //Id CompletedAlerts CompletedAlerts: [String], - //Resource,Credit,Affinity etc or Bless any boosters Boosters: [boosterSchema], @@ -687,7 +566,6 @@ const inventorySchema = new Schema( //TradeBannedUntil data TradeBannedUntil: Schema.Types.Mixed, - //Unknown and system Mailbox: MailboxSchema, HandlerPoints: Number, diff --git a/src/routes/api.ts b/src/routes/api.ts index 0e1bac59..25f6b0c0 100644 --- a/src/routes/api.ts +++ b/src/routes/api.ts @@ -101,16 +101,16 @@ apiRouter.get("/setSupportedSyndicate.php", setSupportedSyndicateController); apiRouter.get("/surveys.php", surveysController); apiRouter.get("/updateSession.php", updateSessionGetController); -apiRouter.get('/getMessages.php', (_, response) => { +apiRouter.get("/getMessages.php", (_, response) => { response.json({}); -}) -apiRouter.get('/trainingResult.php', (_, response) => { +}); +apiRouter.get("/trainingResult.php", (_, response) => { response.status(200); -}) -apiRouter.get('/giveStartingGear.php', (_, response) => { +}); +apiRouter.get("/giveStartingGear.php", (_, response) => { response.status(200); -}) -apiRouter.get('/worldState.php', worldStateController); +}); +apiRouter.get("/worldState.php", worldStateController); // post apiRouter.post("/addFriendImage.php", addFriendImageController); apiRouter.post("/artifacts.php", artifactsController); diff --git a/src/routes/cache.ts b/src/routes/cache.ts index c3663c96..7176c8d9 100644 --- a/src/routes/cache.ts +++ b/src/routes/cache.ts @@ -12,7 +12,6 @@ cacheRouter.get("/B.Cache.Windows_en.bin*", (_req, res) => { res.sendFile("static/data/B.Cache.Windows_en_33.0.10.bin", { root: "./" }); }); - cacheRouter.get("/H.Cache.bin!03_---------------------w", (_req, res) => { res.sendFile(`static/data/H.Cache.bin`, { root: "./" }); });