@elizaos/plugin-discord 1.3.2 → 1.3.3

package/dist/index.js

@@ -4050,8 +4050,7 @@ import {
   EventType,
   Role,
   Service,
-  createUniqueUuid as createUniqueUuid5,
-  logger as logger13
+  createUniqueUuid as createUniqueUuid5
 } from "@elizaos/core";
 import {
   ChannelType as DiscordChannelType5,
@@ -4813,7 +4812,7 @@ var MessageManager = class {
         },
         createdAt: message.createdTimestamp
       };
-      const callback = async (content, files) => {
+      const callback = async (content) => {
         try {
           if (content.target && typeof content.target === "string" && content.target.toLowerCase() !== "discord") {
             return [];
@@ -4850,7 +4849,7 @@ var MessageManager = class {
               channel,
               content.text ?? "",
               message.id,
-              files || []
+              []
             );
           }
           const memories = [];
@@ -4889,7 +4888,19 @@ var MessageManager = class {
           return [];
         }
       };
-      await this.runtime.messageService.handleMessage(this.runtime, newMessage, callback);
+      if (this.runtime.hasElizaOS()) {
+        logger11.debug("[Discord] Using unified messaging API");
+        await this.runtime.elizaOS.sendMessage(
+          this.runtime.agentId,
+          newMessage,
+          {
+            onResponse: callback
+          }
+        );
+      } else {
+        logger11.debug("[Discord] Using direct message service");
+        await this.runtime.messageService.handleMessage(this.runtime, newMessage, callback);
+      }
       setTimeout(() => {
         if (typingData.started && typingData.interval && !typingData.cleared) {
           clearInterval(typingData.interval);
@@ -5880,7 +5891,6 @@ var DiscordService = class _DiscordService extends Service {
   discordSettings;
   userSelections = /* @__PURE__ */ new Map();
   timeouts = [];
-  clientReadyPromise;
   /**
    * List of allowed channel IDs (parsed from CHANNEL_IDS env var).
    * If undefined, all channels are allowed.
@@ -5905,7 +5915,7 @@ var DiscordService = class _DiscordService extends Service {
     const channelIdsRaw = runtime.getSetting("CHANNEL_IDS");
     if (channelIdsRaw?.trim && channelIdsRaw.trim()) {
       this.allowedChannelIds = channelIdsRaw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
-      this.runtime.logger.debug("Locking down discord to", this.allowedChannelIds);
+      this.runtime.logger.debug("Locking down discord to", this.allowedChannelIds.join(", "));
     }
     const token = runtime.getSetting("DISCORD_API_TOKEN");
     if (!token || token?.trim && token.trim() === "") {
@@ -5932,17 +5942,18 @@ var DiscordService = class _DiscordService extends Service {
       this.runtime = runtime;
       this.voiceManager = new VoiceManager(this, runtime);
       this.messageManager = new MessageManager(this);
-      this.clientReadyPromise = new Promise((resolver) => {
-        this.client.once(Events.ClientReady, (readyClient) => {
-          resolver();
-          this.onReady(readyClient);
-        });
-        this.client.login(token).catch((error) => {
-          this.runtime.logger.error(
-            `Failed to login to Discord: ${error instanceof Error ? error.message : String(error)}`
-          );
-          this.client = null;
-        });
+      this.client.once(Events.ClientReady, (readyClient) => {
+        this.onReady(readyClient);
+      });
+      this.client.login(token).catch((error) => {
+        this.runtime.logger.error(
+          `Failed to login to Discord: ${error instanceof Error ? error.message : String(error)}`
+        );
+        if (this.client) {
+          this.client.destroy().catch(() => {
+          });
+        }
+        this.client = null;
       });
       this.setupEventListeners();
       this.registerSendHandler();
@@ -6069,8 +6080,6 @@ var DiscordService = class _DiscordService extends Service {
     }
     const listenCidsRaw = this.runtime.getSetting("DISCORD_LISTEN_CHANNEL_IDS");
     const listenCids = Array.isArray(listenCidsRaw) ? listenCidsRaw : listenCidsRaw && typeof listenCidsRaw === "string" && listenCidsRaw.trim() ? listenCidsRaw.trim().split(",").map((s) => s.trim()).filter((s) => s.length > 0) : [];
-    const talkCids = this.allowedChannelIds ?? [];
-    const allowedCids = [...listenCids, ...talkCids];
     this.client.on("messageCreate", async (message) => {
       if (message.author.id === this.client?.user?.id || message.author.bot && this.discordSettings.shouldIgnoreBotMessages) {
         this.runtime.logger.info(
@@ -6080,26 +6089,25 @@ var DiscordService = class _DiscordService extends Service {
       }
       if (listenCids.includes(message.channel.id)) {
         const entityId = createUniqueUuid5(this.runtime, message.author.id);
-        const userName = message.author.bot ? `${message.author.username}#${message.author.discriminator}` : message.author.username;
-        const name = message.author.displayName;
-        const channelId = message.channel.id;
-        const roomId = createUniqueUuid5(this.runtime, channelId);
+        const roomId = createUniqueUuid5(this.runtime, message.channel.id);
         let type;
-        let serverId;
+        let _serverId;
         if (message.guild) {
           const guild = await message.guild.fetch();
           type = await this.getChannelType(message.channel);
           if (type === null) {
-            this.runtime.logger.warn("null channel type, discord message", message);
+            this.runtime.logger.warn("null channel type, discord message", message.id);
           }
-          serverId = guild.id;
+          _serverId = guild.id;
         } else {
           type = ChannelType7.DM;
-          serverId = message.channel.id;
+          _serverId = message.channel.id;
         }
         const { processedContent, attachments } = await this.messageManager.processMessage(message);
         const messageId = createUniqueUuid5(this.runtime, message.id);
         const sourceId = entityId;
+        const userName = message.author.bot ? `${message.author.username}#${message.author.discriminator}` : message.author.username;
+        const name = message.member?.displayName ?? message.author.displayName ?? message.author.globalName ?? userName;
         const newMessage = {
           id: messageId,
           entityId,
@@ -6739,7 +6747,7 @@ var DiscordService = class _DiscordService extends Service {
           } else {
             this.runtime.logger.info(`Fetching members for guild ${guild.name}`);
             members = await guild.members.fetch();
-            logger13.info(`Fetched ${members.size} members`);
+            this.runtime.logger.info(`Fetched ${members.size} members`);
           }
         } catch (error) {
           this.runtime.logger.error(`Error fetching members: ${error}`);