Merge branch 'master' of https://github.com/oldschoolgg/oldschoolbot …

…into uncharge-glory
oldschoolgg · Feb 27, 2024 · c2b055b · c2b055b
2 parents 4919a6b + ea735c1
commit c2b055b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/prisma/robochimp.prisma b/prisma/robochimp.prisma
@@ -57,6 +57,9 @@ model User {
 
     store_bitfield Int[]
 
+    testing_points         Float @default(0)
+    testing_points_balance Float @default(0)
+
     @@map("user")
 }
 

diff --git a/src/lib/analytics.ts b/src/lib/analytics.ts
@@ -40,7 +40,7 @@ export async function analyticsTick() {
 		await Promise.all(
 			[
 				'SELECT COUNT(*)::int FROM users WHERE "minion.hasBought" = true;',
-				'SELECT SUM("sacrificedValue")::int AS count FROM users;',
+				'SELECT SUM("sacrificedValue") AS count FROM users;',
 				'SELECT COUNT(*)::int FROM users WHERE "minion.ironman" = true;',
 				'SELECT SUM("GP") AS count FROM users;'
 			].map(query => prisma.$queryRawUnsafe(query))

diff --git a/src/mahoji/commands/rp.ts b/src/mahoji/commands/rp.ts
@@ -9,6 +9,7 @@ import { Bank } from 'oldschooljs';
 import { Item } from 'oldschooljs/dist/meta/types';
 
 import { ADMIN_IDS, OWNER_IDS, production, SupportServer } from '../../config';
+import { analyticsTick } from '../../lib/analytics';
 import { BitField, Channel } from '../../lib/constants';
 import { GearSetupType } from '../../lib/gear/types';
 import { GrandExchange } from '../../lib/grandExchange';
@@ -78,6 +79,12 @@ export const rpCommand: OSBMahojiCommand = {
 					name: 'view_all_items',
 					description: 'View all item IDs present in banks/cls.',
 					options: []
+				},
+				{
+					type: ApplicationCommandOptionType.Subcommand,
+					name: 'analytics_tick',
+					description: 'analyticsTick.',
+					options: []
 				}
 			]
 		},
@@ -309,6 +316,7 @@ export const rpCommand: OSBMahojiCommand = {
 			validate_ge?: {};
 			patreon_reset?: {};
 			view_all_items?: {};
+			analytics_tick?: {};
 		};
 		player?: {
 			viewbank?: { user: MahojiUserOption; json?: boolean };
@@ -355,6 +363,10 @@ export const rpCommand: OSBMahojiCommand = {
 			}
 			return 'Something was invalid. Check logs!';
 		}
+		if (options.action?.analytics_tick) {
+			await analyticsTick();
+			return 'Finished.';
+		}
 
 		if (options.action?.view_all_items) {
 			const result = await prisma.$queryRawUnsafe<