Cleanup more imports

gc · gc · commit cb97bbbc9ee8 · 2025-07-02T13:25:25.000+10:00
diff --git a/src/lib/bankImage.ts b/src/lib/bankImage.ts
@@ -6,7 +6,7 @@ import { cleanString, formatItemStackQuantity, generateHexColorForCashStack } fr
 import { AttachmentBuilder } from 'discord.js';
 import { chunk, randInt, sumArr } from 'e';
 import fetch from 'node-fetch';
-import { Bank, type Item, ItemGroups, resolveItems, toKMB } from 'oldschooljs';
+import { Bank, type Item, ItemGroups, itemID, resolveItems, toKMB } from 'oldschooljs';
 
 import { BOT_TYPE, BitField, ItemIconPacks, PerkTier } from '../lib/constants';
 import { allCLItems } from '../lib/data/Collections';
@@ -28,7 +28,6 @@ import {
 	loadImage,
 	registerFont
 } from '../lib/util/canvasUtil';
-import itemID from '../lib/util/itemID';
 import { logError } from '../lib/util/logError';
 import { XPLamps } from '../mahoji/lib/abstracted_commands/lampCommand';
 import { TOBUniques } from './data/tob';
diff --git a/src/lib/finishables.ts b/src/lib/finishables.ts
@@ -14,6 +14,7 @@ import {
 	MediumCasket,
 	Monsters,
 	Nightmare,
+	itemID,
 	resolveItems
 } from 'oldschooljs';
 
@@ -46,7 +47,6 @@ import { getTemporossLoot } from './simulation/tempoross';
 import { TheatreOfBlood } from './simulation/tob';
 import { WintertodtCrate } from './simulation/wintertodt';
 import getOSItem from './util/getOSItem';
-import itemID from './util/itemID';
 
 interface KillArgs {
 	accumulatedLoot: Bank;
diff --git a/src/lib/minions/data/killableMonsters/bosses/wildy.ts b/src/lib/minions/data/killableMonsters/bosses/wildy.ts
@@ -1,9 +1,8 @@
 import { Time } from 'e';
-import { Bank, Monsters, deepResolveItems, resolveItems } from 'oldschooljs';
-
+import { Bank, Monsters, deepResolveItems, itemID, resolveItems } from 'oldschooljs';
 import { GearStat } from 'oldschooljs/gear';
+
 import { SkillsEnum } from '../../../../skilling/types';
-import itemID from '../../../../util/itemID';
 import type { KillableMonster } from '../../../types';
 import { DiaryID } from '../../../types';
 
diff --git a/src/lib/minions/data/killableMonsters/chaeldarMonsters.ts b/src/lib/minions/data/killableMonsters/chaeldarMonsters.ts
@@ -1,7 +1,7 @@
 import { Time } from 'e';
 import { Bank, Monsters, deepResolveItems, itemID, resolveItems } from 'oldschooljs';
-
 import { GearStat } from 'oldschooljs/gear';
+
 import { SkillsEnum } from '../../../skilling/types';
 import type { KillableMonster } from '../../types';
 import { QuestID } from '../quests';
diff --git a/src/lib/minions/data/killableMonsters/mazchnaMonsters.ts b/src/lib/minions/data/killableMonsters/mazchnaMonsters.ts
@@ -1,7 +1,7 @@
 import { Time } from 'e';
 import { Bank, Monsters, itemID } from 'oldschooljs';
-
 import { GearStat } from 'oldschooljs/gear';
+
 import type { KillableMonster } from '../../types';
 
 export const mazchnaMonsters: KillableMonster[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/bolts.ts b/src/lib/skilling/skills/fletching/fletchables/bolts.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const Bolts: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/bows.ts b/src/lib/skilling/skills/fletching/fletchables/bows.ts
@@ -1,6 +1,5 @@
-import { Bank } from 'oldschooljs';
+import { Bank, itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { Fletchable } from '../../../types';
 
 const Bows: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/crossbows.ts b/src/lib/skilling/skills/fletching/fletchables/crossbows.ts
@@ -1,6 +1,5 @@
-import { Bank } from 'oldschooljs';
+import { Bank, itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { Fletchable } from '../../../types';
 
 const Crossbows: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/darts.ts b/src/lib/skilling/skills/fletching/fletchables/darts.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const Darts: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/javelins.ts b/src/lib/skilling/skills/fletching/fletchables/javelins.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const Javelins: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/shafts.ts b/src/lib/skilling/skills/fletching/fletchables/shafts.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const Shafts: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/shields.ts b/src/lib/skilling/skills/fletching/fletchables/shields.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const Shields: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/slayer.ts b/src/lib/skilling/skills/fletching/fletchables/slayer.ts
@@ -1,7 +1,6 @@
-import { Bank } from 'oldschooljs';
+import { Bank, itemID } from 'oldschooljs';
 
 import { SlayerTaskUnlocksEnum } from '../../../../slayer/slayerUnlocks';
-import itemID from '../../../../util/itemID';
 import type { Fletchable } from '../../../types';
 
 const Slayer: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/tippedBolts.ts b/src/lib/skilling/skills/fletching/fletchables/tippedBolts.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const TippedBolts: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/tippedDragonBolts.ts b/src/lib/skilling/skills/fletching/fletchables/tippedDragonBolts.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const TippedDragonBolts: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/fletchables/tips.ts b/src/lib/skilling/skills/fletching/fletchables/tips.ts
@@ -1,6 +1,4 @@
-import { Bank } from 'oldschooljs';
-
-import itemID from '../../../../util/itemID';
+import { Bank, itemID } from 'oldschooljs';
 import type { Fletchable } from '../../../types';
 
 const Tips: Fletchable[] = [
diff --git a/src/lib/skilling/skills/fletching/index.ts b/src/lib/skilling/skills/fletching/index.ts
@@ -1,4 +1,5 @@
 import { Emoji } from '@oldschoolgg/toolkit/constants';
+
 import { SkillsEnum } from '../../types';
 import { Fletchables } from './fletchables';
 
diff --git a/src/lib/skilling/skills/smithing/smithables/adamant.ts b/src/lib/skilling/skills/smithing/smithables/adamant.ts
@@ -1,6 +1,6 @@
 import { Time } from 'e';
+import { itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { SmithedItem } from '../../../types';
 
 const Adamant: SmithedItem[] = [
diff --git a/src/lib/skilling/skills/smithing/smithables/bronze.ts b/src/lib/skilling/skills/smithing/smithables/bronze.ts
@@ -1,6 +1,6 @@
 import { Time } from 'e';
+import { itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { SmithedItem } from '../../../types';
 
 const Bronze: SmithedItem[] = [
diff --git a/src/lib/skilling/skills/smithing/smithables/gold.ts b/src/lib/skilling/skills/smithing/smithables/gold.ts
@@ -1,6 +1,6 @@
 import { Time } from 'e';
+import { itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { SmithedItem } from '../../../types';
 
 const Gold: SmithedItem[] = [
diff --git a/src/lib/skilling/skills/smithing/smithables/iron.ts b/src/lib/skilling/skills/smithing/smithables/iron.ts
@@ -1,6 +1,6 @@
 import { Time } from 'e';
+import { itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { SmithedItem } from '../../../types';
 
 const Iron: SmithedItem[] = [
diff --git a/src/lib/skilling/skills/smithing/smithables/mithril.ts b/src/lib/skilling/skills/smithing/smithables/mithril.ts
@@ -1,6 +1,6 @@
 import { Time } from 'e';
+import { itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { SmithedItem } from '../../../types';
 
 const Mithril: SmithedItem[] = [
diff --git a/src/lib/skilling/skills/smithing/smithables/rune.ts b/src/lib/skilling/skills/smithing/smithables/rune.ts
@@ -1,6 +1,6 @@
 import { Time } from 'e';
+import { itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { SmithedItem } from '../../../types';
 
 const Rune: SmithedItem[] = [
diff --git a/src/lib/skilling/skills/smithing/smithables/steel.ts b/src/lib/skilling/skills/smithing/smithables/steel.ts
@@ -1,6 +1,6 @@
 import { Time } from 'e';
+import { itemID } from 'oldschooljs';
 
-import itemID from '../../../../util/itemID';
 import type { SmithedItem } from '../../../types';
 
 const Steel: SmithedItem[] = [
diff --git a/src/lib/util/calcConBonusXP.ts b/src/lib/util/calcConBonusXP.ts
@@ -1,7 +1,7 @@
 import { round } from 'e';
+import { itemID } from 'oldschooljs';
 
 import type { GearSetup } from '../gear/types';
-import itemID from './itemID';
 
 export function calcConBonusXP(setup: GearSetup): number {
 	let bonusMultiplier = 0;
diff --git a/src/lib/util/commandUsage.ts b/src/lib/util/commandUsage.ts
@@ -1,7 +1,60 @@
-import type { CommandOptions } from '@oldschoolgg/toolkit/util';
+import type { CommandOptions, MahojiUserOption } from '@oldschoolgg/toolkit/util';
 import type { Prisma, command_name_enum } from '@prisma/client';
+import { isObject } from 'e';
 
-import { getCommandArgs } from '../../mahoji/lib/util';
+function isMahojiUserOption(data: any): data is MahojiUserOption {
+	return 'user' in data && 'id' in data.user;
+}
+
+interface CompressedArg {
+	[key: string]: string | number | boolean | null | undefined | CompressedArg;
+}
+
+function compressMahojiArgs(options: CommandOptions) {
+	const newOptions: CompressedArg = {};
+	for (const [key, val] of Object.entries(options) as [
+		keyof CommandOptions,
+		CommandOptions[keyof CommandOptions]
+	][]) {
+		if (val === null) continue;
+		if (
+			typeof val === 'string' ||
+			typeof val === 'number' ||
+			typeof val === 'boolean' ||
+			typeof val === 'undefined'
+		) {
+			newOptions[key] = val;
+			continue;
+		}
+
+		if ('id' in val) {
+			newOptions[key] = (val as { id: string }).id;
+			continue;
+		}
+
+		if (isMahojiUserOption(val)) {
+			newOptions[key] = (val as MahojiUserOption).user.id;
+			continue;
+		}
+
+		if (isObject(val)) {
+			newOptions[key] = compressMahojiArgs(val);
+			continue;
+		}
+
+		newOptions[key] = null;
+	}
+	return newOptions;
+}
+
+function getCommandArgs(
+	commandName: string,
+	args: CommandOptions
+): Prisma.InputJsonObject | Prisma.InputJsonArray | undefined {
+	if (Object.keys(args).length === 0) return undefined;
+	if (['bank', 'bs'].includes(commandName)) return undefined;
+	return compressMahojiArgs(args) as Prisma.InputJsonObject;
+}
 
 export function makeCommandUsage({
 	userID,
diff --git a/src/lib/util/globalInteractions.ts b/src/lib/util/globalInteractions.ts
@@ -1,22 +1,19 @@
 import { cleanUsername, formatDuration, mentionCommand, stringMatches } from '@oldschoolgg/toolkit/util';
 import type { Giveaway } from '@prisma/client';
 import { RateLimitManager } from '@sapphire/ratelimits';
-import type { ButtonInteraction, Interaction } from 'discord.js';
-import { ButtonBuilder, ButtonStyle } from 'discord.js';
+import { ButtonBuilder, type ButtonInteraction, ButtonStyle, type Interaction } from 'discord.js';
 import { Time, removeFromArr, uniqueArr } from 'e';
-import { Bank } from 'oldschooljs';
+import { Bank, type ItemBank } from 'oldschooljs';
 
 import { cancelGEListingCommand } from '../../mahoji/lib/abstracted_commands/cancelGEListingCommand';
 import { autoContract } from '../../mahoji/lib/abstracted_commands/farmingContractCommand';
 import { shootingStarsCommand, starCache } from '../../mahoji/lib/abstracted_commands/shootingStarsCommand';
-import type { ClueTier } from '../clues/clueTiers';
-import { BitField, PerkTier } from '../constants';
-
 import { InteractionID } from '../InteractionID';
 import { giveawayCache } from '../cache.js';
+import type { ClueTier } from '../clues/clueTiers';
+import { BitField, PerkTier } from '../constants';
 import { runCommand } from '../settings/settings';
 import { toaHelpCommand } from '../simulation/toa';
-import type { ItemBank } from '../types';
 import { updateGiveawayMessage } from './giveaway';
 import { interactionReply } from './interactionReply';
 import { minionIsBusy } from './minionIsBusy';
diff --git a/src/lib/util/itemID.ts b/src/lib/util/itemID.ts
diff --git a/src/mahoji/lib/abstracted_commands/minionKill/postBoostEffects.ts b/src/mahoji/lib/abstracted_commands/minionKill/postBoostEffects.ts
@@ -1,6 +1,7 @@
 import type { GearSetupType } from '@prisma/client';
 import { Time, calcPercentOfNum, objectKeys, uniqueArr } from 'e';
 import { Bank } from 'oldschooljs';
+
 import { BitField } from '../../../../lib/constants';
 import { Eatables } from '../../../../lib/data/eatables';
 import { convertAttackStyleToGearSetup } from '../../../../lib/gear/functions/convertAttackStyleToGearSetup';
diff --git a/src/mahoji/lib/postCommand.ts b/src/mahoji/lib/postCommand.ts
@@ -1,11 +1,10 @@
 import type { CommandOptions } from '@oldschoolgg/toolkit/util';
+import { TimerManager } from '@sapphire/timer-manager';
 
+import { logError } from '@/lib/util/logError';
 import { modifyBusyCounter } from '../../lib/busyCounterCache';
 import { busyImmuneCommands, shouldTrackCommand } from '../../lib/constants';
-
-import { TimerManager } from '@sapphire/timer-manager';
 import { makeCommandUsage } from '../../lib/util/commandUsage';
-import { logError } from '../../lib/util/logError';
 import type { AbstractCommand } from './inhibitors';
 
 export async function postCommand({
diff --git a/src/mahoji/lib/util.ts b/src/mahoji/lib/util.ts
diff --git a/src/tasks/minions/HunterActivity/hunterActivity.ts b/src/tasks/minions/HunterActivity/hunterActivity.ts
diff --git a/src/tasks/minions/alchingActivity.ts b/src/tasks/minions/alchingActivity.ts
diff --git a/src/tasks/minions/fishingActivity.ts b/src/tasks/minions/fishingActivity.ts
diff --git a/src/tasks/minions/minigames/fightCavesActivity.ts b/src/tasks/minions/minigames/fightCavesActivity.ts
diff --git a/src/tasks/minions/minigames/infernoActivity.ts b/src/tasks/minions/minigames/infernoActivity.ts
diff --git a/src/tasks/minions/minigames/puroPuroActivity.ts b/src/tasks/minions/minigames/puroPuroActivity.ts
diff --git a/src/tasks/minions/minigames/warriorsGuild/cyclopsActivity.ts b/src/tasks/minions/minigames/warriorsGuild/cyclopsActivity.ts
diff --git a/src/tasks/minions/smeltingActivity.ts b/src/tasks/minions/smeltingActivity.ts
diff --git a/tests/integration/commands/gearPresets.test.ts b/tests/integration/commands/gearPresets.test.ts
diff --git a/tests/integration/gearFixing.test.ts b/tests/integration/gearFixing.test.ts
diff --git a/tests/unit/parseStringBank.test.ts b/tests/unit/parseStringBank.test.ts
diff --git a/tests/unit/sanity.test.ts b/tests/unit/sanity.test.ts
