返回提交历史
Modified
src/controllers/api/giveStartingGearController.ts
+1
-1
Modified
src/controllers/api/inventoryController.ts
+0
-1
Modified
src/controllers/api/missionInventoryUpdateController.ts
+4
-2
Modified
src/controllers/api/trainingResultController.ts
+0
-5
Modified
src/controllers/api/updateInventoryController.ts
+6
-4
Modified
src/services/inventoryService.ts
+1
-11
Modified
src/services/missionInventoryUpdateService.ts
+1
-1
Modified
src/types/purchaseTypes.ts
+2
-10
XFEstudio/XFESpaceNinjaServer
fix lint
fd2027b0
代码差异
8 个文件
+15
-35
@@ -11,4 +11,4 @@ export const giveStartingGearController: RequestHandler = async (req, res) => {
11
11
console.log(req.query);
12
12
await inventory.save();
13
13
res.status(200);
14
};
14
};
@@ -4,7 +4,6 @@ import { toInventoryResponse } from "@/src/helpers/inventoryHelpers";
4
4
import { Inventory } from "@/src/models/inventoryModels/inventoryModel";
5
5
import { config } from "@/src/services/configService";
6
6
import { IInventoryDatabase } from "@/src/types/inventoryTypes/inventoryTypes";
7
import { ExportCustoms, ExportFlavour } from "warframe-public-export-plus";
8
7
9
8
// eslint-disable-next-line @typescript-eslint/no-misused-promises
10
9
const inventoryController: RequestHandler = async (request, response) => {
@@ -57,8 +57,10 @@ const missionInventoryUpdateController: RequestHandler = async (req, res): Promi
57
57
58
58
const { InventoryChanges, MissionRewards } = getRewards(lootInventory);
59
59
60
const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } =
61
combineRewardAndLootInventory(InventoryChanges, lootInventory);
60
const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } = combineRewardAndLootInventory(
61
InventoryChanges,
62
lootInventory
63
);
62
64
63
65
// eslint-disable-next-line @typescript-eslint/no-unused-vars
64
66
const InventoryJson = JSON.stringify(await missionInventoryUpdate(combinedInventoryChanges, accountId));
@@ -1,14 +1,9 @@
1
1
import { getAccountIdForRequest } from "@/src/services/loginService";
2
import { getJSONfromString } from "@/src/helpers/stringHelpers";
3
2
import { getInventory } from "@/src/services/inventoryService";
4
3
import { IMongoDate } from "@/src/types/commonTypes";
5
4
import { RequestHandler } from "express";
6
5
import { unixTimesInMs } from "@/src/constants/timeConstants";
7
6
8
interface ITrainingResultsRequest {
9
numLevelsGained: number;
10
}
11
12
7
interface ITrainingResultsResponse {
13
8
NewTrainingDate: IMongoDate;
14
9
NewLevel: number;
@@ -1,6 +1,6 @@
1
1
import { getAccountIdForRequest } from "@/src/services/loginService";
2
2
import { RequestHandler } from "express";
3
import { getInventory, missionInventoryUpdate } from "@/src/services/inventoryService";
3
import { missionInventoryUpdate } from "@/src/services/inventoryService";
4
4
import { combineRewardAndLootInventory } from "@/src/services/missionInventoryUpdateService";
5
5
import { getJSONfromString } from "@/src/helpers/stringHelpers";
6
6
import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes";
@@ -8,9 +8,11 @@ import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes";
8
8
// eslint-disable-next-line @typescript-eslint/no-misused-promises
9
9
export const updateInventoryController: RequestHandler = async (req, res) => {
10
10
const accountId = await getAccountIdForRequest(req);
11
const lootInventory = getJSONfromString(req.body.toString()) as IMissionInventoryUpdateRequest;
12
const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } =
13
combineRewardAndLootInventory(lootInventory, lootInventory);
11
const lootInventory = getJSONfromString(req.body as string) as IMissionInventoryUpdateRequest;
12
const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } = combineRewardAndLootInventory(
13
lootInventory,
14
lootInventory
15
);
14
16
15
17
await missionInventoryUpdate(combinedInventoryChanges, accountId);
16
18
@@ -694,17 +694,7 @@ const addMissionComplete = (inventory: IInventoryDatabaseDocument, { Tag, Comple
694
694
};
695
695
696
696
export const missionInventoryUpdate = async (data: IMissionInventoryUpdateRequest, accountId: string) => {
697
const {
698
RawUpgrades,
699
MiscItems,
700
RegularCredits,
701
ChallengeProgress,
702
FusionPoints,
703
Consumables,
704
Recipes,
705
Missions,
706
FusionTreasures
707
} = data;
697
const { RawUpgrades, MiscItems, RegularCredits, ChallengeProgress, Consumables, Recipes, Missions } = data;
708
698
const inventory = await getInventory(accountId);
709
699
710
700
// credits
@@ -86,7 +86,7 @@ const combineRewardAndLootInventory = (
86
86
combinedInventoryChanges: lootInventory,
87
87
TotalCredits: [totalCredits, totalCredits],
88
88
CreditsBonus: [creditsBonus, creditsBonus],
89
MissionCredits: [missionCredits, missionCredits],
89
MissionCredits: [missionCredits, missionCredits]
90
90
};
91
91
};
92
92
@@ -23,17 +23,9 @@ export type IBinChanges = {
23
23
Extra?: number;
24
24
};
25
25
26
export type SlotPurchaseName =
27
| "SuitSlotItem"
28
| "TwoSentinelSlotItem"
29
| "TwoWeaponSlotItem";
26
export type SlotPurchaseName = "SuitSlotItem" | "TwoSentinelSlotItem" | "TwoWeaponSlotItem";
30
27
31
export type SlotNames =
32
| "SuitBin"
33
| "WeaponBin"
34
| "MechBin"
35
| "PveBonusLoadoutBin"
36
| "SentinelBin";
28
export type SlotNames = "SuitBin" | "WeaponBin" | "MechBin" | "PveBonusLoadoutBin" | "SentinelBin";
37
29
38
30
export type SlotPurchase = {
39
31
[P in SlotPurchaseName]: { name: SlotNames; slotsPerPurchase: number };