Merge pull request #88 from RainyXeon/dev

feat: admin on ByteBlaze
RainyXeon · May 8, 2024 · e9a4914 · e9a4914
2 parents 5749630 + 7b3c738
commit e9a4914
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 5 deletions.
diff --git a/example.full.app.yml b/example.full.app.yml
@@ -8,6 +8,7 @@ bot:
   TOKEN: "Bot Token"
   EMBED_COLOR: "#2B2D31"
   OWNER_ID: "Your User ID"
+  ADMIN: ["<your_trusted_admin_discord_id_here>"]
   LANGUAGE: "en" # You can set it to en, vi...
   LIMIT_TRACK: 50 # The number of tracks you want to limit
   LIMIT_PLAYLIST: 20 # The number of playlist you want to limit
@@ -86,3 +87,5 @@ features:
   WEB_SERVER:
     enable: false
     port: 3000
+    whitelist: [] # Example: ["lavalink.dev"]
+    auth: "youshallnotpass"
diff --git a/src/@types/Config.ts b/src/@types/Config.ts
@@ -10,6 +10,7 @@ export interface Bot {
   TOKEN: string;
   EMBED_COLOR: string;
   OWNER_ID: string;
+  ADMIN: string[];
   LANGUAGE: string;
   LIMIT_TRACK: number;
   LIMIT_PLAYLIST: number;

diff --git a/src/commands/Owner/Announcement.ts b/src/commands/Owner/Announcement.ts
@@ -7,7 +7,7 @@ export default class implements Command {
   public name = ["announcement"];
   public description = "Send announcement mesage to all server";
   public category = "Owner";
-  public accessableby = Accessableby.Owner;
+  public accessableby = Accessableby.Admin;
   public usage = "<your_message>";
   public aliases = ["an"];
   public lavalink = false;

diff --git a/src/commands/Premium/Generate.ts b/src/commands/Premium/Generate.ts
@@ -9,7 +9,7 @@ export default class implements Command {
   public name = ["pm-generate"];
   public description = "Generate a premium code!";
   public category = "Premium";
-  public accessableby = Accessableby.Owner;
+  public accessableby = Accessableby.Admin;
   public usage = "<type> <number>";
   public aliases = [];
   public lavalink = false;

diff --git a/src/commands/Premium/Remove.ts b/src/commands/Premium/Remove.ts
@@ -7,7 +7,7 @@ export default class implements Command {
   public name = ["pm-remove"];
   public description = "Remove premium from members!";
   public category = "Premium";
-  public accessableby = Accessableby.Owner;
+  public accessableby = Accessableby.Admin;
   public usage = "<id>";
   public aliases = ["prm"];
   public lavalink = false;

diff --git a/src/events/guild/interactionCreate.ts b/src/events/guild/interactionCreate.ts
@@ -168,7 +168,25 @@ export default class {
         ],
       });
 
-    if (command.accessableby == Accessableby.Voter && isHavePremium && client.topgg) {
+    if (
+      command.accessableby == Accessableby.Admin &&
+      interaction.user.id != client.owner &&
+      !client.config.bot.ADMIN.includes(interaction.user.id)
+    )
+      return interaction.reply({
+        embeds: [
+          new EmbedBuilder()
+            .setDescription(`${client.getString(language, "error", "no_perms", { perm: "dreamvast@admin" })}`)
+            .setColor(client.color),
+        ],
+      });
+
+    if (
+      command.accessableby == Accessableby.Voter &&
+      isHavePremium &&
+      client.topgg &&
+      interaction.user.id != client.owner
+    ) {
       const voteChecker = await client.topgg.checkVote(interaction.user.id);
       if (voteChecker == TopggServiceEnum.ERROR) {
         const embed = new EmbedBuilder()
@@ -199,7 +217,7 @@ export default class {
       }
     }
 
-    if (command.accessableby == Accessableby.Premium && isHavePremium) {
+    if (command.accessableby == Accessableby.Premium && isHavePremium && interaction.user.id != client.owner) {
       const embed = new EmbedBuilder()
         .setAuthor({
           name: `${client.getString(language, "error", "no_premium_author")}`,

diff --git a/src/services/ConfigDataService.ts b/src/services/ConfigDataService.ts
@@ -92,6 +92,7 @@ export class ConfigDataService {
         SAFE_ICONS_MODE: true,
         DELETE_MSG_TIMEOUT: 2000,
         DEBUG_MODE: false,
+        ADMIN: [],
       },
       lavalink: {
         SPOTIFY: {