Move projectiles to own file (fixes bso issue)

Author: gc

src/lib/MUser.ts

@@ -27,16 +27,16 @@ import { generateAllGearImage, generateGearImage } from '@/lib/canvas/generateGe
 import type { IconPackID } from '@/lib/canvas/iconPacks.js';
 import { ClueTiers } from '@/lib/clues/clueTiers.js';
 import { type CATier, CombatAchievements } from '@/lib/combat_achievements/combatAchievements.js';
-import { BitField, MAX_LEVEL, projectiles } from '@/lib/constants.js';
+import { BitField, MAX_LEVEL } from '@/lib/constants.js';
 import { bossCLItems } from '@/lib/data/Collections.js';
 import { allPetIDs, avasDevices } from '@/lib/data/CollectionsExport.js';
 import { degradeableItems } from '@/lib/degradeableItems.js';
 import { diaries, userhasDiaryTierSync } from '@/lib/diaries.js';
 import type { CommandResponseValue } from '@/lib/discord/index.js';
 import { mentionCommand } from '@/lib/discord/utils.js';
+import { projectiles } from '@/lib/gear/projectiles.js';
 import type { GearSetup, UserFullGearSetup } from '@/lib/gear/types.js';
 import { handleNewCLItems } from '@/lib/handleNewCLItems.js';
-import { marketPriceOfBank } from '@/lib/marketPrices.js';
 import backgroundImages from '@/lib/minions/data/bankBackgrounds.js';
 import type { CombatOptionsEnum } from '@/lib/minions/data/combatConstants.js';
 import { type AddMonsterXpParams, addMonsterXPRaw } from '@/lib/minions/functions/addMonsterXPRaw.js';
@@ -1094,52 +1094,6 @@ Charge your items using ${mentionCommand('minion', 'charge')}.`
 		};
 	}
 
-	async calculateNetWorth() {
-		const bank = this.allItemsOwned.clone();
-		const activeListings = await prisma.gEListing.findMany({
-			where: {
-				user_id: this.id,
-				quantity_remaining: {
-					gt: 0
-				},
-				fulfilled_at: null,
-				cancelled_at: null
-			},
-			include: {
-				buyTransactions: true,
-				sellTransactions: true
-			}
-		});
-		for (const listing of activeListings) {
-			if (listing.type === 'Sell') {
-				bank.add(listing.item_id, listing.quantity_remaining);
-			} else {
-				bank.add('Coins', Number(listing.asking_price_per_item) * listing.quantity_remaining);
-			}
-		}
-		const activeGiveaways = await prisma.giveaway.findMany({
-			where: {
-				completed: false,
-				user_id: this.id
-			}
-		});
-		for (const giveaway of activeGiveaways) {
-			bank.add(giveaway.loot as ItemBank);
-		}
-		const gifts = await prisma.giftBox.findMany({
-			where: {
-				owner_id: this.id
-			}
-		});
-		for (const gift of gifts) {
-			bank.add(gift.items as ItemBank);
-		}
-		return {
-			bank,
-			value: marketPriceOfBank(bank)
-		};
-	}
-
 	public hasDiary(key: HasDiaryDiaryKey): boolean {
 		return this.user.completed_achievement_diaries.includes(key);
 	}
@@ -1295,23 +1249,29 @@ declare global {
 	var GlobalMUserClass: typeof MUserClass;
 }
 
-async function srcMUserFetch(userID: string, updates?: Prisma.UserUpdateInput) {
-	const user =
-		updates !== undefined
-			? await prisma.user.upsert({
-					create: {
-						id: userID
-					},
-					update: updates,
-					where: {
-						id: userID
-					}
-				})
-			: await prisma.user.findUnique({ where: { id: userID } });
-
-	if (!user) {
-		return srcMUserFetch(userID, {});
+async function srcMUserFetch(userID: string) {
+	const [user] = await prisma.$queryRaw<User[]>`INSERT INTO users (id)
+		VALUES (${userID})
+		ON CONFLICT (id) DO UPDATE SET id = EXCLUDED.id
+		RETURNING *;
+`;
+	for (const [key, val] of Object.entries(user)) {
+		if (key.includes('.') || key.includes(' ')) {
+			(user as any)[key.replace(/[.\s]/g, '_')] = val;
+			// @ts-expect-error
+			delete user[key];
+		}
 	}
+
+	// const user2 = await prisma.user.upsert({
+	// 	where: { id: userID },
+	// 	update: {},
+	// 	create: { id: userID }
+	// });
+
+	// console.log(deepEqual(user, user2));
+	// console.log(omit(user, ['bank', 'collectionLogBank', 'gear.range', 'gear.melee', 'gear.mage', 'gear.wildy']));
+
 	return new MUserClass(user);
 }
 

src/lib/constants.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { isMainThread } from 'node:worker_threads';
 import { dateFm, Emoji, PerkTier } from '@oldschoolgg/toolkit';
 import * as dotenv from 'dotenv';
-import { convertLVLtoXP, resolveItems } from 'oldschooljs';
+import { convertLVLtoXP } from 'oldschooljs';
 import * as z from 'zod';
 
 import { activity_type_enum } from '@/prisma/main/enums.js';
@@ -327,42 +327,6 @@ export const SILENT_ERROR = 'SILENT_ERROR';
 export const PATRON_ONLY_GEAR_SETUP =
 	'Sorry - but the `other` gear setup is only available for Tier 3 Patrons (and higher) to use.';
 
-export const projectiles = {
-	arrow: {
-		items: resolveItems(['Adamant arrow', 'Rune arrow', 'Amethyst arrow', 'Dragon arrow']),
-		savedByAvas: true,
-		weapons: resolveItems(['Twisted bow'])
-	},
-	ogreArrow: {
-		items: resolveItems(['Ogre Arrow']),
-		savedByAvas: true,
-		weapons: resolveItems(['Ogre bow'])
-	},
-	bolt: {
-		items: resolveItems([
-			'Runite bolts',
-			'Dragon bolts',
-			'Diamond bolts (e)',
-			'Diamond dragon bolts (e)',
-			'Ruby dragon bolts (e)'
-		]),
-		savedByAvas: true,
-		weapons: resolveItems([
-			'Armadyl crossbow',
-			'Dragon hunter crossbow',
-			'Dragon crossbow',
-			'Zaryte crossbow',
-			'Rune crossbow'
-		])
-	},
-	javelin: {
-		items: resolveItems(['Amethyst javelin', 'Rune javelin', 'Dragon javelin']),
-		savedByAvas: false,
-		weapons: resolveItems(['Heavy ballista'])
-	}
-} as const;
-export type ProjectileType = keyof typeof projectiles;
-
 export const NMZ_STRATEGY = ['experience', 'points'] as const;
 export type NMZStrategy = (typeof NMZ_STRATEGY)[number];
 

src/lib/gear/functions/checkRangeGearWeapon.ts

@@ -1,8 +1,8 @@
 import { objectEntries } from '@oldschoolgg/toolkit';
 import { EItem, Items } from 'oldschooljs';
 
-import { projectiles } from '@/lib/constants.js';
 import { getSimilarItems } from '@/lib/data/similarItems.js';
+import { projectiles } from '@/lib/gear/projectiles.js';
 import type { Gear } from '@/lib/structures/Gear.js';
 import { formatList } from '@/lib/util/smallUtils.js';
 

src/lib/gear/projectiles.ts

@@ -0,0 +1,37 @@
+import { resolveItems } from 'oldschooljs';
+
+export const projectiles = {
+	arrow: {
+		items: resolveItems(['Adamant arrow', 'Rune arrow', 'Amethyst arrow', 'Dragon arrow']),
+		savedByAvas: true,
+		weapons: resolveItems(['Twisted bow'])
+	},
+	ogreArrow: {
+		items: resolveItems(['Ogre Arrow']),
+		savedByAvas: true,
+		weapons: resolveItems(['Ogre bow'])
+	},
+	bolt: {
+		items: resolveItems([
+			'Runite bolts',
+			'Dragon bolts',
+			'Diamond bolts (e)',
+			'Diamond dragon bolts (e)',
+			'Ruby dragon bolts (e)'
+		]),
+		savedByAvas: true,
+		weapons: resolveItems([
+			'Armadyl crossbow',
+			'Dragon hunter crossbow',
+			'Dragon crossbow',
+			'Zaryte crossbow',
+			'Rune crossbow'
+		])
+	},
+	javelin: {
+		items: resolveItems(['Amethyst javelin', 'Rune javelin', 'Dragon javelin']),
+		savedByAvas: false,
+		weapons: resolveItems(['Heavy ballista'])
+	}
+} as const;
+export type ProjectileType = keyof typeof projectiles;

src/mahoji/lib/abstracted_commands/infernoCommand.ts

@@ -3,9 +3,9 @@ import { calcPercentOfNum, Emoji, formatDuration, sumArr, Time } from '@oldschoo
 import { Bank, type ItemBank, Items, itemID, Monsters } from 'oldschooljs';
 
 import { newChatHeadImage } from '@/lib/canvas/chatHeadImage.js';
-import type { ProjectileType } from '@/lib/constants.js';
-import { BitField, projectiles } from '@/lib/constants.js';
+import { BitField } from '@/lib/constants.js';
 import { getSimilarItems } from '@/lib/data/similarItems.js';
+import { type ProjectileType, projectiles } from '@/lib/gear/projectiles.js';
 import { blowpipeDarts } from '@/lib/minions/functions/blowpipeCommand.js';
 import type { BlowpipeData } from '@/lib/minions/types.js';
 import { PercentCounter } from '@/lib/structures/PercentCounter.js';