fix: handle different channel type

mja00 · Jan 15, 2025 · cde1ebe · cde1ebe
1 parent c7f3396
commit cde1ebe
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/lang/lang.en-GB.json b/lang/lang.en-GB.json
@@ -226,6 +226,8 @@
             "BanMembers": "Ban Members",
             "ChangeNickname": "Change Nickname",
             "Connect": "Connect",
+            "CreateEvents": "Create Events",
+            "CreateGuildExpressions": "Create Expressions",
             "CreateInstantInvite": "Create Invite",
             "CreatePrivateThreads": "Create Private Threads",
             "CreatePublicThreads": "Create Public Threads",
@@ -251,12 +253,14 @@
             "RequestToSpeak": "Request to Speak",
             "SendMessages": "Send Messages / Create Posts",
             "SendMessagesInThreads": "Send Messages in Threads / Posts",
+            "SendPolls": "Send Polls",
             "SendTTSMessages": "Send Text-to-Speech Messages",
             "SendVoiceMessages": "Send Voice Messages",
             "Speak": "Speak",
             "Stream": "Video",
             "UseApplicationCommands": "Use Application Commands",
             "UseEmbeddedActivities": "Use Activities",
+            "UseExternalApps": "Use External Apps",
             "UseExternalEmojis": "Use External Emoji",
             "UseExternalSounds": "Use External Sounds",
             "UseExternalStickers": "Use External Stickers",

diff --git a/lang/lang.en-US.json b/lang/lang.en-US.json
@@ -235,6 +235,8 @@
             "BanMembers": "Ban Members",
             "ChangeNickname": "Change Nickname",
             "Connect": "Connect",
+            "CreateEvents": "Create Events",
+            "CreateGuildExpressions": "Create Expressions",
             "CreateInstantInvite": "Create Invite",
             "CreatePrivateThreads": "Create Private Threads",
             "CreatePublicThreads": "Create Public Threads",
@@ -260,12 +262,14 @@
             "RequestToSpeak": "Request to Speak",
             "SendMessages": "Send Messages / Create Posts",
             "SendMessagesInThreads": "Send Messages in Threads / Posts",
+            "SendPolls": "Send Polls",
             "SendTTSMessages": "Send Text-to-Speech Messages",
             "SendVoiceMessages": "Send Voice Messages",
             "Speak": "Speak",
             "Stream": "Video",
             "UseApplicationCommands": "Use Application Commands",
             "UseEmbeddedActivities": "Use Activities",
+            "UseExternalApps": "Use External Apps",
             "UseExternalEmojis": "Use External Emoji",
             "UseExternalSounds": "Use External Sounds",
             "UseExternalStickers": "Use External Stickers",

diff --git a/src/events/message-handler.ts b/src/events/message-handler.ts
@@ -1,4 +1,4 @@
-import { Message } from 'discord.js';
+import { Message, PartialGroupDMChannel } from 'discord.js';
 
 import { EventHandler, TriggerHandler } from './index.js';
 import { Logger } from '../services/logger.js';
@@ -24,6 +24,11 @@ export class MessageHandler implements EventHandler {
             `[Message]: ${serverName} (${serverID}) - ${channelID} - ${userTag} (${userID}) - ${message}`
         );
 
+        // If this is a PartialGroupDMChannel, just pass
+        if (msg.channel instanceof PartialGroupDMChannel) {
+            return await this.triggerHandler.process(msg);
+        }
+
         // Check if the message has mentions
         if (msg.mentions.has(msg.client.user?.id)) {
             // Filter out the bot's mention and any whitespace

diff --git a/src/models/enum-helpers/language.ts b/src/models/enum-helpers/language.ts
@@ -20,6 +20,7 @@ export class Language {
         el: { englishName: 'Greek', nativeName: 'Ελληνικά' },
         'en-GB': { englishName: 'English, UK', nativeName: 'English, UK' },
         'en-US': { englishName: 'English, US', nativeName: 'English, US' },
+        'es-419': { englishName: 'Spanish, LATAM', nativeName: 'Español, Latinoamérica' },
         'es-ES': { englishName: 'Spanish', nativeName: 'Español' },
         fi: { englishName: 'Finnish', nativeName: 'Suomi' },
         fr: { englishName: 'French', nativeName: 'Français' },

diff --git a/src/models/enum-helpers/permission.ts b/src/models/enum-helpers/permission.ts
@@ -40,6 +40,16 @@ export class Permission {
                 return Lang.getRef('permissions.Connect', langCode);
             },
         },
+        CreateEvents: {
+            displayName(langCode: Locale): string {
+                return Lang.getRef('permissions.CreateEvents', langCode);
+            },
+        },
+        CreateGuildExpressions: {
+            displayName(langCode: Locale): string {
+                return Lang.getRef('permissions.CreateGuildExpressions', langCode);
+            },
+        },
         CreateInstantInvite: {
             displayName(langCode: Locale): string {
                 return Lang.getRef('permissions.CreateInstantInvite', langCode);
@@ -165,6 +175,11 @@ export class Permission {
                 return Lang.getRef('permissions.SendMessagesInThreads', langCode);
             },
         },
+        SendPolls: {
+            displayName(langCode: Locale): string {
+                return Lang.getRef('permissions.SendPolls', langCode);
+            },
+        },
         SendTTSMessages: {
             displayName(langCode: Locale): string {
                 return Lang.getRef('permissions.SendTTSMessages', langCode);
@@ -195,6 +210,11 @@ export class Permission {
                 return Lang.getRef('permissions.UseEmbeddedActivities', langCode);
             },
         },
+        UseExternalApps: {
+            displayName(langCode: Locale): string {
+                return Lang.getRef('permissions.UseExternalApps', langCode);
+            },
+        },
         UseExternalEmojis: {
             displayName(langCode: Locale): string {
                 return Lang.getRef('permissions.UseExternalEmojis', langCode);