djs-selfbot-v13 3.7.26 → 3.7.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "djs-selfbot-v13",
-  "version": "3.7.26",
+  "version": "3.7.28",
   "description": "An unofficial discord.js fork for creating selfbots",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",

package/src/client/actions/GuildJoinRequestCreate.js

@@ -6,16 +6,23 @@ const { Events } = require('../../util/Constants');
 class GuildJoinRequestCreateAction extends Action {
   handle(data) {
     const client = this.client;
-    const guild = client.guilds.cache.get(data.guild_id);
+    const guildId = data.guild_id ?? data.request?.guild_id;
+    const guild = client.guilds.cache.get(guildId);
 
     if (guild) {
-      const requestData = data.request || data;
+      const requestData = data.request ?? data;
+      // Ensure guild_id is present on the request data
+      if (!requestData.guild_id) requestData.guild_id = guildId;
+      // Pass status from top-level if present
+      if (data.status && !requestData.application_status) {
+        requestData.application_status = data.status;
+      }
       const joinRequest = guild.demandes._add(requestData);
 
       /**
-       * Emitted whenever a join request is created.
+       * Emitted whenever a join request is created or updated.
        * @event Client#guildJoinRequestCreate
-       * @param {GuildJoinRequest} joinRequest The created join request
+       * @param {GuildJoinRequest} joinRequest The join request
        */
       client.emit(Events.GUILD_JOIN_REQUEST_CREATE, joinRequest);
 

package/src/client/actions/GuildJoinRequestDelete.js

@@ -6,22 +6,32 @@ const { Events } = require('../../util/Constants');
 class GuildJoinRequestDeleteAction extends Action {
   handle(data) {
     const client = this.client;
-    const guild = client.guilds.cache.get(data.guild_id);
+    const guildId = data.guild_id ?? data.request?.guild_id;
+    const guild = client.guilds.cache.get(guildId);
 
     if (guild) {
-      const joinRequest = guild.demandes.cache.get(data.user_id);
-      if (joinRequest) {
-        guild.demandes.cache.delete(data.user_id);
+      const userId = data.user_id ?? data.request?.user_id;
+      const joinRequest = guild.demandes.cache.get(userId);
+      guild.demandes.cache.delete(userId);
 
-        /**
-         * Emitted whenever a join request is deleted.
-         * @event Client#guildJoinRequestDelete
-         * @param {GuildJoinRequest} joinRequest The deleted join request
-         */
+      /**
+       * Emitted whenever a join request is deleted/cancelled.
+       * @event Client#guildJoinRequestDelete
+       * @param {GuildJoinRequest} joinRequest The deleted join request (or raw data if not cached)
+       * @param {Guild} guild The guild
+       */
+      if (joinRequest) {
         client.emit(Events.GUILD_JOIN_REQUEST_DELETE, joinRequest);
-
-        return { joinRequest };
+      } else {
+        // Emit with a minimal object even if not previously cached
+        const GuildJoinRequest = require('../../structures/GuildJoinRequest');
+        const requestData = data.request ?? data;
+        if (!requestData.guild_id) requestData.guild_id = guildId;
+        const newRequest = new GuildJoinRequest(client, requestData, guild);
+        client.emit(Events.GUILD_JOIN_REQUEST_DELETE, newRequest);
       }
+
+      return { joinRequest };
     }
 
     return {};

package/src/client/websocket/handlers/GUILD_JOIN_REQUEST_UPDATE.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = (client, packet) => {
+  // UPDATE uses the same action as CREATE (upsert into cache)
+  client.actions.GuildJoinRequestCreate.handle(packet.d);
+};

package/src/client/websocket/handlers/index.js

@@ -22,6 +22,7 @@ const handlers = Object.fromEntries([
   ['GUILD_MEMBERS_CHUNK', require('./GUILD_MEMBERS_CHUNK')],
   ['GUILD_INTEGRATIONS_UPDATE', require('./GUILD_INTEGRATIONS_UPDATE')],
   ['GUILD_JOIN_REQUEST_CREATE', require('./GUILD_JOIN_REQUEST_CREATE')],
+  ['GUILD_JOIN_REQUEST_UPDATE', require('./GUILD_JOIN_REQUEST_UPDATE')],
   ['GUILD_JOIN_REQUEST_DELETE', require('./GUILD_JOIN_REQUEST_DELETE')],
   ['GUILD_ROLE_CREATE', require('./GUILD_ROLE_CREATE')],
   ['GUILD_ROLE_DELETE', require('./GUILD_ROLE_DELETE')],

package/src/util/Constants.js

@@ -478,6 +478,7 @@ exports.Events = {
   MESSAGE_POLL_VOTE_REMOVE: 'messagePollVoteRemove',
   VOICE_CHANNEL_EFFECT_SEND: 'voiceChannelEffectSend',
   GUILD_JOIN_REQUEST_CREATE: 'guildJoinRequestCreate',
+  GUILD_JOIN_REQUEST_UPDATE: 'guildJoinRequestCreate',
   GUILD_JOIN_REQUEST_DELETE: 'guildJoinRequestDelete',
   // Djs v12
   VOICE_BROADCAST_SUBSCRIBE: 'subscribe',
@@ -644,6 +645,7 @@ exports.WSEvents = keyMirror([
   'GUILD_SCHEDULED_EVENT_USER_REMOVE',
   'GUILD_AUDIT_LOG_ENTRY_CREATE',
   'GUILD_JOIN_REQUEST_CREATE',
+  'GUILD_JOIN_REQUEST_UPDATE',
   'GUILD_JOIN_REQUEST_DELETE',
 ]);
 

package/typings/index.d.ts

@@ -6362,6 +6362,8 @@ export interface ClientEvents extends BaseClientEvents {
   callDelete: [call: CallState];
   messagePollVoteAdd: [pollAnswer: PollAnswer, userId: Snowflake];
   messagePollVoteRemove: [pollAnswer: PollAnswer, userId: Snowflake];
+  guildJoinRequestCreate: [joinRequest: GuildJoinRequest];
+  guildJoinRequestDelete: [joinRequest: GuildJoinRequest];
 }
 
 export interface ClientFetchInviteOptions {