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

.dockerignore

@@ -1,4 +1,8 @@
 .env
 icon_cache
 logs
-dist
+dist
+node_modules
+coverage
+.yarn
+.tests

.env.example

@@ -5,7 +5,10 @@ BOT_TOKEN=PUT_YOUR_TOKEN_HERE
 # You may need to change these:
 ROBOCHIMP_DATABASE_URL=postgresql://postgres:postgres@localhost:5436/robochimp_test
 DATABASE_URL=postgresql://postgres:postgres@localhost:5435/osb_test
-#REDIS_PORT=6379 #OPTIONAL
+
+# Optional
+#REDIS_PORT=6379
+#TESTING_SERVER_ID=123456789012345678
 
 # Dont change these:
 TZ="UTC"

.env.test

@@ -2,4 +2,5 @@ TZ="UTC"
 CLIENT_ID=111398433321891634
 BOT_TOKEN=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 TEST=true
-CI=true
+CI=true
+YARN_ENABLE_HARDENED_MODE=0

.github/workflows/integration_tests.yml

@@ -20,4 +20,4 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Run Integration Tests
-        run: docker-compose up --build --abort-on-container-exit
+        run: docker compose up --build --abort-on-container-exit --remove-orphans && docker compose down --volumes --remove-orphans

.github/workflows/unit_tests.yml

@@ -11,7 +11,7 @@ jobs:
   test:
     name: Node v${{ matrix.node_version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
+    timeout-minutes: 5
     strategy:
       matrix:
         node_version: [20.15.0]
@@ -43,8 +43,4 @@ jobs:
       - name: Build
         run: yarn build:tsc
       - name: Test
-        run: |
-          yarn test:unit
-          yarn test:lint
-          tsc -p tests/integration && tsc -p tests/unit
-          npm i -g dpdm && dpdm --exit-code circular:1 --progress=false --warning=false --tree=false ./dist/index.js
+        run: yarn test:ci:unit

.yarnrc.yml

@@ -2,3 +2,4 @@ nodeLinker: node-modules
 telemetryInterval: 999999999999
 enableTelemetry: false
 checksumBehavior: "update"
+enableHardenedMode: false

SETUP.md

@@ -15,7 +15,7 @@ This assumes you are using VSCode as your IDE. If you have errors or issues, you
 2. Install [Postgres 16](https://www.postgresql.org/download/) and PGAdmin4 for interacting with postgres (optional, but helpful)
 3. Install Yarn using: `npm i -g yarn`
 4. Clone the repo: `git clone https://github.com/oldschoolgg/oldschoolbot.git`
-5. Run `corepack enable` and `yarn` in the root of the repo.
+5. Run the following commands in the root of the repo: `corepack enable`, `yarn`, `npx prisma db push` and `npx prisma db push --schema ./prisma/robochimp.prisma`
 
 ### Configuration
 

docker-compose.yml

@@ -19,8 +19,8 @@ services:
     depends_on:
       - db
     environment:
-      ROBOCHIMP_DATABASE_URL: postgresql://postgres:postgres@db:5435/robochimp_integration_test?connection_limit=500&pool_timeout=0&schema=public
-      DATABASE_URL: postgresql://postgres:postgres@db:5435/osb_integration_test?connection_limit=500&pool_timeout=0&schema=public
+      ROBOCHIMP_DATABASE_URL: postgresql://postgres:postgres@db:5435/robochimp_integration_test?connection_limit=10&pool_timeout=0&schema=public
+      DATABASE_URL: postgresql://postgres:postgres@db:5435/osb_integration_test?connection_limit=10&pool_timeout=0&schema=public
       WAIT_HOSTS: db:5435
 
 volumes:

fish.test.ts

@@ -0,0 +1,94 @@
+import { Bank } from 'oldschooljs';
+import { describe, it } from 'vitest';
+
+import { Gear } from '../../../src/lib/structures/Gear';
+import { fishCommand } from '../../../src/mahoji/commands/fish';
+import { testRunCmd } from '../utils';
+
+describe('Fish Command', () => {
+	it('should handle insufficient fishing level', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'Trout/Salmon', quantity: 1 },
+			result: '<:minion:778418736180494347> Your minion needs 20 Fishing to fish Trout/Salmon.'
+		});
+	});
+
+	it('should handle insufficient QP', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'karambwanji', quantity: 1 },
+			user: { skills_fishing: 9_999_999, QP: 0 },
+			result: 'You need 15 qp to catch those!'
+		});
+	});
+
+	it('should handle invalid fish', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'asdf' },
+			result: 'Thats not a valid fish to catch.'
+		});
+	});
+
+	it('should handle insufficient barb fishing levels', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'Barbarian fishing' },
+			user: { skills_fishing: 1 },
+			result: '<:minion:778418736180494347> Your minion needs 48 Fishing to fish Barbarian fishing.'
+		});
+	});
+
+	it('should fish', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'Shrimps/Anchovies' },
+			result: "<:minion:778418736180494347>  Your minion is now fishing Shrimps/Anchovies, it'll take around 30 minutes to finish"
+		});
+	});
+
+	it('should catch insufficient feathers', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'Barbarian fishing' },
+			user: {
+				skills_fishing: 999_999,
+				skills_agility: 999_999,
+				skills_strength: 999_999,
+				meleeGear: new Gear({ weapon: 'Pearl barbarian rod' })
+			},
+			result: 'You need Feather to fish Barbarian fishing!'
+		});
+	});
+
+	it('should boost', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'Barbarian fishing' },
+			user: {
+				skills_fishing: 999_999,
+				skills_agility: 999_999,
+				skills_strength: 999_999,
+				bank: new Bank().add('Feather', 1000)
+			},
+			result: `<:minion:778418736180494347> Your minion is now fishing 100x Barbarian fishing, it'll take around 6 minutes, 1 second to finish.
+
+**Boosts:** 5% for Pearl barbarian rod.`
+		});
+	});
+
+	it('should fish barrel boost', () => {
+		testRunCmd({
+			cmd: fishCommand,
+			opts: { name: 'shrimps' },
+			user: {
+				skills_fishing: 999_999,
+				meleeGear: new Gear({ cape: 'Fish sack barrel' })
+			},
+			result: `<:minion:778418736180494347> Your minion is now fishing Shrimps/Anchovies, it'll take around 39 minutes, 1 second to finish.
+
+  **Boosts:** +9 trip minutes and +28 inventory slots for having a Fish sack barrel.`
+		});
+	});
+});