🔖 v3.3.1

Androz2091 · Jan 5, 2023 · e93677e · e93677e
1 parent 5cb05fc
commit e93677e
Show file tree

Hide file tree

Showing 11 changed files with 251 additions and 125 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "discord-backup",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "A complete framework to facilitate server backup using discord.js v12",
   "main": "lib/index.js",
   "files": [

diff --git a/src/create.ts b/src/create.ts
@@ -8,7 +8,8 @@ import type {
     TextChannelData,
     VoiceChannelData
 } from './types';
-import type { CategoryChannel, ChannelType, Collection, Guild, GuildChannel, Snowflake, TextChannel, ThreadChannel, VoiceChannel } from 'discord.js';
+import type { CategoryChannel, Collection, Guild, GuildChannel, Snowflake, TextChannel, ThreadChannel, VoiceChannel } from 'discord.js';
+import { ChannelType } from 'discord.js';
 import nodeFetch from 'node-fetch';
 import { fetchChannelPermissions, fetchTextChannelData, fetchVoiceChannelData } from './util';
 import { MemberData } from './types/MemberData';
@@ -122,7 +123,7 @@ export async function getChannels(guild: Guild, options: CreateOptions) {
                 children: [] // The children channels of the category
             };
             // Gets the children channels of the category and sort them by position
-            const children = category.children.sort((a, b) => a.position - b.position).toJSON();
+            const children = category.children.cache.sort((a, b) => a.position - b.position).toJSON();
             for (const child of children) {
                 // For each child channel
                 if (child.type === ChannelType.GuildText || child.type === ChannelType.GuildNews) {
@@ -146,7 +147,7 @@ export async function getChannels(guild: Guild, options: CreateOptions) {
             .toJSON();
         for (const channel of others) {
             // For each channel
-            if (channel.type === ChnanelType.GuildText || channel.type === ChannelType.GuildNews) {
+            if (channel.type === ChannelType.GuildText || channel.type === ChannelType.GuildNews) {
                 const channelData: TextChannelData = await fetchTextChannelData(channel as TextChannel, options); // Gets the channel data
                 channels.others.push(channelData); // Update channels object
             } else {

diff --git a/src/index.ts b/src/index.ts
@@ -97,15 +97,15 @@ export const create = async (
                 members: [],
                 createdTimestamp: Date.now(),
                 guildID: guild.id,
-                id: options.backupID ?? SnowflakeUtil.generate(Date.now())
+                id: options.backupID ?? SnowflakeUtil.generate().toString()
             };
             if (guild.iconURL()) {
                 if (options && options.saveImages && options.saveImages === 'base64') {
                     backupData.iconBase64 = (
-                        await nodeFetch(guild.iconURL({ dynamic: true })).then((res) => res.buffer())
+                        await nodeFetch(guild.iconURL()).then((res) => res.buffer())
                     ).toString('base64');
                 }
-                backupData.iconURL = guild.iconURL({ dynamic: true });
+                backupData.iconURL = guild.iconURL();
             }
             if (guild.splashURL()) {
                 if (options && options.saveImages && options.saveImages === 'base64') {

diff --git a/src/load.ts b/src/load.ts
@@ -1,5 +1,6 @@
 import type { BackupData, LoadOptions } from './types';
-import type { ChannelType, Emoji, Guild, GuildFeature, GuildChannel, Role, VoiceChannel } from 'discord.js';
+import type { NewsChannel, TextChannel, ForumChannel, VoiceBasedChannel } from 'discord.js';
+import { ChannelType, Emoji, Guild, GuildFeature, Role, VoiceChannel } from 'discord.js';
 import { loadCategory, loadChannel } from './util';
 
 /**
@@ -110,9 +111,15 @@ export const loadEmojis = (guild: Guild, backupData: BackupData): Promise<Emoji[
     const emojiPromises: Promise<Emoji>[] = [];
     backupData.emojis.forEach((emoji) => {
         if (emoji.url) {
-            emojiPromises.push(guild.emojis.create(emoji.url, emoji.name));
+            emojiPromises.push(guild.emojis.create({
+                name: emoji.name,
+                attachment: emoji.url
+            }));
         } else if (emoji.base64) {
-            emojiPromises.push(guild.emojis.create(Buffer.from(emoji.base64, 'base64'), emoji.name));
+            emojiPromises.push(guild.emojis.create({
+                name: emoji.name,
+                attachment: Buffer.from(emoji.base64, 'base64')
+            }));
         }
     });
     return Promise.all(emojiPromises);
@@ -142,7 +149,7 @@ export const loadEmbedChannel = (guild: Guild, backupData: BackupData): Promise<
         embedChannelPromises.push(
             guild.setWidgetSettings({
                 enabled: backupData.widget.enabled,
-                channel: guild.channels.cache.find((ch) => ch.name === backupData.widget.channel)
+                channel: guild.channels.cache.find((ch) => ch.name === backupData.widget.channel) as NewsChannel | TextChannel | ForumChannel | VoiceBasedChannel
             })
         );
     }

diff --git a/src/types/BackupData.ts b/src/types/BackupData.ts
@@ -1,14 +1,14 @@
-import { DefaultMessageNotificationLevel, ExplicitContentFilterLevel, Snowflake, VerificationLevel } from 'discord.js';
+import { GuildDefaultMessageNotifications, GuildExplicitContentFilter, Snowflake, GuildVerificationLevel } from 'discord.js';
 import { AfkData, BanData, ChannelsData, EmojiData, RoleData, WidgetData } from './';
 import { MemberData } from './MemberData';
 
 export interface BackupData {
     name: string;
     iconURL?: string;
     iconBase64?: string;
-    verificationLevel: VerificationLevel;
-    explicitContentFilter: ExplicitContentFilterLevel;
-    defaultMessageNotifications: DefaultMessageNotificationLevel | number;
+    verificationLevel: GuildVerificationLevel;
+    explicitContentFilter: GuildExplicitContentFilter;
+    defaultMessageNotifications: GuildDefaultMessageNotifications | number;
     afk?: AfkData;
     widget: WidgetData;
     splashURL?: string;

diff --git a/src/types/BaseChannelData.ts b/src/types/BaseChannelData.ts
@@ -1,8 +1,8 @@
-import { TextBasedChannelTypes, VoiceBasedChannelTypes, ThreadChannelTypes } from 'discord.js';
+import { TextBasedChannelTypes, VoiceBasedChannelTypes, ThreadChannelType } from 'discord.js';
 import { ChannelPermissionsData } from './';
 
 export interface BaseChannelData {
-    type: TextBasedChannelTypes | VoiceBasedChannelTypes | ThreadChannelTypes;
+    type: TextBasedChannelTypes | VoiceBasedChannelTypes | ThreadChannelType;
     name: string;
     parent?: string;
     permissions: ChannelPermissionsData[];

diff --git a/src/types/MessageData.ts b/src/types/MessageData.ts
@@ -1,11 +1,14 @@
-import { MessageEmbed, FileOptions } from 'discord.js';
+import { APIEmbed } from 'discord.js';
 
 export interface MessageData {
     username: string;
     avatar?: string;
     content?: string;
-    embeds?: MessageEmbed[];
-    files?: FileOptions[];
+    embeds?: APIEmbed[];
+    files?: {
+        name: string;
+        attachment: string;
+    }[];
     pinned?: boolean;
     sentAt: string;
 }
diff --git a/src/types/ThreadChannelData.ts b/src/types/ThreadChannelData.ts
@@ -1,8 +1,8 @@
-import { Snowflake, ThreadAutoArchiveDuration, ThreadChannelTypes } from "discord.js";
+import { Snowflake, ThreadAutoArchiveDuration, ThreadChannelType } from "discord.js";
 import { MessageData } from "./MessageData";
 
 export interface ThreadChannelData {
-    type: ThreadChannelTypes;
+    type: ThreadChannelType;
     name: string;
     archived: boolean;
     autoArchiveDuration: ThreadAutoArchiveDuration;

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -1,5 +1,3 @@
-import type { GuildFeatures } from 'discord.js';
-
 export * from './AfkData';
 export * from './BackupData';
 export * from './BackupInfos';

diff --git a/src/util.ts b/src/util.ts
@@ -8,9 +8,8 @@ import type {
     ThreadChannelData,
     VoiceChannelData
 } from './types';
-import type {
+import {
     CategoryChannel,
-    ChannelLogsQueryOptions,
     ChannelType, 
     Collection,
     Guild,
@@ -24,18 +23,22 @@ import type {
     TextChannel,
     VoiceChannel,
     NewsChannel,
-    PremiumTier,
     ThreadChannel,
-    GuildFeatures,
-    Webhook
+    Webhook,
+    GuildPremiumTier,
+    GuildExplicitContentFilter,
+    GuildVerificationLevel,
+    FetchMessagesOptions,
+    OverwriteType,
+    AttachmentBuilder
 } from 'discord.js';
 import nodeFetch from 'node-fetch';
 
-const MaxBitratePerTier: Record<PremiumTier, number> = {
-    None: 64000,
-    Tier1: 128000,
-    Tier2: 256000,
-    Tier3: 384000
+const MaxBitratePerTier: Record<GuildPremiumTier, number> = {
+    [GuildPremiumTier.None]: 64000,
+    [GuildPremiumTier.Tier1]: 128000,
+    [GuildPremiumTier.Tier2]: 256000,
+    [GuildPremiumTier.Tier3]: 384000
 };
 
 /**
@@ -44,7 +47,7 @@ const MaxBitratePerTier: Record<PremiumTier, number> = {
 export function fetchChannelPermissions(channel: TextChannel | VoiceChannel | CategoryChannel | NewsChannel) {
     const permissions: ChannelPermissionsData[] = [];
     channel.permissionOverwrites.cache
-        .filter((p) => p.type === 'role')
+        .filter((p) => p.type === OverwriteType.Role)
         .forEach((perm) => {
             // For each overwrites permission
             const role = channel.guild.roles.cache.get(perm.id);
@@ -80,7 +83,7 @@ export async function fetchVoiceChannelData(channel: VoiceChannel) {
 export async function fetchChannelMessages (channel: TextChannel | NewsChannel | ThreadChannel, options: CreateOptions): Promise<MessageData[]> {
     let messages: MessageData[] = [];
     const messageCount: number = isNaN(options.maxMessagesPerChannel) ? 10 : options.maxMessagesPerChannel;
-    const fetchOptions: ChannelLogsQueryOptions = { limit: 100 };
+    const fetchOptions: FetchMessagesOptions = { limit: 100 };
     let lastMessageId: Snowflake;
     let fetchComplete: boolean = false;
     while (!fetchComplete) {
@@ -179,7 +182,8 @@ export async function fetchTextChannelData(channel: TextChannel | NewsChannel, o
  */
 export async function loadCategory(categoryData: CategoryData, guild: Guild) {
     return new Promise<CategoryChannel>((resolve) => {
-        guild.channels.create(categoryData.name, {
+        guild.channels.create({
+            name: categoryData.name,
             type: ChannelType.GuildCategory
         }).then(async (category) => {
             // When the category is created
@@ -229,7 +233,9 @@ export async function loadChannel(
                             username: msg.username,
                             avatarURL: msg.avatar,
                             embeds: msg.embeds,
-                            files: msg.files,
+                            files: msg.files.map((f) => new AttachmentBuilder(f.attachment, {
+                                name: f.name
+                            })),
                             allowedMentions: options.allowedMentions,
                             threadId: channel.isThread() ? channel.id : undefined
                         })
@@ -258,7 +264,7 @@ export async function loadChannel(
             let bitrate = (channelData as VoiceChannelData).bitrate;
             const bitrates = Object.values(MaxBitratePerTier);
             while (bitrate > MaxBitratePerTier[guild.premiumTier]) {
-                bitrate = bitrates[Object.keys(MaxBitratePerTier).indexOf(guild.premiumTier) - 1];
+                bitrate = bitrates[guild.premiumTier];
             }
             createOptions.bitrate = bitrate;
             createOptions.userLimit = (channelData as VoiceChannelData).userLimit;