Formatting/cleanup

gc · gc · commit a84604cec415 · 2025-07-16T10:57:02.000+10:00
diff --git a/src/lib/diaries.ts b/src/lib/diaries.ts
@@ -7,7 +7,7 @@ import type { DiaryTier, DiaryTierName } from './minions/types';
 import { DiaryID } from './minions/types';
 import { Minigames } from './settings/minigames';
 import Skillcapes from './skilling/skillcapes';
-import { courses } from './skilling/skills/agility';
+import Agility from './skilling/skills/agility';
 import { MUserStats } from './structures/MUserStats';
 import type { Skills } from './types';
 import getOSItem from './util/getOSItem';
@@ -87,7 +87,7 @@ export function userhasDiaryTierSync(
 	if (tier.lapsReqs) {
 		const entries = Object.entries(tier.lapsReqs);
 		for (const [name, score] of entries) {
-			const course = courses.find(c => c.name === name)!;
+			const course = Agility.Courses.find(c => c.name === name)!;
 
 			if (!lapScores[course.id] || lapScores[course.id] < score) {
 				canDo = false;
diff --git a/src/lib/skilling/skills/construction/calcConBonusXP.ts b/src/lib/skilling/skills/construction/calcConBonusXP.ts
@@ -1,7 +1,7 @@
 import { round } from 'e';
 import { itemID } from 'oldschooljs';
 
-import type { GearSetup } from '../gear/types';
+import type { GearSetup } from '../../../gear/types';
 
 export function calcConBonusXP(setup: GearSetup): number {
 	let bonusMultiplier = 0;
diff --git a/src/lib/skilling/skills/construction/constructables.ts b/src/lib/skilling/skills/construction/constructables.ts
@@ -1,5 +1,5 @@
 import { itemID } from 'oldschooljs';
-interface Constructable {
+export interface Constructable {
 	id: number;
 	name: string;
 	input: [number, number];
diff --git a/src/lib/skilling/skills/construction/index.ts b/src/lib/skilling/skills/construction/index.ts
@@ -1,12 +1,16 @@
 import { Emoji } from '@oldschoolgg/toolkit/constants';
 
 import { SkillsEnum } from '../../types';
+import { calcConBonusXP } from './calcConBonusXP';
+import Constructables from './constructables';
 
-const Construction = {
+export const Construction = {
 	aliases: ['con', 'construction'],
 	id: SkillsEnum.Construction,
 	emoji: Emoji.Construction,
-	name: 'Construction'
+	name: 'Construction',
+	constructables: Constructables,
+	util: {
+		calcConBonusXP
+	}
 };
-
-export default Construction;
diff --git a/src/lib/skilling/skills/index.ts b/src/lib/skilling/skills/index.ts
@@ -3,7 +3,7 @@ import { Emoji } from '@oldschoolgg/toolkit/constants';
 import type { Skill } from '../types';
 import { SkillsEnum } from '../types';
 import Agility from './agility';
-import Construction from './construction';
+import { Construction } from './construction';
 import Cooking from './cooking/cooking';
 import Crafting from './crafting';
 import Farming from './farming';
diff --git a/src/lib/skilling/skills/mining.ts b/src/lib/skilling/skills/mining.ts
@@ -1,6 +1,6 @@
+import { Emoji } from '@oldschoolgg/toolkit/constants';
 import { LootTable, itemID } from 'oldschooljs';
 
-import { Emoji } from '@oldschoolgg/toolkit/constants';
 import type { Ore } from '../types';
 import { SkillsEnum } from '../types';
 
diff --git a/src/lib/skilling/skills/thieving/index.ts b/src/lib/skilling/skills/thieving/index.ts
@@ -1,4 +1,5 @@
 import { Emoji } from '@oldschoolgg/toolkit/constants';
+
 import { SkillsEnum } from '../../types';
 
 const Thieving = {
diff --git a/src/lib/util.ts b/src/lib/util.ts
@@ -142,8 +142,6 @@ export function isModOrAdmin(user: MUser) {
 	return globalConfig.adminUserIDs.includes(user.id) || user.bitfield.includes(BitField.isModerator);
 }
 
-export * from './util/smallUtils';
-
 export type JsonKeys<T> = {
 	[K in keyof T]: T[K] extends Prisma.JsonValue ? K : never;
 }[keyof T];
diff --git a/src/mahoji/commands/loot.ts b/src/mahoji/commands/loot.ts
@@ -3,7 +3,6 @@ import { ApplicationCommandOptionType } from 'discord.js';
 
 import { PerkTier } from '../../lib/constants';
 import { getAllTrackedLootForUser, getDetailsOfSingleTrackedLoot } from '../../lib/lootTrack';
-
 import { handleMahojiConfirmation } from '../../lib/util/handleMahojiConfirmation';
 import type { OSBMahojiCommand } from '../lib/util';
 
diff --git a/src/mahoji/commands/mine.ts b/src/mahoji/commands/mine.ts
@@ -200,13 +200,13 @@ export const mineCommand: OSBMahojiCommand = {
 		if (motherlodeMine) {
 			return motherlodeMineCommand({ user, channelID, quantity });
 		}
-
 		const ore = Mining.Ores.find(
 			ore =>
 				stringMatches(ore.id, options.name) ||
 				stringMatches(ore.name, options.name) ||
 				ore.aliases?.some(a => stringMatches(a, options.name))
 		);
+
 		if (!ore) {
 			return `Thats not a valid ore to mine. Valid ores are ${Mining.Ores.map(ore => ore.name).join(', ')}, or ${
 				Mining.MotherlodeMine.name
diff --git a/src/tasks/minions/constructionActivity.ts b/src/tasks/minions/constructionActivity.ts
@@ -1,20 +1,19 @@
 import { calcPercentOfNum } from 'e';
 
-import Constructables from '../../lib/skilling/skills/construction/constructables';
+import { Construction } from '@/lib/skilling/skills/construction';
 import { SkillsEnum } from '../../lib/skilling/types';
 import type { ConstructionActivityTaskOptions } from '../../lib/types/minions';
-import { calcConBonusXP } from '../../lib/util/calcConBonusXP';
 import { handleTripFinish } from '../../lib/util/handleTripFinish';
 
 export const constructionTask: MinionTask = {
 	type: 'Construction',
 	async run(data: ConstructionActivityTaskOptions) {
 		const { objectID, quantity, userID, channelID, duration } = data;
 		const user = await mUserFetch(userID);
-		const object = Constructables.find(object => object.id === objectID)!;
+		const object = Construction.constructables.find(object => object.id === objectID)!;
 		const xpReceived = quantity * object.xp;
 		let bonusXP = 0;
-		const outfitMultiplier = calcConBonusXP(user.gear.skilling);
+		const outfitMultiplier = Construction.util.calcConBonusXP(user.gear.skilling);
 		if (outfitMultiplier > 0) {
 			bonusXP = calcPercentOfNum(outfitMultiplier, xpReceived);
 		}
diff --git a/src/tasks/minions/minigames/chompyHuntActivity.ts b/src/tasks/minions/minigames/chompyHuntActivity.ts
@@ -1,10 +1,10 @@
 import { roll } from 'e';
 import { Bank } from 'oldschooljs';
 
+import { formatList } from '@/lib/util/smallUtils';
 import { chompyHats } from '../../../lib/data/CollectionsExport';
 import { WesternProv, userhasDiaryTier } from '../../../lib/diaries';
 import type { MinigameActivityTaskOptionsWithNoChanges } from '../../../lib/types/minions';
-import { formatList } from '../../../lib/util';
 import { handleTripFinish } from '../../../lib/util/handleTripFinish';
 
 export const chompHuntTask: MinionTask = {
diff --git a/src/tasks/minions/minigames/mahoganyHomesActivity.ts b/src/tasks/minions/minigames/mahoganyHomesActivity.ts
@@ -1,8 +1,8 @@
 import { calcPercentOfNum } from 'e';
 
+import { calcConBonusXP } from '../../../lib/skilling/skills/construction/calcConBonusXP';
 import { SkillsEnum } from '../../../lib/skilling/types';
 import type { MahoganyHomesActivityTaskOptions } from '../../../lib/types/minions';
-import { calcConBonusXP } from '../../../lib/util/calcConBonusXP';
 import { handleTripFinish } from '../../../lib/util/handleTripFinish';
 
 export const mahoganyHomesTask: MinionTask = {
diff --git a/src/tasks/minions/minigames/raidsActivity.ts b/src/tasks/minions/minigames/raidsActivity.ts
@@ -86,8 +86,8 @@ export const raidsTask: MinionTask = {
 			quantity: _quantity
 		} = data;
 		const quantity = _quantity ?? 1;
-		const fetchedUsers = await Promise.all(users.map(async u => mUserFetch(u)));
-		let allUsers = isFakeMass ? Array(maxSizeInput).fill(fetchedUsers[0]) : fetchedUsers;
+		const fetchedUsers: MUser[] = await Promise.all(users.map(async u => mUserFetch(u)));
+		let allUsers: MUser[] = isFakeMass ? Array(maxSizeInput).fill(fetchedUsers[0]) : fetchedUsers;
 		const previousCLs = allUsers.map(i => i.cl.clone());
 
 		let totalPoints = 0;
@@ -209,7 +209,7 @@ export const raidsTask: MinionTask = {
 			}
 		}
 
-		await Promise.all(allUsers.map(u => u.incrementMinigameScore(u.id, minigameID, quantity)));
+		await Promise.all(allUsers.map(u => u.incrementMinigameScore(minigameID, quantity)));
 
 		for (const [userID, userData] of raidResults) {
 			const { personalPoints, deaths, deathChance, loot, mUser: user } = userData;
diff --git a/src/tasks/minions/minigames/toaActivity.ts b/src/tasks/minions/minigames/toaActivity.ts
@@ -4,7 +4,7 @@ import { bold } from 'discord.js';
 import { Time, isObject, uniqueArr } from 'e';
 import { Bank, type ItemBank, ItemGroups, resolveItems } from 'oldschooljs';
 
-import { normalizeTOAUsers } from '@/lib/util';
+import { normalizeTOAUsers } from '@/lib/util/smallUtils';
 import { drawChestLootImage } from '../../../lib/bankImage';
 import { trackLoot } from '../../../lib/lootTrack';
 import { TeamLoot } from '../../../lib/simulation/TeamLoot';
diff --git a/src/tasks/minions/miningActivity.ts b/src/tasks/minions/miningActivity.ts
@@ -145,7 +145,6 @@ export const miningTask: MinionTask = {
 		const { quantity } = data;
 		const user = await mUserFetch(userID);
 		const ore = Mining.Ores.find(ore => ore.id === oreID)!;
-
 		const { updateBank, bonusXP } = determineMiningResult({
 			ore,
 			quantity,
diff --git a/tests/integration/grandExchange.test.ts b/tests/integration/grandExchange.test.ts
@@ -4,7 +4,6 @@ import PQueue from 'p-queue';
 import { assert, describe, expect, test } from 'vitest';
 
 import { GrandExchange } from '../../src/lib/grandExchange';
-
 import { geCommand } from '../../src/mahoji/commands/ge';
 import { cancelUsersListings } from '../../src/mahoji/lib/abstracted_commands/cancelGEListingCommand';
 import type { TestUser } from './util';
diff --git a/tests/unit/Gear.test.ts b/tests/unit/Gear.test.ts
@@ -1,10 +1,9 @@
 import type { GearPreset } from '@prisma/client';
-import { Bank, itemID } from 'oldschooljs';
+import { Bank, Items, itemID } from 'oldschooljs';
 import { GearStat } from 'oldschooljs/gear';
 import { describe, expect, it, test } from 'vitest';
 
 import { Gear, constructGearSetup } from '../../src/lib/structures/Gear';
-import { itemNameFromID } from '../../src/lib/util';
 import getOSItem from '../../src/lib/util/getOSItem';
 
 describe('Gear', () => {
@@ -33,7 +32,10 @@ describe('Gear', () => {
 
 	test('allItems', () => {
 		const gear = new Gear({ cape: 'Max cape' });
-		const allItems = gear.allItems(true).map(itemNameFromID).sort();
+		const allItems = gear
+			.allItems(true)
+			.map(id => Items.itemNameFromId(id))
+			.sort();
 		expect(allItems).toEqual(
 			[
 				'Max cape',
diff --git a/tests/unit/calcConBonusXP.test.ts b/tests/unit/calcConBonusXP.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest';
 
+import { calcConBonusXP } from '@/lib/skilling/skills/construction/calcConBonusXP';
 import { constructGearSetup } from '../../src/lib/structures/Gear';
-import { calcConBonusXP } from '../../src/lib/util/calcConBonusXP';
 
 describe('calcConBonusXP.test', () => {
 	test('calcConBonusXP', () => {
diff --git a/tests/unit/util.test.ts b/tests/unit/util.test.ts
@@ -3,10 +3,11 @@ import { reduceNumByPercent } from 'e';
 import { Bank, convertLVLtoXP } from 'oldschooljs';
 import { describe, expect, test } from 'vitest';
 
+import { skillingPetDropRate } from '@/lib/util';
+import { pluraliseItemName } from '@/lib/util/smallUtils';
 import { baseModifyBusyCounter } from '../../src/lib/busyCounterCache';
 import getUserFoodFromBank from '../../src/lib/minions/functions/getUserFoodFromBank';
 import { SkillsEnum } from '../../src/lib/skilling/types';
-import { pluraliseItemName, skillingPetDropRate } from '../../src/lib/util';
 import getOSItem from '../../src/lib/util/getOSItem';
 import { sellPriceOfItem, sellStorePriceOfItem } from '../../src/mahoji/commands/sell';
 import { mockMUser } from './userutil';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { Emoji } from '@oldschoolgg/toolkit/constants';`
	`2`	`+`
`2`	`3`	`import { SkillsEnum } from '../../types';`
`3`	`4`
`4`	`5`	`const Thieving = {`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,6 @@ export function isModOrAdmin(user: MUser) {`
`142`	`142`	`return globalConfig.adminUserIDs.includes(user.id) \|\| user.bitfield.includes(BitField.isModerator);`
`143`	`143`	`}`
`144`	`144`
`145`		`-export * from './util/smallUtils';`
`146`		`-`
`147`	`145`	`export type JsonKeys<T> = {`
`148`	`146`	`[K in keyof T]: T[K] extends Prisma.JsonValue ? K : never;`
`149`	`147`	`}[keyof T];`