💖 1.9.7 Auto defer ve daha iyi hata yakalama.

- `interactionDefaults` altına `autoDefer` eklendi. Artık otomatik olarak her interaksiyona cevap verebilirsiniz.
- `Underline.config.other` için `Underline.other` yan adı eklendi.
- Artık olaylarda ve otomatik tamamlamalarda yaşanan hatalar botu çökertmeyecek.
- Artık ototmatik tamamlamada bir çok userErrordan etkileniyor.

Author: TheArmagan

config.js

@@ -16,7 +16,7 @@ module.exports = new (require("./types/Config"))({
   // Botunuzun varsayılan dili.
   defaultLanguage: "tr",
   // Diğer ayarlar. Bunun içine ne isterseniz koyabilirsiniz.
-  // Ulaşmak için "Underline.config.other" objesini kullanabilirsiniz.
+  // Ulaşmak için "Underline.config.other" ve/veya "Underline.other" objesini kullanabilirsiniz.
   other: {
 
   },
@@ -39,25 +39,32 @@ module.exports = new (require("./types/Config"))({
     },
     // interaksiyon kapalı olduğunda
     disabled(interaction, uInteraction, other) {
+      if (interaction.isAutocomplete()) return [];
       interaction.reply({ ephemeral: true, content: other.locale.userErrors.disabled() });
     },
     // Kullanıcı bottan yasaklı olduğunda.
     blocked(interaction, uInteraction, other) {
+      if (interaction.isAutocomplete()) return [];
       interaction.reply({ ephemeral: true, content: other.locale.userErrors.blocked() });
     },
     // interaksiyon sadece geliştiricilere özel olduğunda.
     developerOnly(interaction, uInteraction, other) {
+      if (interaction.isAutocomplete()) return [];
       interaction.reply({ ephemeral: true, content: other.locale.userErrors.developerOnly() });
     },
     // interaksiyon sadece sunucu sahiplerine özel olduğunda.
     guildOwnerOnly(interaction, uInteraction, other) {
+      if (interaction.isAutocomplete()) return [];
       interaction.reply({ ephemeral: true, content: other.locale.userErrors.guildOwnerOnly() });
     },
+    // interaksiyon sadece sunuculara özel olduğunda.
     guildOnly(interaction, uInteraction, other) {
+      if (interaction.isAutocomplete()) return [];
       interaction.reply({ ephemeral: true, content: other.locale.userErrors.guildOnly() });
     },
     // Botun çalışmak için x yertkilerine ihtiyacı olduğunda.
     botPermsRequired(interaction, uInteraction, perms, other) {
+      if (interaction.isAutocomplete()) return [];
       interaction.reply({ ephemeral: true, content: other.locale.userErrors.botPermsRequired(perms.join(", ")) });
     },
     // Kullanıcının interaksiyonu kullanabilmek için x yetkilerine ihtiyacı olduğunda.
@@ -81,7 +88,8 @@ module.exports = new (require("./types/Config"))({
       user: []
     },
     options: [],
-    defaultPermission: true
+    defaultPermission: true,
+    autoDefer: "ephemeral"
   },
   // Bot ilk açıldığında daha hiçbirşey yüklenmeden önce çalışan fonksiyon. Opsiyonel.
   onBeforeLoad(client) {
@@ -122,7 +130,11 @@ module.exports = new (require("./types/Config"))({
   //
   // Other objesini istediğiniz gibi modifiye edebilirsiniz.
   // Nasılsa altakki fonksiyon her event çalışmadan önce çalışır.
-  async onEvent(eventName, [arg1 , arg2], other) {
+  async onEvent(eventName, [arg1, arg2], other) {
     return true;
-  }
+  },
+  // Olay hatasız bir şekilde çalıştıktan sonra çalışır.
+  async onAfterEvent(eventName, [arg1, arg2], other) {
+
+  },
 })

globals.d.ts

@@ -5,6 +5,8 @@ interface Underline {
   events: import("discord.js").Collection<string, import("./types/Event") >
   locales: import("discord.js").Collection<string, import("./types/Locale") >
   config: import("./types/Config");
+  other: { [key: string | number]: any; },
+  utils: typeof import("./other/utils.js");
   client: import("discord.js").Client;
   Interaction: typeof import("./types/Interaction"),
   SlashCommand: typeof import("./types/SlashCommand"),

index.js

@@ -1,6 +1,7 @@
 require("./other/patchConsoleLog");
 console.info(`[BİLGİ] Basit Altyapı v${require("./package.json").version} - by Kıraç Armağan Önal`);
 const config = require("./config");
+const utils = require("./other/utils");
 globalThis.Underline = config.globalObjects;
 const Discord = require("discord.js");
 const chillout = require("chillout");
@@ -17,10 +18,12 @@ let localeFiles;
 globalThis.Underline = {
   ...config.globalObjects,
   config,
+  other: config.other,
   client,
   interactions,
   events,
   locales,
+  utils,
   Interaction: require('./types/Interaction'),
   Event: require('./types/Event'),
   SlashCommand: require("./types/SlashCommand"),
@@ -238,9 +241,22 @@ async function load() {
             let before = await Underline.config.onEvent(eventName, args, other);
             if (!before) return;
             args.push(other);
-            chillout.forEach(events, (event) => {
+            chillout.forEach(events,
+              /** @param {import("./types/Event")} event */
+              (event) => {
               if (!event.disabled) {
-                event.onEvent(...args);
+                try {
+                  event.onEvent(...args);
+                  Underline.config.onAfterEvent(eventName, args, other);
+                } catch (err) {
+                  console.error(`[HATA] "${event.id}" idli ve "${eventName}" isimli olayda bir hata oluştu!`);
+                  if (err.message) console.error(`[HATA] ${err.message}`);
+                  if (err.stack) {
+                    `${err.stack}`.split("\n").forEach((line) => {
+                      console.error(`[HATA] ${line}`);
+                    });
+                  }
+                }
               }
             });
 
@@ -281,6 +297,7 @@ async function unload() {
   await chillout.forEach(eventListeners, (el) => {
     el.base.off(el.name, el.listener);
   })
+  eventListeners.length = 0;
 
   console.info(`[BILGI] Dil listesi temizleniyor..`);
   Underline.locales.clear();
@@ -325,20 +342,60 @@ client.on("interactionCreate", async (interaction) => {
 
   if (!uInter) return;
 
+  let other = {};
+
   if (interaction.isAutocomplete()) {
+    if (uInter.disabled) {
+      let r = await config.userErrors.disabled(interaction, uInter, other);
+      interaction.respond(r);
+      return;
+    }
+    if (config.blockedUsers.has(interaction.user.id)) {
+      let r = await config.userErrors.blocked(interaction, uInter, other);
+      interaction.respond(r);
+      return;
+    }
+    if (uInter.guildOnly && !interaction.guildId) {
+      let r = await config.userErrors.guildOnly(interaction, uInter, other);
+      interaction.respond(r);
+      return;
+    }
+    if (uInter.calculated.developerOnly && !config.developers.has(interaction.user.id)) {
+      let r = await config.userErrors.developerOnly(interaction, uInter, other);
+      interaction.respond(r);
+      return;
+    }
+    if (uInter.calculated.guildOwnerOnly && !config.developers.has(interaction.user.id) && interaction.guild.ownerId != interaction.user.id) {
+      let r = await config.userErrors.guildOwnerOnly(interaction, uInter, other);
+      interaction.respond(r);
+      return;
+    }
+    if (uInter.guildOnly && (!config.developers.has(interaction.user.id)) && uInter.perms.user.length != 0 && !uInter.perms.user.every(perm => interaction.member.permissions.has(perm))) {
+      let r = await config.userErrors.userPermsRequired(interaction, uInter, uInter.perms.user, other);
+      interaction.respond(r);
+      return;
+    }
     /** @type {Discord.ApplicationCommandOptionChoice} */
     let focussed = null;
     try { focussed = interaction.options.getFocused(true) } catch { };
     let option = uInter.options.find(i => i.autocomplete && i.name == focussed?.name);
     if (option) {
-      let completeResponse = await option.onComplete(interaction, focussed.value);
-      interaction.respond(completeResponse);
+      try {
+        let completeResponse = await option.onComplete(interaction, focussed.value);
+        interaction.respond(completeResponse);
+      } catch (err) {
+        console.error(`[HATA] "${uInter.actionType == "CHAT_INPUT" ? `/${uInter.name.join(" ")}` : `${uInter.name[0]}`}" adlı interaksiyon için otomatik tamamlama çalıştırılırken bir hata ile karşılaşıldı!`)
+        if (err.message) console.error(`[HATA] ${err.message}`);
+        if (err.stack) {
+          `${err.stack}`.split("\n").forEach((line) => {
+            console.error(`[HATA] ${line}`);
+          });
+        }
+      }
     }
     return;
   }
 
-  let other = {};
-
   {
     let locale_id = (interaction.user.locale || interaction.locale)?.split("-")[0];
     other.locale = (Underline.locales.get(locale_id) || Underline.locales.get(Underline.config.defaultLanguage)).data;
@@ -384,9 +441,30 @@ client.on("interactionCreate", async (interaction) => {
     return;
   }
 
+  if (uInter.autoDefer != "off") {
+    const newDefer = () => {
+      console.warn(`[UYARI] "${uInter.actionType == "CHAT_INPUT" ? `/${uInter.name.join(" ")}` : `${uInter.name[0]}`}" adlı interaksiyon için "deferReply" umursanmadı, interaksiyon zaten otomatik olarak bekleme moduna alınmış.`);
+    };
+    if (
+      interaction.isCommand() || interaction.isApplicationCommand() || interaction.isMessageContextMenu() || interaction.isUserContextMenu()
+    ) {
+      await interaction.deferReply(uInter.autoDefer == "ephemeral" ? { ephemeral: true } : null);
+      interaction.deferReply = newDefer;
+      interaction.reply = interaction.editReply;
+    } else if (
+      interaction.isButton() || interaction.isSelectMenu()
+    ) {
+      await utils.nullDefer(interaction);
+      interaction.deferReply = newDefer;
+      interaction.reply = interaction.editReply = interaction.followUp = () => {
+        console.warn(`[UYARI] "${uInter.name[0]}" adlı interaksiyon için "reply" umursanmadı, interaksiyona zaten otomatik olarak boş cevap verilmiş.`);
+      };
+    }
+  }
+
   if (typeof uInter.coolDown == "number") uInter.coolDown = [{
     type: "user",
-    amount: uInter.coolDown,
+    amount: uInter.coolDown
   }];
   if (typeof uInter.coolDown == "object" && !Array.isArray(uInter.coolDown)) uInter.coolDown = [uInter.coolDown];
 

other/utils.js

@@ -0,0 +1,13 @@
+module.exports = {
+  async nullDefer(interaction) {
+    await interaction.client.api.interactions(interaction.id, interaction.token).callback.post({
+      data: {
+        type: 6,
+        data: {
+          flags: null,
+        },
+      },
+    });
+    return true;
+  }
+}

package.json

@@ -18,7 +18,7 @@
     "@types/recursive-readdir": "^2.2.0"
   },
   "name": "armagan-basit-altyapi",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "description": "Kullanımı basit ancak bir yandanda içinde birçek özellik barındıran discord bot altyapısı.",
   "main": "index.js",
   "repository": {

readme.md

@@ -1,4 +1,4 @@
-# Basit Altyapı (Versiyon 1.9.6) (v13.x)
+# Basit Altyapı (Versiyon 1.9.7) (v13.x)
 
 Kullanımı basit ancak bir yandanda içinde birçek özellik barındıran discord bot altyapısı. Sık sık güncelleme alıyor. (Slash Commands)
 

types/Config.js

@@ -18,7 +18,7 @@ class Config {
   /** @type {{[key: string|number]: any}} */
   other = {};
 
-  /** @type {Command} */
+  /** @type {import("./Interaction").TOmittedInteraction} */
   interactionDefaults = {};
 
   /** @type {Set<string> | Array<string>} */
@@ -51,6 +51,9 @@ class Config {
   /** @type {(eventName: "applicationCommandCreate" | "applicationCommandDelete" | "applicationCommandUpdate" | "channelCreate" | "channelDelete" | "channelPinsUpdate" | "channelUpdate" | "debug" | "emojiCreate" | "emojiDelete" | "emojiUpdate" | "error" | "guildBanAdd" | "guildBanRemove" | "guildCreate" | "guildDelete" | "guildIntegrationsUpdate" | "guildMemberAdd" | "guildMemberAvailable" | "guildMemberRemove" | "guildMembersChunk" | "guildMemberUpdate" | "guildUnavailable" | "guildUpdate" | "interaction" | "interactionCreate" | "invalidated" | "invalidRequestWarning" | "inviteCreate" | "inviteDelete" | "message" | "messageCreate" | "messageDelete" | "messageDeleteBulk" | "messageReactionAdd" | "messageReactionRemove" | "messageReactionRemoveAll" | "messageReactionRemoveEmoji" | "messageUpdate" | "presenceUpdate" | "rateLimit" | "ready" | "roleCreate" | "roleDelete" | "roleUpdate" | "shardDisconnect" | "shardError" | "shardReady" | "shardReconnecting" | "shardResume" | "stageInstanceCreate" | "stageInstanceDelete" | "stageInstanceUpdate" | "stickerCreate" | "stickerDelete" | "stickerUpdate" | "threadCreate" | "threadDelete" | "threadListSync" | "threadMembersUpdate" | "threadMemberUpdate" | "threadUpdate" | "typingStart" | "userUpdate" | "voiceStateUpdate" | "warn" | "webhookUpdate", args: [], other: {[key:string|number]: any})=>boolean} */
   onEvent = async () => { return true; };
 
+  /** @type {(eventName: "applicationCommandCreate" | "applicationCommandDelete" | "applicationCommandUpdate" | "channelCreate" | "channelDelete" | "channelPinsUpdate" | "channelUpdate" | "debug" | "emojiCreate" | "emojiDelete" | "emojiUpdate" | "error" | "guildBanAdd" | "guildBanRemove" | "guildCreate" | "guildDelete" | "guildIntegrationsUpdate" | "guildMemberAdd" | "guildMemberAvailable" | "guildMemberRemove" | "guildMembersChunk" | "guildMemberUpdate" | "guildUnavailable" | "guildUpdate" | "interaction" | "interactionCreate" | "invalidated" | "invalidRequestWarning" | "inviteCreate" | "inviteDelete" | "message" | "messageCreate" | "messageDelete" | "messageDeleteBulk" | "messageReactionAdd" | "messageReactionRemove" | "messageReactionRemoveAll" | "messageReactionRemoveEmoji" | "messageUpdate" | "presenceUpdate" | "rateLimit" | "ready" | "roleCreate" | "roleDelete" | "roleUpdate" | "shardDisconnect" | "shardError" | "shardReady" | "shardReconnecting" | "shardResume" | "stageInstanceCreate" | "stageInstanceDelete" | "stageInstanceUpdate" | "stickerCreate" | "stickerDelete" | "stickerUpdate" | "threadCreate" | "threadDelete" | "threadListSync" | "threadMembersUpdate" | "threadMemberUpdate" | "threadUpdate" | "typingStart" | "userUpdate" | "voiceStateUpdate" | "warn" | "webhookUpdate", args: [], other: {[key:string|number]: any})=>any} */
+  onAfterEvent = async () => { return; };
+
   /** @type {{[key: string|number]: any}} */
   globalObjects = {};
 
@@ -103,7 +106,8 @@ class Config {
         user: []
       },
       options: [],
-      defaultPermission: true
+      defaultPermission: true,
+      autoDefer: "off"
     };
 
     if (
@@ -126,6 +130,7 @@ class Config {
     if (typeof arg.onInteraction == "function") this.onInteraction = arg.onInteraction;
 
     if (typeof arg.onEvent == "function") this.onEvent = arg.onEvent;
+    if (typeof arg.onAfterEvent == "function") this.onAfterEvent = arg.onAfterEvent;
   }
 }
 

types/Interaction.d.ts

@@ -38,7 +38,7 @@ export type CustomApplicationCommandOptionData = (
   ApplicationCommandNonOptionsData
   | ApplicationCommandChannelOptionData
   | ApplicationCommandChoicesData
-) & { onComplete(interaction: AutocompleteInteraction, value: string | number): ApplicationCommandOptionChoice[] }
+) & { onComplete(interaction: AutocompleteInteraction, value: string | number, other: IOther): ApplicationCommandOptionChoice[] }
 
 type cooldown = {
   type: cooldownType;
@@ -54,7 +54,7 @@ export class BaseInteraction {
   perms?: { bot: PermissionString[], user: UserPermString[] };
   onInteraction(interaction: CommandInteraction | ContextMenuInteraction, other: IOther): void;
   toJSON(): MessageButton | MessageSelectMenu | undefined;
-  publishType?: "globalOnly" | "guildOnly" | "all";
+  publishType?: "globalOnly" | "guildOnly" | "all" | string;
   onLoad?(client: Client): void;
   coolDowns: Map<string, number>;
   description!: string;
@@ -65,6 +65,8 @@ export class BaseInteraction {
   options?: CustomApplicationCommandOptionData[];
   defaultPermission?: boolean;
   actionType?: ApplicationCommandType | "SELECT_MENU" | "BUTTON";
+  autoDefer?: "off" | "on" | "ephemeral";
+  calculated?: { [key: string | number]: any };
   isSelectMenu(): this is import("./SelectMenu");
   isButton(): this is import("./Button");
   isChatActionCommand(): this is import("./SlashCommand");
@@ -73,7 +75,7 @@ export class BaseInteraction {
   constructor(arg: TInteractionConstructor);
 }
 
-export type TOmittedInteraction = Omit<BaseInteraction, "_type" | "coolDowns" | "name" | "onInteraction" | "actionType" | "options" | "toJSON">;
+export type TOmittedInteraction = Omit<BaseInteraction, "_type" | "coolDowns" | "name" | "onInteraction" | "actionType" | "options" | "toJSON" | "calculated">;
 export type TInteractionConstructor = TOmittedInteraction & ((ActionChatCommand | ActionRightClickCommand | SelectMenu | Button));
 type cooldownType = "user" | "member" | "channel" | "guild" | "message" | "any";
 export interface IOther {

types/Interaction.js

@@ -37,6 +37,10 @@ class Interaction {
 
   actionType = "CHAT_INPUT"
 
+  autoDefer = "off";
+
+  calculated = {};
+
   constructor(arg = {}) {
     this.name = Array.isArray(arg.name) ? arg.name : [arg.name];
     this.actionType = arg.actionType || Underline.config.interactionDefaults.actionType;
@@ -56,6 +60,7 @@ class Interaction {
     this.options = arg.options;
     this.publishType = arg.publishType ?? "all";
     this.defaultPermission = Boolean(arg.defaultPermission ?? Underline.config.interactionDefaults.defaultPermission);
+    this.autoDefer = arg.autoDefer ?? Underline.config.interactionDefaults.autoDefer;
   }
 }