discord.js-backup-v13 13.1.1 → 13.1.2

package/lib/create.js

@@ -89,6 +89,8 @@ async function getEmojis(guild, options) {
     return emojis;
 }
 exports.getEmojis = getEmojis;
+
+
 /**
  * Returns an array with the channels of the guild
  * @param {Guild} guild The discord guild
@@ -96,57 +98,51 @@ exports.getEmojis = getEmojis;
  * @returns {ChannelData[]} The channels of the guild
  */
 async function getChannels(guild, options) {
-    return new Promise(async (resolve) => {
-        const channels = {
-            categories: [],
-            others: []
+    const allChannels = guild.channels.cache;
+    
+    const categories = allChannels
+        .filter(ch => ch.type === 'GUILD_CATEGORY')
+        .sort((a, b) => a.position - b.position);
+
+    const categoryDataPromises = categories.map(async (category) => {
+        const children = allChannels
+            .filter(c => c.parentId === category.id)
+            .sort((a, b) => a.position - b.position);
+
+        const childrenData = await Promise.all(children.map(child => fetchAnyChannelData(child, options)));
+
+        return {
+            name: category.name,
+            permissions: (0, util_1.fetchChannelPermissions)(category),
+            children: childrenData
         };
+    });
 
-        const categories = guild.channels.cache
-            .filter((ch) => ch.type === 'GUILD_CATEGORY')
-            .sort((a, b) => a.position - b.position)
+    const others = allChannels
+        .filter(ch => !ch.parent && ch.type !== 'GUILD_CATEGORY' && !ch.isThread() && ch.type !== 'GUILD_STORE')
+        .sort((a, b) => a.position - b.position);
 
-        for (const category of categories.values()) {
+    const othersDataPromises = others.map(ch => fetchAnyChannelData(ch, options));
 
-            const categoryData = {
-                name: category.name,
-                permissions: (0, util_1.fetchChannelPermissions)(category),
-                children: []
-            };
-            const children = guild.channels.cache.filter(c => c.parentId == category.id).sort((a, b) => a.position - b.position)
+    const [categoriesResult, othersResult] = await Promise.all([
+        Promise.all(categoryDataPromises),
+        Promise.all(othersDataPromises)
+    ]);
 
-            for (const child of children.values()) {
+    return {
+        categories: categoriesResult,
+        others: othersResult
+    };
+}
 
-                if (child.type === 'GUILD_TEXT' || child.type === 'GUILD_NEWS') {
-                    const channelData = await (0, util_1.fetchTextChannelData)(child, options);
-                    categoryData.children.push(channelData);
-                }
-                else {
-                    const channelData = await (0, util_1.fetchVoiceChannelData)(child);
-                    categoryData.children.push(channelData);
-                }
-            }
-            channels.categories.push(categoryData);
-        }
-        const others = guild.channels.cache
-            .filter((ch) => {
-                return !ch.parent && ch.type !== 'GUILD_CATEGORY'
-                    && ch.type !== 'GUILD_STORE'
-                    && ch.type !== 'GUILD_NEWS_THREAD' && ch.type !== 'GUILD_PRIVATE_THREAD' && ch.type !== 'GUILD_PUBLIC_THREAD';
-            })
-            .sort((a, b) => a.position - b.position)
-            .toJSON();
-        for (const channel of others.values()) {
-            if (channel.type === 'GUILD_TEXT' || channel.type === 'GUILD_NEWS') {
-                const channelData = await (0, util_1.fetchTextChannelData)(channel, options);
-                channels.others.push(channelData);
-            }
-            else {
-                const channelData = await (0, util_1.fetchVoiceChannelData)(channel);
-                channels.others.push(channelData);
-            }
-        }
-        resolve(channels);
-    });
+/**
+ * Fonction utilitaire pour éviter la répétition de la logique IF/ELSE
+ */
+async function fetchAnyChannelData(channel, options) {
+    if (['GUILD_TEXT', 'GUILD_NEWS'].includes(channel.type)) {
+        return await (0, util_1.fetchTextChannelData)(channel, options);
+    } else {
+        return await (0, util_1.fetchVoiceChannelData)(channel);
+    }
 }
 exports.getChannels = getChannels;

package/lib/load.js

@@ -50,7 +50,7 @@ const loadRoles = (guild, backupData) => {
         if (roleData.isEveryone) {
             rolePromises.push(guild.roles.cache.get(guild.id).edit({
                 name: roleData.name,
-                color: roleData.color,
+                colors: { primaryColor: roleData.color },
                 permissions: BigInt(roleData.permissions),
                 mentionable: roleData.mentionable
             }));
@@ -58,7 +58,7 @@ const loadRoles = (guild, backupData) => {
         else {
             rolePromises.push(guild.roles.create({
                 name: roleData.name,
-                color: roleData.color,
+                colors: { primaryColor: roleData.color },
                 hoist: roleData.hoist,
                 permissions: BigInt(roleData.permissions),
                 mentionable: roleData.mentionable

package/lib/types/RoleData.d.ts

@@ -1,6 +1,6 @@
 export interface RoleData {
     name: string;
-    color: `#${string}`;
+    colors: { primaryColor: `#${string}` };
     hoist: boolean;
     permissions: string;
     mentionable: boolean;

package/lib/util.js

@@ -47,37 +47,41 @@ async function fetchVoiceChannelData(channel) {
 }
 exports.fetchVoiceChannelData = fetchVoiceChannelData;
 async function fetchChannelMessages(channel, options) {
-    let messages = [];
-    const messageCount = isNaN(options.maxMessagesPerChannel) ? 10 : options.maxMessagesPerChannel;
+    const messages = [];
+    const maxMessages = isNaN(options.maxMessagesPerChannel) ? 10 : options.maxMessagesPerChannel;
     const fetchOptions = { limit: 100 };
     let lastMessageId;
-    let fetchComplete = false;
-    while (!fetchComplete) {
-        if (lastMessageId) {
-            fetchOptions.before = lastMessageId;
-        }
+
+    const imageRegex = /\.(png|jpg|jpeg|jpe|jif|jfif|jfi)$/i;
+
+    while (messages.length < maxMessages) {
+        if (lastMessageId) fetchOptions.before = lastMessageId;
+
         const fetched = await channel.messages.fetch(fetchOptions);
-        if (fetched.size === 0) {
-            break;
-        }
+        if (fetched.size === 0) break;
+
         lastMessageId = fetched.last().id;
-        await Promise.all(fetched.map(async (msg) => {
-            if (!msg.author || messages.length >= messageCount) {
-                fetchComplete = true;
-                return;
-            }
+
+        for (const msg of fetched.values()) {
+            if (messages.length >= maxMessages) break;
+            if (!msg.author) continue;
+
             const files = await Promise.all(msg.attachments.map(async (a) => {
                 let attach = a.url;
-                if (a.url && ['png', 'jpg', 'jpeg', 'jpe', 'jif', 'jfif', 'jfi'].includes(a.url)) {
-                    if (options.saveImages && options.saveImages === 'base64') {
-                        attach = (await ((0, node_fetch_1.default)(a.url).then((res) => res.buffer()))).toString('base64');
+
+                if (options.saveImages === 'base64' && imageRegex.test(a.url)) {
+                    try {
+                        const response = await fetch(a.url);
+                        const buffer = await response.arrayBuffer();
+                        attach = Buffer.from(buffer).toString('base64');
+                    } catch (e) {
+                        console.error(`Erreur base64 sur ${a.url}:`, e);
                     }
                 }
-                return {
-                    name: a.name,
-                    attachment: attach
-                };
+
+                return { name: a.name, attachment: attach };
             }));
+
             messages.push({
                 username: msg.author.username,
                 avatar: msg.author.displayAvatarURL(),
@@ -87,8 +91,11 @@ async function fetchChannelMessages(channel, options) {
                 pinned: msg.pinned,
                 sentAt: msg.createdAt.toISOString(),
             });
-        }));
+        }
+        
+        if (fetched.size < 100) break; 
     }
+
     return messages;
 }
 exports.fetchChannelMessages = fetchChannelMessages;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord.js-backup-v13",
-  "version": "13.1.1",
+  "version": "13.1.2",
   "main": "lib/index.js",
   "files": [
     "lib/**/*"