chore(webui): unify Invigoration code

src/controllers/custom/editSuitInvigorationUpgradeController.ts

@@ -1,36 +0,0 @@
-import { getAccountIdForRequest } from "../../services/loginService.ts";
-import { getInventory } from "../../services/inventoryService.ts";
-import type { RequestHandler } from "express";
-import { broadcastInventoryUpdate } from "../../services/wsService.ts";
-
-const DEFAULT_UPGRADE_EXPIRY_MS = 7 * 24 * 60 * 60 * 1000; // 7 days
-
-export const editSuitInvigorationUpgradeController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const { oid, data } = req.body as {
-        oid: string;
-        data?: {
-            DefensiveUpgrade: string;
-            OffensiveUpgrade: string;
-            UpgradesExpiry?: number;
-        };
-    };
-    const inventory = await getInventory(accountId);
-    const suit = inventory.Suits.id(oid)!;
-    if (data) {
-        suit.DefensiveUpgrade = data.DefensiveUpgrade;
-        suit.OffensiveUpgrade = data.OffensiveUpgrade;
-        if (data.UpgradesExpiry) {
-            suit.UpgradesExpiry = new Date(data.UpgradesExpiry);
-        } else {
-            suit.UpgradesExpiry = new Date(Date.now() + DEFAULT_UPGRADE_EXPIRY_MS);
-        }
-    } else {
-        suit.DefensiveUpgrade = undefined;
-        suit.OffensiveUpgrade = undefined;
-        suit.UpgradesExpiry = undefined;
-    }
-    await inventory.save();
-    res.end();
-    broadcastInventoryUpdate(req);
-};

src/controllers/custom/setInvigorationController.ts

@@ -0,0 +1,27 @@
+import { getAccountIdForRequest } from "../../services/loginService.ts";
+import { getInventory } from "../../services/inventoryService.ts";
+import type { RequestHandler } from "express";
+import { broadcastInventoryUpdate } from "../../services/wsService.ts";
+
+export const setInvigorationController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const request = req.body as ISetInvigorationRequest;
+    const inventory = await getInventory(accountId, "Suits");
+    const suit = inventory.Suits.id(request.oid);
+    if (suit) {
+        const hasUpgrades = request.DefensiveUpgrade && request.OffensiveUpgrade && request.UpgradesExpiry;
+        suit.DefensiveUpgrade = hasUpgrades ? request.DefensiveUpgrade : undefined;
+        suit.OffensiveUpgrade = hasUpgrades ? request.OffensiveUpgrade : undefined;
+        suit.UpgradesExpiry = hasUpgrades ? new Date(request.UpgradesExpiry) : undefined;
+        await inventory.save();
+        broadcastInventoryUpdate(req);
+    }
+    res.end();
+};
+
+interface ISetInvigorationRequest {
+    oid: string;
+    DefensiveUpgrade: string;
+    OffensiveUpgrade: string;
+    UpgradesExpiry: number;
+}

src/routes/custom.ts

@@ -43,7 +43,7 @@ import { setBoosterController } from "../controllers/custom/setBoosterController
 import { updateFingerprintController } from "../controllers/custom/updateFingerprintController.ts";
 import { unlockLevelCapController } from "../controllers/custom/unlockLevelCapController.ts";
 import { changeModularPartsController } from "../controllers/custom/changeModularPartsController.ts";
-import { editSuitInvigorationUpgradeController } from "../controllers/custom/editSuitInvigorationUpgradeController.ts";
+import { setInvigorationController } from "../controllers/custom/setInvigorationController.ts";
 import { setAccountCheatController } from "../controllers/custom/setAccountCheatController.ts";
 import { setGuildCheatController } from "../controllers/custom/setGuildCheatController.ts";
 
@@ -92,7 +92,7 @@ customRouter.post("/setBooster", setBoosterController);
 customRouter.post("/updateFingerprint", updateFingerprintController);
 customRouter.post("/unlockLevelCap", unlockLevelCapController);
 customRouter.post("/changeModularParts", changeModularPartsController);
-customRouter.post("/editSuitInvigorationUpgrade", editSuitInvigorationUpgradeController);
+customRouter.post("/setInvigoration", setInvigorationController);
 customRouter.post("/setAccountCheat", setAccountCheatController);
 customRouter.post("/setGuildCheat", setGuildCheatController);
 

static/webui/index.html

@@ -719,12 +719,12 @@
                     </div>
                 </div>
                 <div id="edit-suit-invigorations-card" class="card mb-3 d-none">
-                    <h5 class="card-header" data-loc="detailedView_suitInvigorationLabel"></h5>
+                    <h5 class="card-header" data-loc="detailedView_invigorationLabel"></h5>
                     <div class="card-body">
-                        <form onsubmit="submitSuitInvigorationUpgrade(event)">
+                        <form onsubmit="submitInvigoration(event)">
                             <div class="mb-3">
-                                <label for="invigoration-offensive" class="form-label" data-loc="invigorations_offensiveLabel"></label>
+                                <label for="invigoration-offensive" class="form-label" data-loc="detailedView_invigorationOffensiveLabel"></label>
-                                <select class="form-select" id="dv-invigoration-offensive">
+                                <select class="form-select" id="invigoration-offensive">
                                     <option value="" data-loc="general_none"></option>
                                     <option value="/Lotus/Upgrades/Invigorations/Offensive/OffensiveInvigorationPowerStrength" data-loc="invigorations_offensive_AbilityStrength"></option>
                                     <option value="/Lotus/Upgrades/Invigorations/Offensive/OffensiveInvigorationPowerRange" data-loc="invigorations_offensive_AbilityRange"></option>
@@ -737,10 +737,9 @@
                                     <option value="/Lotus/Upgrades/Invigorations/Offensive/OffensiveInvigorationMeleeCritChance" data-loc="invigorations_offensive_MeleeCritChance"></option>
                                 </select>
                             </div>
-                            
                             <div class="mb-3">
-                                <label for="invigoration-defensive" class="form-label" data-loc="invigorations_defensiveLabel"></label>
+                                <label for="invigoration-defensive" class="form-label" data-loc="detailedView_invigorationUtilityLabel"></label>
-                                <select class="form-select" id="dv-invigoration-defensive">
+                                <select class="form-select" id="invigoration-defensive">
                                     <option value="" data-loc="general_none"></option>
                                     <option value="/Lotus/Upgrades/Invigorations/Utility/UtilityInvigorationPowerEfficiency" data-loc="invigorations_utility_AbilityEfficiency"></option>
                                     <option value="/Lotus/Upgrades/Invigorations/Utility/UtilityInvigorationMovementSpeed" data-loc="invigorations_utility_SprintSpeed"></option>
@@ -755,15 +754,13 @@
                                     <option value="/Lotus/Upgrades/Invigorations/Utility/UtilityInvigorationEnergyRegen" data-loc="invigorations_utility_EnergyRegen"></option>
                                 </select>
                             </div>
-                            
                             <div class="mb-3">
-                                <label for="invigoration-expiry" class="form-label" data-loc="invigorations_expiryLabel"></label>
+                                <label for="invigoration-expiry" class="form-label" data-loc="detailedView_invigorationExpiryLabel"></label>
-                                <input type="datetime-local" class="form-control" id="dv-invigoration-expiry" />
+                                <input type="datetime-local" class="form-control" max="2038-01-19T03:14" id="invigoration-expiry" onblur="this.value=new Date(this.value)>new Date(this.max)?new Date(this.max).toISOString().slice(0,16):this.value"/>
                             </div>
-                            
                             <div class="d-flex gap-2">
                                 <button type="submit" class="btn btn-primary" data-loc="general_setButton"></button>
-                                <button type="button" class="btn btn-danger" onclick="clearSuitInvigorationUpgrades()" data-loc="code_remove"></button>
+                                <button type="button" class="btn btn-danger" onclick="setInvigoration()" data-loc="code_remove"></button>
                             </div>
                         </form>
                     </div>

static/webui/script.js

@@ -1452,12 +1452,13 @@ function updateInventory() {
                             document.getElementById("crystals-list").appendChild(tr);
                         });
 
-                        document.getElementById("edit-suit-invigorations-card").classList.remove("d-none");
+                        {
-                        const { OffensiveUpgrade, DefensiveUpgrade, UpgradesExpiry } =
+                            document.getElementById("edit-suit-invigorations-card").classList.remove("d-none");
-                            suitInvigorationUpgradeData(item);
+                            document.getElementById("invigoration-offensive").value = item.OffensiveUpgrade || "";
-                        document.getElementById("dv-invigoration-offensive").value = OffensiveUpgrade;
+                            document.getElementById("invigoration-defensive").value = item.DefensiveUpgrade || "";
-                        document.getElementById("dv-invigoration-defensive").value = DefensiveUpgrade;
+                            document.getElementById("invigoration-expiry").value =
-                        document.getElementById("dv-invigoration-expiry").value = UpgradesExpiry;
+                                formatDatetime("%Y-%m-%d %H:%M", Number(item.UpgradesExpiry?.$date.$numberLong)) || "";
+                        }
 
                         {
                             document.getElementById("loadout-card").classList.remove("d-none");
@@ -3467,9 +3468,9 @@ function doBulkQuestUpdate(operation) {
     });
 }
 
-function toast(text) {
+function toast(text, type = "primary") {
     const toast = document.createElement("div");
-    toast.className = "toast align-items-center text-bg-primary border-0";
+    toast.className = `toast align-items-center text-bg-${type} border-0`;
     const div = document.createElement("div");
     div.className = "d-flex";
     const body = document.createElement("div");
@@ -4027,73 +4028,31 @@ function handleModularPartsChange(event) {
         });
     }
 }
-function suitInvigorationUpgradeData(suitData) {
-    let expiryDate = "";
-    if (suitData.UpgradesExpiry) {
-        if (suitData.UpgradesExpiry.$date) {
-            expiryDate = new Date(parseInt(suitData.UpgradesExpiry.$date.$numberLong));
-        } else if (typeof suitData.UpgradesExpiry === "number") {
-            expiryDate = new Date(suitData.UpgradesExpiry);
-        } else if (suitData.UpgradesExpiry instanceof Date) {
-            expiryDate = suitData.UpgradesExpiry;
-        }
-        if (expiryDate && !isNaN(expiryDate.getTime())) {
-            const year = expiryDate.getFullYear();
-            const month = String(expiryDate.getMonth() + 1).padStart(2, "0");
-            const day = String(expiryDate.getDate()).padStart(2, "0");
-            const hours = String(expiryDate.getHours()).padStart(2, "0");
-            const minutes = String(expiryDate.getMinutes()).padStart(2, "0");
-            expiryDate = `${year}-${month}-${day}T${hours}:${minutes}`;
-        } else {
-            expiryDate = "";
-        }
-    }
-    return {
-        oid: suitData.ItemId.$oid,
-        OffensiveUpgrade: suitData.OffensiveUpgrade || "",
-        DefensiveUpgrade: suitData.DefensiveUpgrade || "",
-        UpgradesExpiry: expiryDate
-    };
-}
 
-function submitSuitInvigorationUpgrade(event) {
+function submitInvigoration(event) {
     event.preventDefault();
-    const oid = new URLSearchParams(window.location.search).get("itemId");
+    const OffensiveUpgrade = document.getElementById("invigoration-offensive").value;
-    const offensiveUpgrade = document.getElementById("dv-invigoration-offensive").value;
+    const DefensiveUpgrade = document.getElementById("invigoration-defensive").value;
-    const defensiveUpgrade = document.getElementById("dv-invigoration-defensive").value;
+    const expiry = document.getElementById("invigoration-expiry").value;
-    const expiry = document.getElementById("dv-invigoration-expiry").value;
 
-    if (!offensiveUpgrade || !defensiveUpgrade) {
+    if (!OffensiveUpgrade || !DefensiveUpgrade) {
-        alert(loc("code_requiredInvigorationUpgrade"));
+        toast(loc("code_requiredInvigorationUpgrade"), "warning");
         return;
     }
 
-    const data = {
+    setInvigoration({
-        OffensiveUpgrade: offensiveUpgrade,
+        OffensiveUpgrade,
-        DefensiveUpgrade: defensiveUpgrade
+        DefensiveUpgrade,
-    };
+        UpgradesExpiry: expiry ? new Date(expiry).getTime() : Date.now() + 7 * 24 * 60 * 60 * 1000
-
+    });
-    if (expiry) {
-        data.UpgradesExpiry = new Date(expiry).getTime();
-    }
-
-    editSuitInvigorationUpgrade(oid, data);
 }
 
-function clearSuitInvigorationUpgrades() {
+function setInvigoration(data) {
-    editSuitInvigorationUpgrade(new URLSearchParams(window.location.search).get("itemId"), null);
+    const oid = new URLSearchParams(window.location.search).get("itemId");
-}
-
-async function editSuitInvigorationUpgrade(oid, data) {
-    /* data?: {
-            DefensiveUpgrade: string;
-            OffensiveUpgrade: string;
-            UpgradesExpiry?: number;
-    }*/
     $.post({
-        url: "/custom/editSuitInvigorationUpgrade?" + window.authz,
+        url: "/custom/setInvigoration?" + window.authz,
         contentType: "application/json",
-        data: JSON.stringify({ oid, data })
+        data: JSON.stringify({ oid, ...data })
     }).done(function () {
         updateInventory();
     });

static/webui/translations/de.js

@@ -147,7 +147,7 @@ dict = {
     detailedView_valenceBonusLabel: `Valenz-Bonus`,
     detailedView_valenceBonusDescription: `Du kannst den Valenz-Bonus deiner Waffe festlegen oder entfernen.`,
     detailedView_modularPartsLabel: `Modulare Teile ändern`,
-    detailedView_suitInvigorationLabel: `Warframe-Kräftigung`,
+    detailedView_invigorationLabel: `Kräftigung`,
     detailedView_loadoutLabel: `Loadouts`,
 
     invigorations_offensive_AbilityStrength: `+200% Fähigkeitsstärke`,
@@ -172,9 +172,9 @@ dict = {
     invigorations_utility_Jumps: `+5 Sprung-Zurücksetzungen`,
     invigorations_utility_EnergyRegen: `+2 Energieregeneration pro Sekunde`,
 
-    invigorations_offensiveLabel: `Offensives Upgrade`,
+    detailedView_invigorationOffensiveLabel: `Offensives Upgrade`,
-    invigorations_defensiveLabel: `Defensives Upgrade`,
+    detailedView_invigorationUtilityLabel: `[UNTRANSLATED] Utility Upgrade`,
-    invigorations_expiryLabel: `Upgrades Ablaufdatum (optional)`,
+    detailedView_invigorationExpiryLabel: `[UNTRANSLATED] Invigoration Expiry (optional)`,
 
     abilityOverride_label: `Fähigkeitsüberschreibung`,
     abilityOverride_onSlot: `auf Slot`,

static/webui/translations/en.js

@@ -146,7 +146,7 @@ dict = {
     detailedView_valenceBonusLabel: `Valence Bonus`,
     detailedView_valenceBonusDescription: `You can set or remove the Valence Bonus from your weapon.`,
     detailedView_modularPartsLabel: `Change Modular Parts`,
-    detailedView_suitInvigorationLabel: `Warframe Invigoration`,
+    detailedView_invigorationLabel: `Invigoration`,
     detailedView_loadoutLabel: `Loadouts`,
 
     invigorations_offensive_AbilityStrength: `+200% Ability Strength`,
@@ -171,9 +171,9 @@ dict = {
     invigorations_utility_Jumps: `+5 Jump Resets`,
     invigorations_utility_EnergyRegen: `+2 Energy Regen/s`,
 
-    invigorations_offensiveLabel: `Offensive Upgrade`,
+    detailedView_invigorationOffensiveLabel: `Offensive Upgrade`,
-    invigorations_defensiveLabel: `Defensive Upgrade`,
+    detailedView_invigorationUtilityLabel: `Utility Upgrade`,
-    invigorations_expiryLabel: `Upgrades Expiry (optional)`,
+    detailedView_invigorationExpiryLabel: `Invigoration Expiry (optional)`,
 
     abilityOverride_label: `Ability Override`,
     abilityOverride_onSlot: `on slot`,

static/webui/translations/es.js

@@ -147,7 +147,7 @@ dict = {
     detailedView_valenceBonusLabel: `Bonus de Valéncia`,
     detailedView_valenceBonusDescription: `Puedes establecer o quitar el bonus de valencia de tu arma.`,
     detailedView_modularPartsLabel: `Cambiar partes modulares`,
-    detailedView_suitInvigorationLabel: `Vigorización de Warframe`,
+    detailedView_invigorationLabel: `Fortalecimiento`,
     detailedView_loadoutLabel: `Equipamientos`,
 
     invigorations_offensive_AbilityStrength: `+200% Fuerza de Habilidad`,
@@ -172,9 +172,9 @@ dict = {
     invigorations_utility_Jumps: `+5 Restablecimientos de Salto`,
     invigorations_utility_EnergyRegen: `+2 Regeneración de Energía/s`,
 
-    invigorations_offensiveLabel: `Mejora Ofensiva`,
+    detailedView_invigorationOffensiveLabel: `Mejora Ofensiva`,
-    invigorations_defensiveLabel: `Mejora Defensiva`,
+    detailedView_invigorationUtilityLabel: `[UNTRANSLATED] Utility Upgrade`,
-    invigorations_expiryLabel: `Caducidad de Mejoras (opcional)`,
+    detailedView_invigorationExpiryLabel: `[UNTRANSLATED] Invigoration Expiry (optional)`,
 
     abilityOverride_label: `Intercambio de Habilidad`,
     abilityOverride_onSlot: `en el espacio`,

static/webui/translations/fr.js

@@ -147,7 +147,7 @@ dict = {
     detailedView_valenceBonusLabel: `Bonus de Valence`,
     detailedView_valenceBonusDescription: `Définir le Bonus Valence de l'arme.`,
     detailedView_modularPartsLabel: `Changer l'équipement modulaire`,
-    detailedView_suitInvigorationLabel: `Invigoration de Warframe`,
+    detailedView_invigorationLabel: `Dynamisation`,
     detailedView_loadoutLabel: `Équipements`,
 
     invigorations_offensive_AbilityStrength: `+200% de puissance de pouvoir`,
@@ -172,9 +172,9 @@ dict = {
     invigorations_utility_Jumps: `+5 réinitialisations de saut`,
     invigorations_utility_EnergyRegen: `+2 d'énergie régénérés/s`,
 
-    invigorations_offensiveLabel: `Amélioration offensive`,
+    detailedView_invigorationOffensiveLabel: `Amélioration offensive`,
-    invigorations_defensiveLabel: `Amélioration défensive`,
+    detailedView_invigorationUtilityLabel: `[UNTRANSLATED] Utility Upgrade`,
-    invigorations_expiryLabel: `Expiration de l'invigoration (optionnel)`,
+    detailedView_invigorationExpiryLabel: `[UNTRANSLATED] Invigoration Expiry (optional)`,
 
     abilityOverride_label: `Remplacement de pouvoir`,
     abilityOverride_onSlot: `Sur l'emplacement`,

static/webui/translations/ru.js

@@ -147,7 +147,7 @@ dict = {
     detailedView_valenceBonusLabel: `Бонус Валентности`,
     detailedView_valenceBonusDescription: `Вы можете установить или убрать бонус Валентности с вашего оружия.`,
     detailedView_modularPartsLabel: `Изменить модульные части`,
-    detailedView_suitInvigorationLabel: `Воодушевление Варфрейма`,
+    detailedView_invigorationLabel: `Воодушевление`,
     detailedView_loadoutLabel: `Конфигурации`,
 
     invigorations_offensive_AbilityStrength: `+200% к силе способностей.`,
@@ -172,9 +172,9 @@ dict = {
     invigorations_utility_Jumps: `+5 сбросов прыжка.`,
     invigorations_utility_EnergyRegen: `+2 к регенерации энергии в секунду.`,
 
-    invigorations_offensiveLabel: `Атакующее улучшение`,
+    detailedView_invigorationOffensiveLabel: `Атакующее улучшение`,
-    invigorations_defensiveLabel: `Вспомогательное улучшение`,
+    detailedView_invigorationUtilityLabel: `Вспомогательное улучшение`,
-    invigorations_expiryLabel: `Срок действия Воодушевления (необязательно)`,
+    detailedView_invigorationExpiryLabel: `Срок действия Воодушевления (необязательно)`,
 
     abilityOverride_label: `Переопределение способности`,
     abilityOverride_onSlot: `в ячейке`,

static/webui/translations/uk.js

@@ -147,7 +147,7 @@ dict = {
     detailedView_valenceBonusLabel: `Ознака Валентності`,
     detailedView_valenceBonusDescription: `Ви можете встановити або прибрати ознаку Валентності з вашої зброї.`,
     detailedView_modularPartsLabel: `Змінити модульні частини`,
-    detailedView_suitInvigorationLabel: `Зміцнення Ворфрейма`,
+    detailedView_invigorationLabel: `Зміцнення`,
     detailedView_loadoutLabel: `Конфігурації`,
 
     invigorations_offensive_AbilityStrength: `+200% до потужності здібностей.`,
@@ -172,9 +172,9 @@ dict = {
     invigorations_utility_Jumps: `+5 Оновлень стрибків.`,
     invigorations_utility_EnergyRegen: `+2 до відновлення енергії на секунду.`,
 
-    invigorations_offensiveLabel: `Атакуюче вдосконалення`,
+    detailedView_invigorationOffensiveLabel: `Атакуюче вдосконалення`,
-    invigorations_defensiveLabel: `Допоміжне вдосконалення`,
+    detailedView_invigorationUtilityLabel: `Допоміжне вдосконалення`,
-    invigorations_expiryLabel: `Термін дії Зміцнення (необов'язково)`,
+    detailedView_invigorationExpiryLabel: `Термін дії Зміцнення (необов'язково)`,
 
     abilityOverride_label: `Перевизначення здібностей`,
     abilityOverride_onSlot: `у комірці`,

static/webui/translations/zh.js

@@ -147,7 +147,7 @@ dict = {
     detailedView_valenceBonusLabel: `效价加成`,
     detailedView_valenceBonusDescription: `您可以设置或移除武器上的效价加成.`,
     detailedView_modularPartsLabel: `更换部件`,
-    detailedView_suitInvigorationLabel: `编辑战甲活化属性`,
+    detailedView_invigorationLabel: `活化`,
     detailedView_loadoutLabel: `配置`,
 
     invigorations_offensive_AbilityStrength: `+200%技能强度`,
@@ -172,9 +172,9 @@ dict = {
     invigorations_utility_Jumps: `+5跳跃次数`,
     invigorations_utility_EnergyRegen: `+2/秒能量恢复`,
 
-    invigorations_offensiveLabel: `进攻型属性`,
+    detailedView_invigorationOffensiveLabel: `进攻型属性`,
-    invigorations_defensiveLabel: `功能型属性`,
+    detailedView_invigorationUtilityLabel: `[UNTRANSLATED] Utility Upgrade`,
-    invigorations_expiryLabel: `活化时效(可选)`,
+    detailedView_invigorationExpiryLabel: `活化时效(可选)`,
 
     abilityOverride_label: `技能替换`,
     abilityOverride_onSlot: `槽位`,