SpaceNinjaServer

A simple server for a small space ninja game

公开

关注 0 Fork 1 Star 0

XFEstudio/SpaceNinjaServer

chore: don't set a default avatar image type in inventory (#2075)

This seems to be somewhat of an issue for older versions, plus it's not really accurate anyway. Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2075 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

daf721f7

Sainan <63328889+Sainan@users.noreply.github.com>

提交于 2025-05-14 21:13

父提交 f724073

代码差异

7 个文件 +24 -10

Modified src/controllers/api/addToAllianceController.ts +2 -2

@@ -1,7 +1,7 @@

1 1 import { getJSONfromString, regexEscape } from "@/src/helpers/stringHelpers";

2 2 import { Alliance, AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";

3 3 import { createMessage } from "@/src/services/inboxService";

4 import { getInventory } from "@/src/services/inventoryService";

4 import { getEffectiveAvatarImageType, getInventory } from "@/src/services/inventoryService";

5 5 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";

6 6 import { GuildPermission } from "@/src/types/guildTypes";

7 7 import { logger } from "@/src/utils/logger";

@@ -95,7 +95,7 @@ export const addToAllianceController: RequestHandler = async (req, res) => {

95 95 }

96 96 ],

97 97 sub: "/Lotus/Language/Menu/Mailbox_AllianceInvite_Title",

98 icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,

98 icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,

99 99 contextInfo: alliance._id.toString(),

100 100 highPriority: true,

101 101 acceptAction: "ALLIANCE_INVITE",

Modified src/controllers/api/addToGuildController.ts +2 -2

@@ -4,7 +4,7 @@ import { Account } from "@/src/models/loginModel";

4 4 import { addInventoryDataToFriendInfo, areFriends } from "@/src/services/friendService";

5 5 import { hasGuildPermission } from "@/src/services/guildService";

6 6 import { createMessage } from "@/src/services/inboxService";

7 import { getInventory } from "@/src/services/inventoryService";

7 import { getEffectiveAvatarImageType, getInventory } from "@/src/services/inventoryService";

8 8 import { getAccountForRequest, getAccountIdForRequest, getSuffixedName } from "@/src/services/loginService";

9 9 import { IOid } from "@/src/types/commonTypes";

10 10 import { GuildPermission, IGuildMemberClient } from "@/src/types/guildTypes";

@@ -64,7 +64,7 @@ export const addToGuildController: RequestHandler = async (req, res) => {

64 64 }

65 65 ],

66 66 sub: "/Lotus/Language/Menu/Mailbox_ClanInvite_Title",

67 icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,

67 icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,

68 68 contextInfo: payload.GuildId.$oid,

69 69 highPriority: true,

70 70 acceptAction: "GUILD_INVITE",

Modified src/controllers/api/giftingController.ts +7 -2

@@ -2,7 +2,12 @@ import { getJSONfromString } from "@/src/helpers/stringHelpers";

2 2 import { Account } from "@/src/models/loginModel";

3 3 import { areFriends } from "@/src/services/friendService";

4 4 import { createMessage } from "@/src/services/inboxService";

5 import { combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";

5 import {

6 combineInventoryChanges,

7 getEffectiveAvatarImageType,

8 getInventory,

9 updateCurrency

10 } from "@/src/services/inventoryService";

6 11 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";

7 12 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";

8 13 import { IOid } from "@/src/types/commonTypes";

@@ -85,7 +90,7 @@ export const giftingController: RequestHandler = async (req, res) => {

85 90 }

86 91 ],

87 92 sub: "/Lotus/Language/Menu/GiftReceivedSubject",

88 icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,

93 icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,

89 94 gifts: [

90 95 {

91 96 GiftType: data.PurchaseParams.StoreItem

Modified src/controllers/api/inboxController.ts +7 -2

@@ -9,7 +9,12 @@ import {

9 9 getMessage

10 10 } from "@/src/services/inboxService";

11 11 import { getAccountForRequest, getAccountFromSuffixedName, getSuffixedName } from "@/src/services/loginService";

12 import { addItems, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";

12 import {

13 addItems,

14 combineInventoryChanges,

15 getEffectiveAvatarImageType,

16 getInventory

17 } from "@/src/services/inventoryService";

13 18 import { logger } from "@/src/utils/logger";

14 19 import { ExportFlavour } from "warframe-public-export-plus";

15 20 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";

@@ -88,7 +93,7 @@ export const inboxController: RequestHandler = async (req, res) => {

88 93 }

89 94 ],

90 95 sub: "/Lotus/Language/Menu/GiftReceivedConfirmationSubject",

91 icon: ExportFlavour[inventory.ActiveAvatarImageType].icon,

96 icon: ExportFlavour[getEffectiveAvatarImageType(inventory)].icon,

92 97 highPriority: true

93 98 }

94 99 ]);

Modified src/models/inventoryModels/inventoryModel.ts +1 -1

@@ -1621,7 +1621,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(

1621 1621 Drones: [droneSchema],

1622 1622

1623 1623 //Active profile ico

1624 ActiveAvatarImageType: { type: String, default: "/Lotus/Types/StoreItems/AvatarImages/AvatarImageDefault" },

1624 ActiveAvatarImageType: String,

1625 1625

1626 1626 // open location store like EidolonPlainsDiscoverable or OrbVallisCaveDiscoverable

1627 1627 DiscoveredMarkers: [discoveredMarkerSchema],

Modified src/services/inventoryService.ts +4 -0

@@ -2025,3 +2025,7 @@ export const giveNemesisPetRecipe = (

2025 2025 } satisfies INemesisPetTargetFingerprint)

2026 2026 });

2027 2027 };

2028

2029 export const getEffectiveAvatarImageType = (inventory: TInventoryDatabaseDocument): string => {

2030 return inventory.ActiveAvatarImageType ?? "/Lotus/Types/StoreItems/AvatarImages/AvatarImageDefault";

2031 };

Modified src/types/inventoryTypes/inventoryTypes.ts +1 -1

@@ -296,7 +296,7 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu

296 296 SortieRewardAttenuation?: ISortieRewardAttenuation[];

297 297 Drones: IDroneClient[];

298 298 StepSequencers: IStepSequencer[];

299 ActiveAvatarImageType: string;

299 ActiveAvatarImageType?: string;

300 300 ShipDecorations: ITypeCount[];

301 301 DiscoveredMarkers: IDiscoveredMarker[];

302 302 //CompletedJobs: ICompletedJob[];