Merge branch 'master' into bso

.eslintrc.json

@@ -16,6 +16,7 @@
 		"@typescript-eslint/no-base-to-string": "error",
 		"eqeqeq": "error",
 		"no-shadow": "warn",
-		"@typescript-eslint/no-floating-promises": "warn"
+		"@typescript-eslint/no-floating-promises": "warn",
+		"@typescript-eslint/ban-ts-comment": "off"
 	}
 }

src/lib/grandExchange.ts

@@ -7,6 +7,7 @@ import { Item, ItemBank } from 'oldschooljs/dist/meta/types';
 import PQueue from 'p-queue';
 
 import { ADMIN_IDS, OWNER_IDS, production } from '../config';
+import { BLACKLISTED_USERS } from './blacklists';
 import { BitField, globalConfig, ONE_TRILLION, PerkTier } from './constants';
 import { isCustomItem } from './customItems/util';
 import { marketPricemap } from './marketPrices';
@@ -615,13 +616,15 @@ ${type} ${toKMB(quantity)} ${item.name} for ${toKMB(price)} each, for a total of
 			items: buyerLoot,
 			collectionLog: false,
 			dontAddToTempCL: true,
-			filterLoot: false
+			filterLoot: false,
+			neverUpdateHistory: true
 		});
 		await sellerUser.addItemsToBank({
 			items: sellerLoot,
 			collectionLog: false,
 			dontAddToTempCL: true,
-			filterLoot: false
+			filterLoot: false,
+			neverUpdateHistory: true
 		});
 
 		const itemName = itemNameFromID(buyerListing.item_id)!;
@@ -695,9 +698,7 @@ ${type} ${toKMB(quantity)} ${item.name} for ${toKMB(price)} each, for a total of
 					type: GEListingType.Buy,
 					fulfilled_at: null,
 					cancelled_at: null,
-					user_id: {
-						not: null
-					}
+					user_id: { not: null }
 				},
 				orderBy: [
 					{
@@ -713,9 +714,7 @@ ${type} ${toKMB(quantity)} ${item.name} for ${toKMB(price)} each, for a total of
 					type: GEListingType.Sell,
 					fulfilled_at: null,
 					cancelled_at: null,
-					user_id: {
-						not: null
-					}
+					user_id: { not: null }
 				},
 				orderBy: [
 					{
@@ -849,7 +848,11 @@ Difference: ${shouldHave.difference(currentBank)}`);
 		if (this.locked) return;
 		const stopwatch = new Stopwatch();
 		stopwatch.start();
-		const { buyListings, sellListings } = await this.fetchActiveListings();
+		const { buyListings: _buyListings, sellListings: _sellListings } = await this.fetchActiveListings();
+
+		// Filter out listings from Blacklisted users:
+		const buyListings = _buyListings.filter(l => !BLACKLISTED_USERS.has(l.user_id!));
+		const sellListings = _sellListings.filter(l => !BLACKLISTED_USERS.has(l.user_id!));
 
 		for (const buyListing of buyListings) {
 			// These are all valid, matching sell listings we can match with this buy listing.

src/mahoji/commands/rp.ts

@@ -34,6 +34,7 @@ import { makeBankImage } from '../../lib/util/makeBankImage';
 import { migrateUser } from '../../lib/util/migrateUser';
 import { parseBank } from '../../lib/util/parseStringBank';
 import { sendToChannelID } from '../../lib/util/webhook';
+import { cancelUsersListings } from '../lib/abstracted_commands/cancelGEListingCommand';
 import { gearSetupOption } from '../lib/mahojiCommandOptions';
 import { OSBMahojiCommand } from '../lib/util';
 import { mahojiUsersSettingsFetch } from '../mahojiSettings';
@@ -323,6 +324,19 @@ export const rpCommand: OSBMahojiCommand = {
 							required: false
 						}
 					]
+				},
+				{
+					type: ApplicationCommandOptionType.Subcommand,
+					name: 'ge_cancel',
+					description: 'Cancel GE Listings',
+					options: [
+						{
+							type: ApplicationCommandOptionType.User,
+							name: 'user',
+							description: 'The user',
+							required: true
+						}
+					]
 				}
 			]
 		}
@@ -369,6 +383,7 @@ export const rpCommand: OSBMahojiCommand = {
 				partner?: MahojiUserOption;
 				guild_id?: string;
 			};
+			ge_cancel?: { user: MahojiUserOption };
 		};
 	}>) => {
 		await deferInteraction(interaction);
@@ -777,6 +792,12 @@ ORDER BY item_id ASC;`);
 			return { files: [{ attachment: Buffer.from(report), name: 'trade_report.txt' }] };
 		}
 
+		if (options.player?.ge_cancel) {
+			const targetUser = await mUserFetch(options.player.ge_cancel.user.user.id);
+			await cancelUsersListings(targetUser);
+			return `Cancelled listings for ${targetUser}`;
+		}
+
 		return 'Invalid command.';
 	}
 };

src/mahoji/lib/abstracted_commands/cancelGEListingCommand.ts

@@ -7,6 +7,7 @@ import { makeTransactFromTableBankQueries } from '../../../lib/tableBank';
 import { logError } from '../../../lib/util/logError';
 
 export async function cancelUsersListings(user: MUser) {
+	await user.sync();
 	const activeListings = await prisma.gEListing.findMany({
 		where: {
 			user_id: user.id,

src/scripts/no-prisma.ts

@@ -0,0 +1,2 @@
+// @ts-ignore
+global.prisma = { $on: () => {} };

src/scripts/render-creatables-file.ts

@@ -1,3 +1,4 @@
+import './no-prisma';
 import '../lib/data/itemAliases';
 
 import { isFunction } from 'e';

tests/integration/grandExchange.test.ts

@@ -10,6 +10,7 @@ import { GrandExchange } from '../../src/lib/grandExchange';
 import { assert } from '../../src/lib/util';
 import resolveItems from '../../src/lib/util/resolveItems';
 import { geCommand } from '../../src/mahoji/commands/ge';
+import { cancelUsersListings } from '../../src/mahoji/lib/abstracted_commands/cancelGEListingCommand';
 import { createTestUser, mockClient, TestUser } from './util';
 
 const quantities = [-1, 0, 100_000_000_000_000_000, 1, 2, 38, 1_000_000_000_000, 500, '5*5'];
@@ -37,28 +38,6 @@ const sampleBank = new Bank()
 	.add('Trout', 1000)
 	.freeze();
 
-async function cancelAllListings(user: TestUser) {
-	const activeListings = await global.prisma!.gEListing.findMany({
-		where: {
-			user_id: user.id
-		}
-	});
-	for (const listing of activeListings) {
-		const result = (await user.runCommand(geCommand, {
-			cancel: {
-				listing: listing.userfacing_id
-			}
-		})) as string;
-
-		if (
-			result !== 'You cannot cancel a listing that has already been fulfilled.' &&
-			!result.startsWith('Successfully cancelled your listing,')
-		) {
-			throw new Error(`Unexpected result from cancelling listing: ${result}`);
-		}
-	}
-}
-
 describe('Grand Exchange', async () => {
 	const itemPool = resolveItems(['Egg', 'Trout', 'Coal']);
 	GrandExchange.calculateSlotsOfUser = async () => ({ slots: 500 } as any);
@@ -128,7 +107,7 @@ describe('Grand Exchange', async () => {
 			// Cancel all remaining listings
 			const cancelPromises = [];
 			for (const user of users) {
-				cancelPromises.push(cancelAllListings(user));
+				cancelPromises.push(cancelUsersListings(user));
 			}
 			await Promise.all(cancelPromises);
 			await waitForGEToBeEmpty();
@@ -175,7 +154,6 @@ Based on G.E data, we should have received ${data.totalTax} tax`;
 
 			await GrandExchange.queue.onEmpty();
 			assert(GrandExchange.queue.size === 0, 'Queue should be empty');
-			const geBank = await GrandExchange.fetchOwnedBank();
 		},
 		{
 			repeats: 1,
@@ -220,18 +198,22 @@ Based on G.E data, we should have received ${data.totalTax} tax`;
 		await GrandExchange.tick();
 		await GrandExchange.tick();
 
+		// The user object isn't updated by the GE tick, since that uses completely separate user objects.
+		await wes.sync();
+		await magnaboy.sync();
+
 		const amountSold = 50;
 		const priceSoldAt = 100;
 		const totalGPBeforeTax = amountSold * priceSoldAt;
 		const taxPerItem = calcPercentOfNum(1, priceSoldAt);
 		expect(taxPerItem).toEqual(1);
 		const totalTax = taxPerItem * amountSold;
-		expect(taxPerItem).toEqual(1);
+		expect(totalTax).toEqual(50);
 		const gpShouldBeReceivedAfterTax = totalGPBeforeTax - totalTax;
 		expect(gpShouldBeReceivedAfterTax).toEqual(4950);
 
-		await cancelAllListings(wes);
-		await cancelAllListings(magnaboy);
+		await cancelUsersListings(wes);
+		await cancelUsersListings(magnaboy);
 
 		expect(wes.bankWithGP.toString()).toEqual(
 			new Bank()