ok

.env.example

@@ -1,15 +1,21 @@
-# THIS FILE IS A TEMPLATE FOR WHICH ENV VARS ARE USED
-# VALUES IN THIS FILE SHOULD NOT BE EDITED
-# THIS FILE WILL BE COMMITED!
+# !! THIS FILE IS A TEMPLATE FOR WHICH ENV VARS ARE USED
+# !! VALUES IN THIS FILE SHOULD NOT BE EDITED
+# !! THIS FILE WILL BE COMMITED!
+
 # The Discord bot token to login with (REQUIRED)
 TOKEN=
 
-# The URL of the Postgres server to use as database
-DATABASE_URL=
+# The URL of the Postgres server to use as database (REQUIRED)
+DATABASE_URL=""
 
-# The bot user ID for slash command deployment
+# The bot user ID for slash command deployment (REQUIRED)
 CLIENT_ID=
 
-# The server ID to deploy commands to
+# The server ID to deploy commands to (Recommended for quick deployment)
 GUILD_ID=
 
+# The id of the bot owner (Not required)
+OWNER_ID=
+
+# Cooldown time in ms (set to 0 to disable)
+COOLDOWN_TIME=2000

.gitignore

@@ -3,3 +3,8 @@ node_modules
 /.idea
 /.vscode
 /.fleet
+
+# dev files
+/src/buttons/UniversalNoButton.ts
+/src/commands/say.ts
+/src/commands/eval.ts

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "dispenser23",
-  "version": "1.0.0",
+  "name": "dispenser",
+  "version": "3.0.0",
   "description": "Dispenser",
   "main": "./dist/index.js",
   "type": "module",
@@ -13,7 +13,7 @@
     "clean": "node -e \"fs.rm('dist',{recursive:true},()=>{});\"",
     "deploy": "npm run node -- --loader ts-node/esm src/deployCmds.ts",
     "validate": "prisma validate",
-    "push": "prisma db push && prisma generate"
+    "push": "prisma db push"
   },
   "author": "Joey",
   "license": "MIT",
@@ -22,16 +22,14 @@
     "@types/node": "^18.11.18",
     "@types/perfy": "^1.1.0",
     "inquirer": "^9.1.4",
-    "prisma": "^4.11.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.4"
   },
   "dependencies": {
     "@discordjs/rest": "^1.6.0",
-    "@prisma/client": "^4.14.0",
+    "@prisma/client": "^4.15.0",
     "discord.js": "^14.8.0",
     "dotenv": "^16.0.3",
-    "nanospinner": "^1.1.0",
-    "perfy": "^1.1.5"
+    "prisma": "^4.15.0"
   }
 }

prisma/schema.prisma

@@ -21,24 +21,25 @@ model server {
 }
 
 model domainGroup {
-  groupId     String    @id @default(uuid())
-  createdAt   DateTime? @default(now())
-  createdBy   String?
-  updatedAt   DateTime? @updatedAt
-  updatedBy   String?
-  server      server    @relation(fields: [serverId], references: [serverId], onDelete: Cascade)
-  serverId    String
-  domains     domain[]
-  buttonEmoji String?
-  buttonLabel String?
-  buttonType  BUTTON?
+  groupId        String    @id @default(uuid())
+  createdAt      DateTime? @default(now())
+  createdBy      String?
+  updatedAt      DateTime? @updatedAt
+  updatedBy      String?
+  server         server    @relation(fields: [serverId], references: [serverId], onDelete: Cascade)
+  serverId       String
+  domains        domain[]
+  buttonEmoji    String?
+  buttonLabel    String?
+  buttonType     BUTTON?
+  requiredRoleId String?
 
   @@index([serverId, groupId])
 }
 
 model domain {
-  domainName    String      @id
-  id            String      @default(uuid())
+  domainName    String
+  id            String      @id @default(uuid())
   createdAt     DateTime?   @default(now())
   createdBy     String?
   updatedAt     DateTime?   @updatedAt
@@ -55,32 +56,34 @@ model serverSettings {
   server            server   @relation(fields: [serverId], references: [serverId], onDelete: Cascade)
   serverId          String   @id @unique
   logsWebhookUrl    String?
-  logsEnabled       Boolean  @default(false)
+  logsEnabled       Boolean  @default(false) // Implement later
   reportsWebhookUrl String?
-  reportsEnabled    Boolean  @default(false)
+  reportsEnabled    Boolean  @default(false) // also implement later
   usagePerUser      Int      @default(1)
 }
 
 model user {
-  userId      String   @id
-  createdAt   DateTime @default(now())
+  userId      String
+  id          String    @id @default(uuid())
+  createdAt   DateTime? @default(now())
   createdBy   String?
-  updatedAt   DateTime @updatedAt
-  server      server   @relation(fields: [serverId], references: [serverId], onDelete: Cascade)
+  updatedAt   DateTime? @updatedAt
+  server      server    @relation(fields: [serverId], references: [serverId], onDelete: Cascade)
   serverId    String
   usedDomains String[]
-  usageCount  Int      @default(0)
-  banned      Boolean? @default(false)
+  usageCount  Int       @default(0)
+  banned      Boolean?  @default(false)
 }
 
 model role {
-  roleId       String   @id @unique
-  createdAt    DateTime @default(now())
+  roleId       String    @id @unique
+  createdAt    DateTime? @default(now())
   createdBy    String?
-  updatedAt    DateTime @updatedAt
-  server       server   @relation(fields: [serverId], references: [serverId], onDelete: Cascade)
+  updatedAt    DateTime? @updatedAt
+  server       server    @relation(fields: [serverId], references: [serverId], onDelete: Cascade)
   serverId     String
   specialLimit Int?
+  adminRole    Boolean?  @default(false)
 }
 
 enum BUTTON {

src/buttons/Config_EditUsage.ts

@@ -1,4 +1,4 @@
-import { Button, Bot } from "../classes/Bot";
+import {Button, Bot, CommandPermissions} from "../classes/Bot";
 import { ButtonInteraction, ButtonStyle, ButtonBuilder } from "discord.js";
 
 export default class extends Button {
@@ -17,4 +17,10 @@ export default class extends Button {
         await interaction.showModal(await bot.getModal("configeditusagemdl")!.build([interaction.guild!.id]));
     }
 
+    override permissions(): CommandPermissions {
+        return {
+            adminRole: true
+        }
+    }
+
 }

src/buttons/Config_EditWebhookUrls.ts

@@ -1,4 +1,4 @@
-import { Button, Bot } from "../classes/Bot";
+import {Button, Bot, CommandPermissions} from "../classes/Bot";
 import { ButtonInteraction, ButtonStyle, ButtonBuilder } from "discord.js";
 
 export default class extends Button {
@@ -17,4 +17,10 @@ export default class extends Button {
         await interaction.showModal(await bot.getModal("configeditwebhookmdl")!.build([interaction.guild!.id]));
     }
 
+    override permissions(): CommandPermissions {
+        return {
+            adminRole: true
+        }
+    }
+
 }