disgroove 2.2.2-dev.4aafdf4 → 2.2.2-dev.bd3875c

package/dist/lib/utils/Util.js

@@ -3,182 +3,114 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Util = void 0;
 const constants_1 = require("../constants");
 class Util {
-    auditLogFromRaw(auditLog) {
-        return {
-            applicationCommands: auditLog.application_commands.map((applicationCommand) => this.applicationCommandFromRaw(applicationCommand)),
-            auditLogEntries: auditLog.audit_log_entries.map((auditLogEntry) => this.auditLogEntryFromRaw(auditLogEntry)),
-            autoModerationRules: auditLog.auto_moderation_rules.map((autoModerationRule) => this.autoModerationRuleFromRaw(autoModerationRule)),
-            guildScheduledEvents: auditLog.guild_scheduled_events.map((guildScheduledEvent) => this.guildScheduledEventFromRaw(guildScheduledEvent)),
-            integrations: auditLog.integrations.map((integration) => this.integrationFromRaw(integration)),
-            threads: auditLog.threads.map((thread) => this.channelFromRaw(thread)),
-            users: auditLog.users.map((user) => this.userFromRaw(user)),
-            webhooks: auditLog.webhooks.map((webhook) => this.webhookFromRaw(webhook)),
-        };
-    }
-    auditLogToRaw(auditLog) {
-        return {
-            application_commands: auditLog.applicationCommands.map((applicationCommand) => this.applicationCommandToRaw(applicationCommand)),
-            audit_log_entries: auditLog.auditLogEntries.map((auditLogEntry) => this.auditLogEntryToRaw(auditLogEntry)),
-            auto_moderation_rules: auditLog.autoModerationRules.map((autoModerationRule) => this.autoModerationRuleToRaw(autoModerationRule)),
-            guild_scheduled_events: auditLog.guildScheduledEvents.map((guildScheduledEvent) => this.guildScheduledEventToRaw(guildScheduledEvent)),
-            integrations: auditLog.integrations.map((integration) => this.integrationToRaw(integration)),
-            threads: auditLog.threads.map((thread) => this.channelToRaw(thread)),
-            users: auditLog.users.map((user) => this.userToRaw(user)),
-            webhooks: auditLog.webhooks.map((webhook) => this.webhookToRaw(webhook)),
-        };
-    }
-    auditLogEntryFromRaw(auditLogEntry) {
-        return {
-            targetID: auditLogEntry.target_id,
-            changes: auditLogEntry.changes?.map((auditLogChange) => ({
-                newValue: auditLogChange.new_value,
-                oldValue: auditLogChange.old_value,
-                key: auditLogChange.key,
-            })),
-            userID: auditLogEntry.user_id,
-            id: auditLogEntry.id,
-            actionType: auditLogEntry.action_type,
-            options: auditLogEntry.options !== undefined
-                ? {
-                    applicationID: auditLogEntry.options.application_id,
-                    autoModerationRuleName: auditLogEntry.options.auto_moderation_rule_name,
-                    autoModerationRuleTriggerType: auditLogEntry.options.auto_moderation_rule_trigger_type,
-                    channelID: auditLogEntry.options.channel_id,
-                    count: auditLogEntry.options.count,
-                    deleteMemberDays: auditLogEntry.options.delete_member_days,
-                    id: auditLogEntry.options.id,
-                    membersRemoved: auditLogEntry.options.members_removed,
-                    messageID: auditLogEntry.options.message_id,
-                    roleName: auditLogEntry.options.role_name,
-                    type: auditLogEntry.options.type,
-                    integrationType: auditLogEntry.options.integration_type,
-                }
-                : undefined,
-            reason: auditLogEntry.reason,
-        };
-    }
-    auditLogEntryToRaw(auditLogEntry) {
-        return {
-            target_id: auditLogEntry.targetID,
-            changes: auditLogEntry.changes?.map((auditLogChange) => ({
-                new_value: auditLogChange.newValue,
-                old_value: auditLogChange.oldValue,
-                key: auditLogChange.key,
-            })),
-            user_id: auditLogEntry.userID,
-            id: auditLogEntry.id,
-            action_type: auditLogEntry.actionType,
-            options: auditLogEntry.options !== undefined
-                ? {
-                    application_id: auditLogEntry.options.applicationID,
-                    auto_moderation_rule_name: auditLogEntry.options.autoModerationRuleName,
-                    auto_moderation_rule_trigger_type: auditLogEntry.options.autoModerationRuleTriggerType,
-                    channel_id: auditLogEntry.options.channelID,
-                    count: auditLogEntry.options.count,
-                    delete_member_days: auditLogEntry.options.deleteMemberDays,
-                    id: auditLogEntry.options.id,
-                    members_removed: auditLogEntry.options.membersRemoved,
-                    message_id: auditLogEntry.options.messageID,
-                    role_name: auditLogEntry.options.roleName,
-                    type: auditLogEntry.options.type,
-                    integration_type: auditLogEntry.options.integrationType,
-                }
-                : undefined,
-            reason: auditLogEntry.reason,
-        };
-    }
-    autoModerationRuleFromRaw(autoModerationRule) {
+    applicationCommandFromRaw(applicationCommand) {
         return {
-            id: autoModerationRule.id,
-            guildID: autoModerationRule.guild_id,
-            name: autoModerationRule.name,
-            creatorID: autoModerationRule.creator_id,
-            eventType: autoModerationRule.event_type,
-            triggerType: autoModerationRule.trigger_type,
-            triggerMetadata: {
-                keywordFilter: autoModerationRule.trigger_metadata.keyword_filter,
-                regexPatterns: autoModerationRule.trigger_metadata.regex_patterns,
-                presets: autoModerationRule.trigger_metadata.presets,
-                allowList: autoModerationRule.trigger_metadata.allow_list,
-                mentionTotalLimit: autoModerationRule.trigger_metadata.mention_total_limit,
-                mentionRaidProtection: autoModerationRule.trigger_metadata.mention_raid_protection,
-            },
-            actions: autoModerationRule.actions.map((action) => ({
-                type: action.type,
-                metadata: {
-                    channelID: action.metadata.channel_id,
-                    durationSeconds: action.metadata.duration_seconds,
-                    customMessage: action.metadata.custom_message,
-                },
+            id: applicationCommand.id,
+            type: applicationCommand.type,
+            applicationID: applicationCommand.application_id,
+            guildID: applicationCommand.guild_id,
+            name: applicationCommand.name,
+            nameLocalizations: applicationCommand.name_localizations,
+            description: applicationCommand.description,
+            descriptionLocalizations: applicationCommand.description_localizations,
+            options: applicationCommand.options?.map((option) => ({
+                type: option.type,
+                name: option.name,
+                name_localizations: option.name_localizations,
+                description: option.description,
+                description_localizations: option.description_localizations,
+                required: option.required,
+                choices: option.choices?.map((choice) => ({
+                    name: choice.name,
+                    name_localizations: choice.name_localizations,
+                    value: choice.value,
+                })),
+                options: option.options?.map((o) => ({
+                    type: o.type,
+                    name: o.name,
+                    name_localizations: o.name_localizations,
+                    description: o.description,
+                    description_localizations: o.description_localizations,
+                    required: o.required,
+                    choices: o.choices?.map((choice) => ({
+                        name: choice.name,
+                        name_localizations: choice.name_localizations,
+                        value: choice.value,
+                    })),
+                    channel_types: o.channel_types,
+                    min_value: o.min_value,
+                    max_value: o.max_value,
+                    min_length: o.min_length,
+                    max_length: o.max_length,
+                    autocomplete: o.autocomplete,
+                })),
+                channel_types: option.channel_types,
+                min_value: option.min_value,
+                max_value: option.max_value,
+                min_length: option.min_length,
+                max_length: option.max_length,
+                autocomplete: option.autocomplete,
             })),
-            enabled: autoModerationRule.enabled,
-            exemptRoles: autoModerationRule.exempt_roles,
-            exemptChannels: autoModerationRule.exempt_channels,
+            defaultMemberPermissions: applicationCommand.default_member_permissions,
+            dmPermission: applicationCommand.dm_permission,
+            defaultPermission: applicationCommand.default_permission,
+            nsfw: applicationCommand.nsfw,
+            version: applicationCommand.version,
         };
     }
-    autoModerationRuleToRaw(autoModerationRule) {
+    applicationCommandToRaw(applicationCommand) {
         return {
-            id: autoModerationRule.id,
-            guild_id: autoModerationRule.guildID,
-            name: autoModerationRule.name,
-            creator_id: autoModerationRule.creatorID,
-            event_type: autoModerationRule.eventType,
-            trigger_type: autoModerationRule.triggerType,
-            trigger_metadata: {
-                keyword_filter: autoModerationRule.triggerMetadata.keywordFilter,
-                regex_patterns: autoModerationRule.triggerMetadata.regexPatterns,
-                presets: autoModerationRule.triggerMetadata.presets,
-                allow_list: autoModerationRule.triggerMetadata.allowList,
-                mention_total_limit: autoModerationRule.triggerMetadata.mentionTotalLimit,
-                mention_raid_protection: autoModerationRule.triggerMetadata.mentionRaidProtection,
-            },
-            actions: autoModerationRule.actions.map((action) => ({
-                type: action.type,
-                metadata: {
-                    channel_id: action.metadata.channelID,
-                    duration_seconds: action.metadata.durationSeconds,
-                    custom_message: action.metadata.customMessage,
-                },
+            id: applicationCommand.id,
+            type: applicationCommand.type,
+            application_id: applicationCommand.applicationID,
+            guild_id: applicationCommand.guildID,
+            name: applicationCommand.name,
+            name_localizations: applicationCommand.nameLocalizations,
+            description: applicationCommand.description,
+            description_localizations: applicationCommand.descriptionLocalizations,
+            options: applicationCommand.options?.map((option) => ({
+                type: option.type,
+                name: option.name,
+                name_localizations: option.nameLocalizations,
+                description: option.description,
+                description_localizations: option.descriptionLocalizations,
+                required: option.required,
+                choices: option.choices?.map((choice) => ({
+                    name: choice.name,
+                    name_localizations: choice.nameLocalizations,
+                    value: choice.value,
+                })),
+                options: option.options?.map((o) => ({
+                    type: o.type,
+                    name: o.name,
+                    name_localizations: o.nameLocalizations,
+                    description: o.description,
+                    description_localizations: o.descriptionLocalizations,
+                    required: o.required,
+                    choices: o.choices?.map((choice) => ({
+                        name: choice.name,
+                        name_localizations: choice.nameLocalizations,
+                        value: choice.value,
+                    })),
+                    channel_types: o.channelTypes,
+                    min_value: o.minValue,
+                    max_value: o.maxValue,
+                    min_length: o.minLength,
+                    max_length: o.maxLength,
+                    autocomplete: o.autocomplete,
+                })),
+                channel_types: option.channelTypes,
+                min_value: option.minValue,
+                max_value: option.maxValue,
+                min_length: option.minLength,
+                max_length: option.maxLength,
+                autocomplete: option.autocomplete,
             })),
-            enabled: autoModerationRule.enabled,
-            exempt_roles: autoModerationRule.exemptRoles,
-            exempt_channels: autoModerationRule.exemptChannels,
-        };
-    }
-    attachmentFromRaw(attachment) {
-        return {
-            id: attachment.id,
-            filename: attachment.filename,
-            title: attachment.title,
-            description: attachment.description,
-            contentType: attachment.content_type,
-            size: attachment.size,
-            url: attachment.url,
-            proxyURL: attachment.proxy_url,
-            height: attachment.height,
-            width: attachment.width,
-            ephemeral: attachment.ephemeral,
-            durationSecs: attachment.duration_secs,
-            waveform: attachment.waveform,
-            flags: attachment.flags,
-        };
-    }
-    attachmentToRaw(attachment) {
-        return {
-            id: attachment.id,
-            filename: attachment.filename,
-            title: attachment.title,
-            description: attachment.description,
-            content_type: attachment.contentType,
-            size: attachment.size,
-            url: attachment.url,
-            proxy_url: attachment.proxyURL,
-            height: attachment.height,
-            width: attachment.width,
-            ephemeral: attachment.ephemeral,
-            duration_secs: attachment.durationSecs,
-            waveform: attachment.waveform,
-            flags: attachment.flags,
+            default_member_permissions: applicationCommand.defaultMemberPermissions,
+            dm_permission: applicationCommand.dmPermission,
+            default_permission: applicationCommand.defaultPermission,
+            nsfw: applicationCommand.nsfw,
+            version: applicationCommand.version,
         };
     }
     applicationFromRaw(application) {
@@ -269,114 +201,182 @@ class Util {
             custom_install_url: application.customInstallURL,
         };
     }
-    applicationCommandFromRaw(applicationCommand) {
+    attachmentFromRaw(attachment) {
+        return {
+            id: attachment.id,
+            filename: attachment.filename,
+            title: attachment.title,
+            description: attachment.description,
+            contentType: attachment.content_type,
+            size: attachment.size,
+            url: attachment.url,
+            proxyURL: attachment.proxy_url,
+            height: attachment.height,
+            width: attachment.width,
+            ephemeral: attachment.ephemeral,
+            durationSecs: attachment.duration_secs,
+            waveform: attachment.waveform,
+            flags: attachment.flags,
+        };
+    }
+    attachmentToRaw(attachment) {
+        return {
+            id: attachment.id,
+            filename: attachment.filename,
+            title: attachment.title,
+            description: attachment.description,
+            content_type: attachment.contentType,
+            size: attachment.size,
+            url: attachment.url,
+            proxy_url: attachment.proxyURL,
+            height: attachment.height,
+            width: attachment.width,
+            ephemeral: attachment.ephemeral,
+            duration_secs: attachment.durationSecs,
+            waveform: attachment.waveform,
+            flags: attachment.flags,
+        };
+    }
+    auditLogEntryFromRaw(auditLogEntry) {
+        return {
+            targetID: auditLogEntry.target_id,
+            changes: auditLogEntry.changes?.map((auditLogChange) => ({
+                newValue: auditLogChange.new_value,
+                oldValue: auditLogChange.old_value,
+                key: auditLogChange.key,
+            })),
+            userID: auditLogEntry.user_id,
+            id: auditLogEntry.id,
+            actionType: auditLogEntry.action_type,
+            options: auditLogEntry.options !== undefined
+                ? {
+                    applicationID: auditLogEntry.options.application_id,
+                    autoModerationRuleName: auditLogEntry.options.auto_moderation_rule_name,
+                    autoModerationRuleTriggerType: auditLogEntry.options.auto_moderation_rule_trigger_type,
+                    channelID: auditLogEntry.options.channel_id,
+                    count: auditLogEntry.options.count,
+                    deleteMemberDays: auditLogEntry.options.delete_member_days,
+                    id: auditLogEntry.options.id,
+                    membersRemoved: auditLogEntry.options.members_removed,
+                    messageID: auditLogEntry.options.message_id,
+                    roleName: auditLogEntry.options.role_name,
+                    type: auditLogEntry.options.type,
+                    integrationType: auditLogEntry.options.integration_type,
+                }
+                : undefined,
+            reason: auditLogEntry.reason,
+        };
+    }
+    auditLogEntryToRaw(auditLogEntry) {
+        return {
+            target_id: auditLogEntry.targetID,
+            changes: auditLogEntry.changes?.map((auditLogChange) => ({
+                new_value: auditLogChange.newValue,
+                old_value: auditLogChange.oldValue,
+                key: auditLogChange.key,
+            })),
+            user_id: auditLogEntry.userID,
+            id: auditLogEntry.id,
+            action_type: auditLogEntry.actionType,
+            options: auditLogEntry.options !== undefined
+                ? {
+                    application_id: auditLogEntry.options.applicationID,
+                    auto_moderation_rule_name: auditLogEntry.options.autoModerationRuleName,
+                    auto_moderation_rule_trigger_type: auditLogEntry.options.autoModerationRuleTriggerType,
+                    channel_id: auditLogEntry.options.channelID,
+                    count: auditLogEntry.options.count,
+                    delete_member_days: auditLogEntry.options.deleteMemberDays,
+                    id: auditLogEntry.options.id,
+                    members_removed: auditLogEntry.options.membersRemoved,
+                    message_id: auditLogEntry.options.messageID,
+                    role_name: auditLogEntry.options.roleName,
+                    type: auditLogEntry.options.type,
+                    integration_type: auditLogEntry.options.integrationType,
+                }
+                : undefined,
+            reason: auditLogEntry.reason,
+        };
+    }
+    auditLogFromRaw(auditLog) {
+        return {
+            applicationCommands: auditLog.application_commands.map((applicationCommand) => this.applicationCommandFromRaw(applicationCommand)),
+            auditLogEntries: auditLog.audit_log_entries.map((auditLogEntry) => this.auditLogEntryFromRaw(auditLogEntry)),
+            autoModerationRules: auditLog.auto_moderation_rules.map((autoModerationRule) => this.autoModerationRuleFromRaw(autoModerationRule)),
+            guildScheduledEvents: auditLog.guild_scheduled_events.map((guildScheduledEvent) => this.guildScheduledEventFromRaw(guildScheduledEvent)),
+            integrations: auditLog.integrations.map((integration) => this.integrationFromRaw(integration)),
+            threads: auditLog.threads.map((thread) => this.channelFromRaw(thread)),
+            users: auditLog.users.map((user) => this.userFromRaw(user)),
+            webhooks: auditLog.webhooks.map((webhook) => this.webhookFromRaw(webhook)),
+        };
+    }
+    auditLogToRaw(auditLog) {
+        return {
+            application_commands: auditLog.applicationCommands.map((applicationCommand) => this.applicationCommandToRaw(applicationCommand)),
+            audit_log_entries: auditLog.auditLogEntries.map((auditLogEntry) => this.auditLogEntryToRaw(auditLogEntry)),
+            auto_moderation_rules: auditLog.autoModerationRules.map((autoModerationRule) => this.autoModerationRuleToRaw(autoModerationRule)),
+            guild_scheduled_events: auditLog.guildScheduledEvents.map((guildScheduledEvent) => this.guildScheduledEventToRaw(guildScheduledEvent)),
+            integrations: auditLog.integrations.map((integration) => this.integrationToRaw(integration)),
+            threads: auditLog.threads.map((thread) => this.channelToRaw(thread)),
+            users: auditLog.users.map((user) => this.userToRaw(user)),
+            webhooks: auditLog.webhooks.map((webhook) => this.webhookToRaw(webhook)),
+        };
+    }
+    autoModerationRuleFromRaw(autoModerationRule) {
         return {
-            id: applicationCommand.id,
-            type: applicationCommand.type,
-            applicationID: applicationCommand.application_id,
-            guildID: applicationCommand.guild_id,
-            name: applicationCommand.name,
-            nameLocalizations: applicationCommand.name_localizations,
-            description: applicationCommand.description,
-            descriptionLocalizations: applicationCommand.description_localizations,
-            options: applicationCommand.options?.map((option) => ({
-                type: option.type,
-                name: option.name,
-                name_localizations: option.name_localizations,
-                description: option.description,
-                description_localizations: option.description_localizations,
-                required: option.required,
-                choices: option.choices?.map((choice) => ({
-                    name: choice.name,
-                    name_localizations: choice.name_localizations,
-                    value: choice.value,
-                })),
-                options: option.options?.map((o) => ({
-                    type: o.type,
-                    name: o.name,
-                    name_localizations: o.name_localizations,
-                    description: o.description,
-                    description_localizations: o.description_localizations,
-                    required: o.required,
-                    choices: o.choices?.map((choice) => ({
-                        name: choice.name,
-                        name_localizations: choice.name_localizations,
-                        value: choice.value,
-                    })),
-                    channel_types: o.channel_types,
-                    min_value: o.min_value,
-                    max_value: o.max_value,
-                    min_length: o.min_length,
-                    max_length: o.max_length,
-                    autocomplete: o.autocomplete,
-                })),
-                channel_types: option.channel_types,
-                min_value: option.min_value,
-                max_value: option.max_value,
-                min_length: option.min_length,
-                max_length: option.max_length,
-                autocomplete: option.autocomplete,
+            id: autoModerationRule.id,
+            guildID: autoModerationRule.guild_id,
+            name: autoModerationRule.name,
+            creatorID: autoModerationRule.creator_id,
+            eventType: autoModerationRule.event_type,
+            triggerType: autoModerationRule.trigger_type,
+            triggerMetadata: {
+                keywordFilter: autoModerationRule.trigger_metadata.keyword_filter,
+                regexPatterns: autoModerationRule.trigger_metadata.regex_patterns,
+                presets: autoModerationRule.trigger_metadata.presets,
+                allowList: autoModerationRule.trigger_metadata.allow_list,
+                mentionTotalLimit: autoModerationRule.trigger_metadata.mention_total_limit,
+                mentionRaidProtection: autoModerationRule.trigger_metadata.mention_raid_protection,
+            },
+            actions: autoModerationRule.actions.map((action) => ({
+                type: action.type,
+                metadata: {
+                    channelID: action.metadata.channel_id,
+                    durationSeconds: action.metadata.duration_seconds,
+                    customMessage: action.metadata.custom_message,
+                },
             })),
-            defaultMemberPermissions: applicationCommand.default_member_permissions,
-            dmPermission: applicationCommand.dm_permission,
-            defaultPermission: applicationCommand.default_permission,
-            nsfw: applicationCommand.nsfw,
-            version: applicationCommand.version,
+            enabled: autoModerationRule.enabled,
+            exemptRoles: autoModerationRule.exempt_roles,
+            exemptChannels: autoModerationRule.exempt_channels,
         };
     }
-    applicationCommandToRaw(applicationCommand) {
+    autoModerationRuleToRaw(autoModerationRule) {
         return {
-            id: applicationCommand.id,
-            type: applicationCommand.type,
-            application_id: applicationCommand.applicationID,
-            guild_id: applicationCommand.guildID,
-            name: applicationCommand.name,
-            name_localizations: applicationCommand.nameLocalizations,
-            description: applicationCommand.description,
-            description_localizations: applicationCommand.descriptionLocalizations,
-            options: applicationCommand.options?.map((option) => ({
-                type: option.type,
-                name: option.name,
-                name_localizations: option.nameLocalizations,
-                description: option.description,
-                description_localizations: option.descriptionLocalizations,
-                required: option.required,
-                choices: option.choices?.map((choice) => ({
-                    name: choice.name,
-                    name_localizations: choice.nameLocalizations,
-                    value: choice.value,
-                })),
-                options: option.options?.map((o) => ({
-                    type: o.type,
-                    name: o.name,
-                    name_localizations: o.nameLocalizations,
-                    description: o.description,
-                    description_localizations: o.descriptionLocalizations,
-                    required: o.required,
-                    choices: o.choices?.map((choice) => ({
-                        name: choice.name,
-                        name_localizations: choice.nameLocalizations,
-                        value: choice.value,
-                    })),
-                    channel_types: o.channelTypes,
-                    min_value: o.minValue,
-                    max_value: o.maxValue,
-                    min_length: o.minLength,
-                    max_length: o.maxLength,
-                    autocomplete: o.autocomplete,
-                })),
-                channel_types: option.channelTypes,
-                min_value: option.minValue,
-                max_value: option.maxValue,
-                min_length: option.minLength,
-                max_length: option.maxLength,
-                autocomplete: option.autocomplete,
+            id: autoModerationRule.id,
+            guild_id: autoModerationRule.guildID,
+            name: autoModerationRule.name,
+            creator_id: autoModerationRule.creatorID,
+            event_type: autoModerationRule.eventType,
+            trigger_type: autoModerationRule.triggerType,
+            trigger_metadata: {
+                keyword_filter: autoModerationRule.triggerMetadata.keywordFilter,
+                regex_patterns: autoModerationRule.triggerMetadata.regexPatterns,
+                presets: autoModerationRule.triggerMetadata.presets,
+                allow_list: autoModerationRule.triggerMetadata.allowList,
+                mention_total_limit: autoModerationRule.triggerMetadata.mentionTotalLimit,
+                mention_raid_protection: autoModerationRule.triggerMetadata.mentionRaidProtection,
+            },
+            actions: autoModerationRule.actions.map((action) => ({
+                type: action.type,
+                metadata: {
+                    channel_id: action.metadata.channelID,
+                    duration_seconds: action.metadata.durationSeconds,
+                    custom_message: action.metadata.customMessage,
+                },
             })),
-            default_member_permissions: applicationCommand.defaultMemberPermissions,
-            dm_permission: applicationCommand.dmPermission,
-            default_permission: applicationCommand.defaultPermission,
-            nsfw: applicationCommand.nsfw,
-            version: applicationCommand.version,
+            enabled: autoModerationRule.enabled,
+            exempt_roles: autoModerationRule.exemptRoles,
+            exempt_channels: autoModerationRule.exemptChannels,
         };
     }
     channelFromRaw(channel) {
@@ -812,63 +812,6 @@ class Util {
             safetyAlertsChannelID: guild.safety_alerts_channel_id,
         };
     }
-    guildToRaw(guild) {
-        return {
-            id: guild.id,
-            name: guild.name,
-            icon: guild.icon,
-            icon_hash: guild.icon,
-            splash: guild.splash,
-            discovery_splash: guild.discoverySplash,
-            owner: guild.owner,
-            owner_id: guild.ownerID,
-            permissions: guild.permissions,
-            region: guild.region,
-            afk_channel_id: guild.afkChannelID,
-            afk_timeout: guild.afkTimeout,
-            widget_enabled: guild.widgetEnabled,
-            widget_channel_id: guild.widgetChannelID,
-            verification_level: guild.verificationLevel,
-            default_message_notifications: guild.defaultMessageNotifications,
-            explicit_content_filter: guild.explicitContentFilter,
-            roles: guild.roles.map((role) => this.roleToRaw(role)),
-            emojis: guild.emojis.map((emoji) => this.emojiToRaw(emoji)),
-            features: guild.features,
-            mfa_level: guild.mfaLevel,
-            application_id: guild.applicationID,
-            system_channel_id: guild.systemChannelID,
-            system_channel_flags: guild.systemChannelFlags,
-            rules_channel_id: guild.rulesChannelID,
-            max_presences: guild.maxPresences,
-            max_members: guild.maxMembers,
-            vanity_url_code: guild.vanityURLCode,
-            description: guild.description,
-            banner: guild.banner,
-            premium_tier: guild.premiumTier,
-            premium_subscription_count: guild.premiumSubscriptionCount,
-            preferred_locale: guild.preferredLocale,
-            public_updates_channel_id: guild.publicUpdatesChannelID,
-            max_video_channel_users: guild.maxVideoChannelUsers,
-            max_stage_video_channel_users: guild.maxStageVideoChannelUsers,
-            approximate_member_count: guild.approximateMemberCount,
-            approximate_presence_count: guild.approximatePresenceCount,
-            welcome_screen: guild.welcomeScreen !== undefined
-                ? {
-                    description: guild.welcomeScreen.description,
-                    welcome_channels: guild.welcomeScreen.welcomeChannels.map((welcomeScreenChannel) => ({
-                        channel_id: welcomeScreenChannel.channelID,
-                        description: welcomeScreenChannel.description,
-                        emoji_id: welcomeScreenChannel.emojiID,
-                        emoji_name: welcomeScreenChannel.emojiName,
-                    })),
-                }
-                : undefined,
-            nsfw_level: guild.nsfwLevel,
-            stickers: guild.stickers?.map((sticker) => this.stickerToRaw(sticker)),
-            premium_progress_bar_enabled: guild.premiumProgressBarEnabled,
-            safety_alerts_channel_id: guild.safetyAlertsChannelID,
-        };
-    }
     guildMemberFromRaw(guildMember) {
         return {
             user: guildMember.user !== undefined
@@ -979,6 +922,63 @@ class Util {
             is_dirty: guildTemplate.isDirty,
         };
     }
+    guildToRaw(guild) {
+        return {
+            id: guild.id,
+            name: guild.name,
+            icon: guild.icon,
+            icon_hash: guild.icon,
+            splash: guild.splash,
+            discovery_splash: guild.discoverySplash,
+            owner: guild.owner,
+            owner_id: guild.ownerID,
+            permissions: guild.permissions,
+            region: guild.region,
+            afk_channel_id: guild.afkChannelID,
+            afk_timeout: guild.afkTimeout,
+            widget_enabled: guild.widgetEnabled,
+            widget_channel_id: guild.widgetChannelID,
+            verification_level: guild.verificationLevel,
+            default_message_notifications: guild.defaultMessageNotifications,
+            explicit_content_filter: guild.explicitContentFilter,
+            roles: guild.roles.map((role) => this.roleToRaw(role)),
+            emojis: guild.emojis.map((emoji) => this.emojiToRaw(emoji)),
+            features: guild.features,
+            mfa_level: guild.mfaLevel,
+            application_id: guild.applicationID,
+            system_channel_id: guild.systemChannelID,
+            system_channel_flags: guild.systemChannelFlags,
+            rules_channel_id: guild.rulesChannelID,
+            max_presences: guild.maxPresences,
+            max_members: guild.maxMembers,
+            vanity_url_code: guild.vanityURLCode,
+            description: guild.description,
+            banner: guild.banner,
+            premium_tier: guild.premiumTier,
+            premium_subscription_count: guild.premiumSubscriptionCount,
+            preferred_locale: guild.preferredLocale,
+            public_updates_channel_id: guild.publicUpdatesChannelID,
+            max_video_channel_users: guild.maxVideoChannelUsers,
+            max_stage_video_channel_users: guild.maxStageVideoChannelUsers,
+            approximate_member_count: guild.approximateMemberCount,
+            approximate_presence_count: guild.approximatePresenceCount,
+            welcome_screen: guild.welcomeScreen !== undefined
+                ? {
+                    description: guild.welcomeScreen.description,
+                    welcome_channels: guild.welcomeScreen.welcomeChannels.map((welcomeScreenChannel) => ({
+                        channel_id: welcomeScreenChannel.channelID,
+                        description: welcomeScreenChannel.description,
+                        emoji_id: welcomeScreenChannel.emojiID,
+                        emoji_name: welcomeScreenChannel.emojiName,
+                    })),
+                }
+                : undefined,
+            nsfw_level: guild.nsfwLevel,
+            stickers: guild.stickers?.map((sticker) => this.stickerToRaw(sticker)),
+            premium_progress_bar_enabled: guild.premiumProgressBarEnabled,
+            safety_alerts_channel_id: guild.safetyAlertsChannelID,
+        };
+    }
     integrationFromRaw(integration) {
         return {
             id: integration.id,
@@ -1112,6 +1112,38 @@ class Util {
             context: interaction.context,
         };
     }
+    interactionMetadataFromRaw(interactionMetadata) {
+        return {
+            id: interactionMetadata.id,
+            type: interactionMetadata.type,
+            user: this.userFromRaw(interactionMetadata.user),
+            authorizingIntegrationOwners: {
+                "0": interactionMetadata.authorizing_integration_owners[0],
+                "1": interactionMetadata.authorizing_integration_owners[1],
+            },
+            originalResponseMessageID: interactionMetadata.original_response_message_id,
+            interactedMessageID: interactionMetadata.interacted_message_id,
+            triggeringInteractionMetadata: interactionMetadata.triggering_interaction_metadata !== undefined
+                ? this.interactionMetadataFromRaw(interactionMetadata.triggering_interaction_metadata)
+                : undefined,
+        };
+    }
+    interactionMetadataToRaw(interactionMetadata) {
+        return {
+            id: interactionMetadata.id,
+            type: interactionMetadata.type,
+            user: this.userToRaw(interactionMetadata.user),
+            authorizing_integration_owners: {
+                "0": interactionMetadata.authorizingIntegrationOwners[0],
+                "1": interactionMetadata.authorizingIntegrationOwners[1],
+            },
+            original_response_message_id: interactionMetadata.originalResponseMessageID,
+            interacted_message_id: interactionMetadata.interactedMessageID,
+            triggering_interaction_metadata: interactionMetadata.triggeringInteractionMetadata !== undefined
+                ? this.interactionMetadataToRaw(interactionMetadata.triggeringInteractionMetadata)
+                : undefined,
+        };
+    }
     interactionToRaw(interaction) {
         return {
             id: interaction.id,
@@ -1181,38 +1213,6 @@ class Util {
             context: interaction.context,
         };
     }
-    interactionMetadataFromRaw(interactionMetadata) {
-        return {
-            id: interactionMetadata.id,
-            type: interactionMetadata.type,
-            user: this.userFromRaw(interactionMetadata.user),
-            authorizingIntegrationOwners: {
-                "0": interactionMetadata.authorizing_integration_owners[0],
-                "1": interactionMetadata.authorizing_integration_owners[1],
-            },
-            originalResponseMessageID: interactionMetadata.original_response_message_id,
-            interactedMessageID: interactionMetadata.interacted_message_id,
-            triggeringInteractionMetadata: interactionMetadata.triggering_interaction_metadata !== undefined
-                ? this.interactionMetadataFromRaw(interactionMetadata.triggering_interaction_metadata)
-                : undefined,
-        };
-    }
-    interactionMetadataToRaw(interactionMetadata) {
-        return {
-            id: interactionMetadata.id,
-            type: interactionMetadata.type,
-            user: this.userToRaw(interactionMetadata.user),
-            authorizing_integration_owners: {
-                "0": interactionMetadata.authorizingIntegrationOwners[0],
-                "1": interactionMetadata.authorizingIntegrationOwners[1],
-            },
-            original_response_message_id: interactionMetadata.originalResponseMessageID,
-            interacted_message_id: interactionMetadata.interactedMessageID,
-            triggering_interaction_metadata: interactionMetadata.triggeringInteractionMetadata !== undefined
-                ? this.interactionMetadataToRaw(interactionMetadata.triggeringInteractionMetadata)
-                : undefined,
-        };
-    }
     inviteFromRaw(invite) {
         return {
             type: invite.type,
@@ -1698,7 +1698,7 @@ class Util {
     }
     presenceFromRaw(presence) {
         return {
-            user: this.userFromRaw(presence.user),
+            user: this.presenceUserFromRaw(presence.user),
             guildID: presence.guild_id,
             status: presence.status,
             activities: presence.activities.map((activity) => ({
@@ -1710,6 +1710,7 @@ class Util {
                 applicationID: activity.application_id,
                 details: activity.details,
                 state: activity.state,
+                emoji: activity.emoji,
                 party: activity.party,
                 assets: {
                     largeImage: activity.assets?.large_image,
@@ -1727,7 +1728,7 @@ class Util {
     }
     presenceToRaw(presence) {
         return {
-            user: this.userToRaw(presence.user),
+            user: this.presenceUserToRaw(presence.user),
             guild_id: presence.guildID,
             status: presence.status,
             activities: presence.activities.map((activity) => ({
@@ -1739,6 +1740,7 @@ class Util {
                 application_id: activity.applicationID,
                 details: activity.details,
                 state: activity.state,
+                emoji: activity.emoji,
                 party: activity.party,
                 assets: {
                     large_image: activity.assets?.largeImage,
@@ -1754,6 +1756,92 @@ class Util {
             client_status: presence.clientStatus,
         };
     }
+    presenceUserFromRaw(user) {
+        return {
+            id: user.id,
+            username: user.username,
+            discriminator: user.discriminator,
+            globalName: user.global_name,
+            avatar: user.avatar,
+            bot: user.bot,
+            system: user.system,
+            mfaEnabled: user.mfa_enabled,
+            banner: user.banner,
+            accentColor: user.accent_color,
+            locale: user.locale,
+            verified: user.verified,
+            email: user.email,
+            flags: user.flags,
+            premiumType: user.premium_type,
+            publicFlags: user.public_flags,
+            avatarDecoration: user.avatar_decoration,
+        };
+    }
+    presenceUserToRaw(user) {
+        return {
+            id: user.id,
+            username: user.username,
+            discriminator: user.discriminator,
+            global_name: user.globalName,
+            avatar: user.avatar,
+            bot: user.bot,
+            system: user.system,
+            mfa_enabled: user.mfaEnabled,
+            banner: user.banner,
+            accent_color: user.accentColor,
+            locale: user.locale,
+            verified: user.verified,
+            email: user.email,
+            flags: user.flags,
+            premium_type: user.premiumType,
+            public_flags: user.publicFlags,
+            avatar_decoration: user.avatarDecoration,
+        };
+    }
+    pollFromRaw(poll) {
+        return {
+            question: poll.question,
+            answers: poll.answers.map((answer) => ({
+                answerID: answer.answer_id,
+                pollMedia: answer.poll_media,
+            })),
+            expiry: poll.expiry,
+            allowMultiselect: poll.allow_multiselect,
+            layoutType: poll.layout_type,
+            results: poll.results !== undefined
+                ? {
+                    isFinalized: poll.results.is_finalized,
+                    answerCounts: poll.results.answer_counts.map((answerCount) => ({
+                        id: answerCount.id,
+                        count: answerCount.count,
+                        meVoted: answerCount.me_voted,
+                    })),
+                }
+                : undefined,
+        };
+    }
+    pollToRaw(poll) {
+        return {
+            question: poll.question,
+            answers: poll.answers.map((answer) => ({
+                answer_id: answer.answerID,
+                poll_media: answer.pollMedia,
+            })),
+            expiry: poll.expiry,
+            allow_multiselect: poll.allowMultiselect,
+            layout_type: poll.layoutType,
+            results: poll.results !== undefined
+                ? {
+                    is_finalized: poll.results.isFinalized,
+                    answer_counts: poll.results.answerCounts.map((answerCount) => ({
+                        id: answerCount.id,
+                        count: answerCount.count,
+                        me_voted: answerCount.meVoted,
+                    })),
+                }
+                : undefined,
+        };
+    }
     resolvedDataFromRaw(resolvedData) {
         let users = {};
         let members = {};
@@ -1846,50 +1934,6 @@ class Util {
             attachments,
         };
     }
-    pollFromRaw(poll) {
-        return {
-            question: poll.question,
-            answers: poll.answers.map((answer) => ({
-                answerID: answer.answer_id,
-                pollMedia: answer.poll_media,
-            })),
-            expiry: poll.expiry,
-            allowMultiselect: poll.allow_multiselect,
-            layoutType: poll.layout_type,
-            results: poll.results !== undefined
-                ? {
-                    isFinalized: poll.results.is_finalized,
-                    answerCounts: poll.results.answer_counts.map((answerCount) => ({
-                        id: answerCount.id,
-                        count: answerCount.count,
-                        meVoted: answerCount.me_voted,
-                    })),
-                }
-                : undefined,
-        };
-    }
-    pollToRaw(poll) {
-        return {
-            question: poll.question,
-            answers: poll.answers.map((answer) => ({
-                answer_id: answer.answerID,
-                poll_media: answer.pollMedia,
-            })),
-            expiry: poll.expiry,
-            allow_multiselect: poll.allowMultiselect,
-            layout_type: poll.layoutType,
-            results: poll.results !== undefined
-                ? {
-                    is_finalized: poll.results.isFinalized,
-                    answer_counts: poll.results.answerCounts.map((answerCount) => ({
-                        id: answerCount.id,
-                        count: answerCount.count,
-                        me_voted: answerCount.meVoted,
-                    })),
-                }
-                : undefined,
-        };
-    }
     roleFromRaw(role) {
         return {
             id: role.id,
@@ -2054,28 +2098,6 @@ class Util {
             owner_user_id: team.ownerUserID,
         };
     }
-    threadMemberFromRaw(threadMember) {
-        return {
-            id: threadMember.id,
-            userID: threadMember.user_id,
-            joinTimestamp: threadMember.join_timestamp,
-            flags: threadMember.flags,
-            member: threadMember.member !== undefined
-                ? this.guildMemberFromRaw(threadMember.member)
-                : undefined,
-        };
-    }
-    threadMemberToRaw(threadMember) {
-        return {
-            id: threadMember.id,
-            user_id: threadMember.userID,
-            join_timestamp: threadMember.joinTimestamp,
-            flags: threadMember.flags,
-            member: threadMember.member !== undefined
-                ? this.guildMemberToRaw(threadMember.member)
-                : undefined,
-        };
-    }
     testEntitlementFromRaw(entitlement) {
         return {
             id: entitlement.id,
@@ -2104,6 +2126,28 @@ class Util {
             guild_id: entitlement.guildID,
         };
     }
+    threadMemberFromRaw(threadMember) {
+        return {
+            id: threadMember.id,
+            userID: threadMember.user_id,
+            joinTimestamp: threadMember.join_timestamp,
+            flags: threadMember.flags,
+            member: threadMember.member !== undefined
+                ? this.guildMemberFromRaw(threadMember.member)
+                : undefined,
+        };
+    }
+    threadMemberToRaw(threadMember) {
+        return {
+            id: threadMember.id,
+            user_id: threadMember.userID,
+            join_timestamp: threadMember.joinTimestamp,
+            flags: threadMember.flags,
+            member: threadMember.member !== undefined
+                ? this.guildMemberToRaw(threadMember.member)
+                : undefined,
+        };
+    }
     userFromRaw(user) {
         return {
             id: user.id,