Compare commits

...

3 Commits

Author SHA1 Message Date
973b1d4ca8 chore: delete PS field from requests
It clutters the logs, and we don’t use this field anyway
2025-09-20 10:34:33 +02:00
05fbefa7f4 fix: faithful response to startCollectibleEntry (#2796)
Closes #2795

Reviewed-on: OpenWF/SpaceNinjaServer#2796
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
2025-09-20 00:29:15 -07:00
a2abf6db8f fix(webui): get correct element for doAcquireCountItems (#2794)
Closes #2793

Reviewed-on: OpenWF/SpaceNinjaServer#2794
Reviewed-by: Sainan <63328889+sainan@users.noreply.github.com>
Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
2025-09-20 00:29:06 -07:00
6 changed files with 9 additions and 9 deletions

View File

@ -17,7 +17,7 @@ export const startCollectibleEntryController: RequestHandler = async (req, res)
IncentiveStates: request.other
});
await inventory.save();
res.status(200).end();
res.send(`target = ${request.target}key = 0key = 1{"Target":"${request.target}"}`);
};
interface IStartCollectibleEntryRequest {

View File

@ -2,7 +2,9 @@ import { JSONParse } from "json-with-bigint";
export const getJSONfromString = <T>(str: string): T => {
const jsonSubstring = str.substring(0, str.lastIndexOf("}") + 1);
return JSONParse(jsonSubstring) as T;
const obj = JSONParse(jsonSubstring) as T;
if (obj && typeof obj === "object" && "PS" in obj) delete obj.PS;
return obj;
};
export const getSubstringFromKeyword = (str: string, keyword: string): string => {

View File

@ -14,7 +14,6 @@ import type { ITypeCount } from "../types/commonTypes.ts";
export interface IUpdateQuestRequest {
QuestKeys: Omit<IQuestKeyDatabase, "CompletionDate">[];
PS: string;
questCompletion: boolean;
PlayerShipEvents: unknown[];
crossPlaySetting: string;

View File

@ -81,7 +81,6 @@ export type IMissionInventoryUpdateRequest = {
hosts: string[];
currentClients: unknown[];
ChallengeProgress: IChallengeProgress[];
PS: string;
ActiveDojoColorResearch: string;
RewardInfo?: IRewardInfo;
NemesisKillConvert?: {

View File

@ -108,9 +108,9 @@
<div class="card-body">
<div class="tab-content">
<div class="tab-pane" id="miscItems-tab-content">
<form class="card-body input-group" onsubmit="doAcquireCountItems('miscitem');return false;">
<input class="form-control" id="miscitem-count" type="number" value="1" />
<input class="form-control w-50" id="acquire-type-miscitem" list="datalist-miscitems" />
<form class="card-body input-group" onsubmit="doAcquireCountItems('miscitems');return false;">
<input class="form-control" id="miscitems-count" type="number" value="1" />
<input class="form-control w-50" id="acquire-type-miscitems" list="datalist-miscitems" />
<button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
</form>
</div>

View File

@ -2791,7 +2791,7 @@ function setEvolutionProgress(requests) {
}
function doAcquireCountItems(category) {
const uniqueName = getKey(document.getElementById(category + "-type"));
const uniqueName = getKey(document.getElementById("acquire-type-" + category));
if (!uniqueName) {
$(`#acquire-type-${category}`).addClass("is-invalid").focus();
return;
@ -2814,7 +2814,7 @@ function doAcquireCountItems(category) {
} else {
toast(loc("code_succRemoved"));
}
if (category != "miscitem") updateInventory();
if (category != "miscitems") updateInventory();
});
});
}