Fixed #33 and updated disbot to bun...

Author: xyzjesper

.github/workflows/disbot-builder-dev.yml

@@ -9,3 +9,4 @@ config.yml
 /generated/prisma
 .sentryclirc
 /docs/
+/prisma

.github/workflows/disbot-builder-entry-dev.yml

@@ -17,13 +17,9 @@ RUN apt-get update && apt-get install -y \
 WORKDIR /bot
 COPY . .
 
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
-    apt-get install -y nodejs
-
 RUN bun install @napi-rs/canvas
-
 RUN bun install --force
+RUN bun run prisma:migrate
+RUN bun run prisma:generate
 
-RUN bun run build
-
-CMD ["bun", "run", "disbot"]
+CMD ["bun", "run", "serve"]

.gitignore

@@ -17,14 +17,10 @@ RUN apt-get update && apt-get install -y \
 WORKDIR /bot
 COPY . .
 
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
-    apt-get install -y nodejs
-
 RUN bun install @napi-rs/canvas
-
 RUN bun install --force
-
-RUN bun run build
+RUN bun run prisma:migrate
+RUN bun run prisma:generate
 
 USER        container
 ENV         USER=container HOME=/home/container

.idea/compiler.xml

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "lib": ["ESNext"],
+    "target": "ESNext",
+    "module": "Preserve",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedIndexedAccess": true,
+    "noImplicitOverride": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noPropertyAccessFromIndexSignature": false
+  }
+}

bun.lock

@@ -3,10 +3,9 @@
   "main": "./.build/startup.js",
   "version": "v.1.6.5.1",
   "scripts": {
-    "disbot": "npx prisma migrate deploy && bun run src/main/startup.ts",
-    "disbotdev": "bun run build && bun run src/main/startup.ts",
-    "build": "bun run setup:prisma",
-    "setup:prisma": "copyfiles -u 1 \"src/prisma/**/*\" .build/src"
+    "serve": "bun run src/main/startup.ts",
+    "prisma:migrate": "bun x prisma migrate deploy ",
+    "prisma:generate": "bun x prisma generate"
   },
   "keywords": [
     "disbot"
@@ -15,10 +14,10 @@
   "description": "DisBot",
   "type": "module",
   "dependencies": {
-    "@napi-rs/canvas": "^0.1.92",
+    "@napi-rs/canvas": "^0.1.93",
     "@octokit/core": "^7.0.6",
     "@prisma/adapter-pg": "^7.4.0",
-    "@prisma/client": "^6.19.2",
+    "@prisma/client": "^7.4.0",
     "@top-gg/sdk": "^3.1.6",
     "@types/body-parser": "^1.19.6",
     "axios": "1.13.5",
@@ -43,6 +42,7 @@
     "node-gyp": "^12.2.0",
     "node-superfetch": "^0.3.5",
     "nodemon": "^3.1.11",
+    "pg": "^8.18.0",
     "prisma": "^7.4.0",
     "rss-parser": "^3.13.0",
     "short-uuid": "^5.2.0",
@@ -55,14 +55,20 @@
   },
   "devDependencies": {
     "@types/bcrypt": "^6.0.0",
+    "@types/bun": "^1.3.9",
     "@types/eslint-config-prettier": "^6.11.3",
     "@types/express": "^5.0.6",
     "@types/ms": "^2.1.0",
     "@types/multer": "^2.0.0",
     "@types/node": "^25.2.3",
     "@types/node-fetch": "^2.6.13",
+    "@types/pg": "^8.16.0",
     "esbuild": "^0.27.3",
     "postcss": "^8.5.6",
     "prettier": "^3.8.1"
+  },
+  "private": true,
+  "peerDependencies": {
+    "typescript": "^5"
   }
-}
+}

docker/DisBotDockerfile

@@ -1,6 +1,6 @@
 generator client {
   provider   = "prisma-client"
-  output     = "../generated/prisma"
+  output     = "../src/prisma"
   engineType = "client"
 }