From b635147020ef13d1cd8dc334b27bd56a5bf3b4da Mon Sep 17 00:00:00 2001 From: Sainan Date: Thu, 20 Jun 2024 00:52:37 +0200 Subject: [PATCH 1/6] fix: LastInventorySync --- src/models/inventoryModels/inventoryModel.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index 2dc26ef8..775ac280 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -888,7 +888,7 @@ const inventorySchema = new Schema( ChallengesFixVersion: Number, PlayedParkourTutorial: Boolean, SubscribedToEmailsPersonalized: Number, - LastInventorySync: Schema.Types.Mixed, + LastInventorySync: Schema.Types.ObjectId, ActiveLandscapeTraps: [Schema.Types.Mixed], RepVotes: [Schema.Types.Mixed], LeagueTickets: [Schema.Types.Mixed], @@ -914,7 +914,7 @@ const inventorySchema = new Schema( //Grustag three DeathSquadable: Boolean }, - { timestamps: { createdAt: "Created", updatedAt: "LastInventorySync" } } + { timestamps: { createdAt: "Created" } } ); inventorySchema.set("toJSON", { -- 2.47.2 From b54ac3c90cd2166de4d6dd44d9fe2f33dbb32f11 Mon Sep 17 00:00:00 2001 From: Sainan Date: Thu, 20 Jun 2024 01:20:16 +0200 Subject: [PATCH 2/6] looks like mongoose doesn't like this change --- src/models/inventoryModels/inventoryModel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index 775ac280..76ef9edf 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -888,7 +888,7 @@ const inventorySchema = new Schema( ChallengesFixVersion: Number, PlayedParkourTutorial: Boolean, SubscribedToEmailsPersonalized: Number, - LastInventorySync: Schema.Types.ObjectId, + LastInventorySync: Schema.Types.Mixed, // this should be Schema.Types.ObjectId, but older inventories may break with that. ActiveLandscapeTraps: [Schema.Types.Mixed], RepVotes: [Schema.Types.Mixed], LeagueTickets: [Schema.Types.Mixed], -- 2.47.2 From fdc1faa8cb8c9f701c25a09bed688295abc83230 Mon Sep 17 00:00:00 2001 From: Sainan Date: Thu, 20 Jun 2024 04:04:41 +0200 Subject: [PATCH 3/6] fix: type of EmailItems --- src/types/inventoryTypes/inventoryTypes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/inventoryTypes/inventoryTypes.ts b/src/types/inventoryTypes/inventoryTypes.ts index 28423edb..298ac010 100644 --- a/src/types/inventoryTypes/inventoryTypes.ts +++ b/src/types/inventoryTypes/inventoryTypes.ts @@ -170,7 +170,7 @@ export interface IInventoryResponse { SpectreLoadouts: ISpectreLoadout[]; SentinelWeapons: IEquipmentDatabase[]; Sentinels: IEquipmentDatabase[]; - EmailItems: ITypeXPItem[]; + EmailItems: ITypeCount[]; CompletedSyndicates: string[]; FocusXP: IFocusXP; Wishlist: string[]; -- 2.47.2 From 25f0a874f74f400e381c7b18740a7813a0836653 Mon Sep 17 00:00:00 2001 From: Sainan Date: Thu, 20 Jun 2024 04:04:49 +0200 Subject: [PATCH 4/6] fix: weapons having Songs array --- src/models/inventoryModels/inventoryModel.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index 76ef9edf..3614f662 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -161,14 +161,14 @@ const ItemConfigSchema = new Schema( facial: colorSchema, syancol: colorSchema, Upgrades: [String], - Songs: [ + Songs: { type: [ { m: String, b: String, p: String, s: String } - ], + ], default: undefined }, Name: String, AbilityOverride: abilityOverrideSchema, PvpUpgrades: [String], -- 2.47.2 From f7e2f030c59f707b464a3417bbd50ea5128eaceb Mon Sep 17 00:00:00 2001 From: Sainan Date: Thu, 20 Jun 2024 02:06:19 +0000 Subject: [PATCH 5/6] Apply prettier changes --- src/models/inventoryModels/inventoryModel.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/models/inventoryModels/inventoryModel.ts b/src/models/inventoryModels/inventoryModel.ts index 3614f662..aed24800 100644 --- a/src/models/inventoryModels/inventoryModel.ts +++ b/src/models/inventoryModels/inventoryModel.ts @@ -161,14 +161,17 @@ const ItemConfigSchema = new Schema( facial: colorSchema, syancol: colorSchema, Upgrades: [String], - Songs: { type: [ - { - m: String, - b: String, - p: String, - s: String - } - ], default: undefined }, + Songs: { + type: [ + { + m: String, + b: String, + p: String, + s: String + } + ], + default: undefined + }, Name: String, AbilityOverride: abilityOverrideSchema, PvpUpgrades: [String], -- 2.47.2 From bf0a461f77b6636f78985b60b21a6147423f7d31 Mon Sep 17 00:00:00 2001 From: Sainan Date: Thu, 20 Jun 2024 05:59:55 +0200 Subject: [PATCH 6/6] revert b1f92c854e5eedea940f101cfc70468af45534ed no longer needed now that we use PE+ for the miscitems array --- static/webui/script.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/static/webui/script.js b/static/webui/script.js index bc1e8758..0090d427 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -109,10 +109,7 @@ window.itemListPromise = new Promise(resolve => { items.forEach(item => { if (item.uniqueName in data.badItems) { item.name += " (Imposter)"; - } else if ( - item.uniqueName.substr(0, 18) != "/Lotus/Types/Game/" && - item.uniqueName.substr(0, 18) != "/Lotus/StoreItems/" - ) { + } else if (item.uniqueName.substr(0, 18) != "/Lotus/Types/Game/") { const option = document.createElement("option"); option.setAttribute("data-key", item.uniqueName); option.value = item.name; -- 2.47.2