Merge pull request #160 from christopher-buss/main

chore: merge main back into develop

Author: christopher-buss

commitlint.config.ts

@@ -8,7 +8,7 @@ const Configuration: UserConfig = {
 		"scope-enum": [
 			RuleConfigSeverity.Error,
 			"always",
-			["core", "deps", "dev", "lint", "ui", "audio", "assets"],
+			["core", "deps", "dev", "lint", "ui", "audio", "assets", "mtx"],
 		],
 	},
 };

package.json

@@ -39,7 +39,7 @@
 		"@rbxts/inspect": "1.0.1",
 		"@rbxts/janitor": "1.16.0-ts.0",
 		"@rbxts/lapis": "0.3.3",
-		"@rbxts/lapis-mockdatastore": "1.0.6",
+		"@rbxts/lapis-mockdatastore": "0.3.6",
 		"@rbxts/log": "0.6.3",
 		"@rbxts/make": "1.0.6",
 		"@rbxts/message-templates": "0.3.2",

pnpm-lock.yaml

@@ -71,7 +71,7 @@ export default class PlayerDataService {
 
 			return document;
 		} catch (err) {
-			this.logger.Warn(`Failed to load data for ${player.Name}: ${err}`);
+			this.logger.Warn(`Failed to load data for ${player.UserId}: ${err}`);
 			this.playerRemovalService.removeForBug(player, KickCode.PlayerProfileUndefined);
 		}
 	}

src/server/player/data/player-data-service.ts

@@ -10,22 +10,32 @@ const initialState: AchievementState = {};
 
 export const achievementsSlice = createProducer(initialState, {
 	/** @ignore */
-	closePlayerData: (state, player: string) => {
+	closePlayerData: (state, player: string): AchievementState => {
 		return {
 			...state,
 			[player]: undefined,
 		};
 	},
 
 	/** @ignore */
-	loadPlayerData: (state, player: string, data: PlayerData) => {
+	loadPlayerData: (state, player: string, data: PlayerData): AchievementState => {
 		return {
 			...state,
 			[player]: data.achievements,
 		};
 	},
 
-	awardBadge: (state, player: string, badge: Badge, badgeStatus: boolean) => {
+	/**
+	 * Stores the badge status for a player.
+	 *
+	 * @param state - The current state.
+	 * @param player - The player to award the badge to.
+	 * @param badge - The badge to award.
+	 * @param badgeStatus - True if the badge was successfully awarded, false if
+	 *   it needs to be retried in the future.
+	 * @returns The new state.
+	 */
+	awardBadge: (state, player: string, badge: Badge, badgeStatus: boolean): AchievementState => {
 		const achievements = state[player];
 		return {
 			...state,

src/shared/store/persistent/persistent-slice/achievements.ts

@@ -8,22 +8,22 @@ const initialState: BalanceState = {};
 
 export const balanceSlice = createProducer(initialState, {
 	/** @ignore */
-	closePlayerData: (state, player: string) => {
+	closePlayerData: (state, player: string): BalanceState => {
 		return {
 			...state,
 			[player]: undefined,
 		};
 	},
 
 	/** @ignore */
-	loadPlayerData: (state, player: string, data: PlayerData) => {
+	loadPlayerData: (state, player: string, data: PlayerData): BalanceState => {
 		return {
 			...state,
 			[player]: data.balance,
 		};
 	},
 
-	giveCurrency: (state, player: string, amount: number) => {
+	giveCurrency: (state, player: string, amount: number): BalanceState => {
 		const balance = state[player];
 		return {
 			...state,

src/shared/store/persistent/persistent-slice/balance.ts

@@ -10,36 +10,36 @@ const initialState: MtxState = {};
 
 export const mtxSlice = createProducer(initialState, {
 	/** @ignore */
-	closePlayerData: (state, player: string) => {
+	closePlayerData: (state, player: string): MtxState => {
 		return {
 			...state,
 			[player]: undefined,
 		};
 	},
 
 	/** @ignore */
-	loadPlayerData: (state, player: string, data: PlayerData) => {
+	loadPlayerData: (state, player: string, data: PlayerData): MtxState => {
 		return {
 			...state,
 			[player]: data.mtx,
 		};
 	},
 
-	purchaseDeveloperProduct: (state, player: string, productId: Product) => {
+	purchaseDeveloperProduct: (state, player: string, productId: Product): MtxState => {
 		const mtx = state[player];
 
 		return {
 			...state,
 			[player]: mtx && {
 				...mtx,
-				developerProducts: new Map([...mtx.products]).set(productId, {
+				products: new Map([...mtx.products]).set(productId, {
 					timesPurchased: (mtx.products.get(productId)?.timesPurchased ?? 0) + 1,
 				}),
 			},
 		};
 	},
 
-	purchaseGamePass: (state, player: string, gamePassId: GamePass) => {
+	purchaseGamePass: (state, player: string, gamePassId: GamePass): MtxState => {
 		const mtx = state[player];
 
 		return {

src/shared/store/persistent/persistent-slice/mtx.ts

@@ -8,15 +8,15 @@ const initialState: SettingsState = {};
 
 export const settingsSlice = createProducer(initialState, {
 	/** @ignore */
-	closePlayerData: (state, player: string) => {
+	closePlayerData: (state, player: string): SettingsState => {
 		return {
 			...state,
 			[player]: undefined,
 		};
 	},
 
 	/** @ignore */
-	loadPlayerData: (state, player: string, data: PlayerData) => {
+	loadPlayerData: (state, player: string, data: PlayerData): SettingsState => {
 		return {
 			...state,
 			[player]: data.settings,
@@ -28,7 +28,7 @@ export const settingsSlice = createProducer(initialState, {
 		player: string,
 		settingType: keyof PlayerSettings,
 		value: PlayerSettings[keyof PlayerSettings],
-	) => {
+	): SettingsState => {
 		const setting = state[player];
 
 		return {