Merge pull request #336 from vivoidos/client-settings

added clientConfig to optionally ignore bots and DMs
elizaOS · Nov 15, 2024 · c4e8601 · c4e8601
2 parents 9013a94 + 08a7c1d
commit c4e8601
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 18 deletions.
diff --git a/packages/client-discord/src/messages.ts b/packages/client-discord/src/messages.ts
@@ -341,9 +341,26 @@ export class MessageManager {
         if (
             message.interaction ||
             message.author.id ===
-            this.client.user?.id /* || message.author?.bot*/
+                this.client.user?.id /* || message.author?.bot*/
         )
             return;
+
+        if (
+            this.runtime.character.clientConfig?.discord
+                ?.shouldIgnoreBotMessages &&
+            message.author?.bot
+        ) {
+            return;
+        }
+
+        if (
+            this.runtime.character.clientConfig?.discord
+                ?.shouldIgnoreDirectMessages &&
+            message.channel.type === ChannelType.DM
+        ) {
+            return;
+        }
+
         const userId = message.author.id as UUID;
         const userName = message.author.username;
         const name = message.author.displayName;
@@ -389,10 +406,10 @@ export class MessageManager {
                 url: message.url,
                 inReplyTo: message.reference?.messageId
                     ? stringToUuid(
-                        message.reference.messageId +
-                        "-" +
-                        this.runtime.agentId
-                    )
+                          message.reference.messageId +
+                              "-" +
+                              this.runtime.agentId
+                      )
                     : undefined,
             };
 
@@ -503,11 +520,9 @@ export class MessageManager {
                         }
                         if (message.channel.type === ChannelType.GuildVoice) {
                             // For voice channels, use text-to-speech
-                            const audioStream = await (
-                                this.runtime.getService(
-                                    ServiceType.SPEECH_GENERATION
-                                )
-                            ).getInstance<ISpeechService>()
+                            const audioStream = await this.runtime
+                                .getService(ServiceType.SPEECH_GENERATION)
+                                .getInstance<ISpeechService>()
                                 .generate(this.runtime, content.text);
                             await this.voiceManager.playAudioStream(
                                 userId,
@@ -659,14 +674,15 @@ export class MessageManager {
 
         for (const url of urls) {
             if (
-                this.runtime.getService(ServiceType.VIDEO)
+                this.runtime
+                    .getService(ServiceType.VIDEO)
                     .getInstance<IVideoService>()
                     .isVideoUrl(url)
             ) {
-                const videoInfo = await (this.runtime
+                const videoInfo = await this.runtime
                     .getService(ServiceType.VIDEO)
                     .getInstance<IVideoService>()
-                    .processVideo(url));
+                    .processVideo(url);
                 attachments.push({
                     id: `youtube-${Date.now()}`,
                     url: url,

diff --git a/packages/client-telegram/src/messageManager.ts b/packages/client-telegram/src/messageManager.ts
@@ -318,10 +318,20 @@ export class MessageManager {
             return; // Exit if no message or sender info
         }
 
-        // TODO: Handle commands?
-        // if (ctx.message.text?.startsWith("/")) {
-        //     return;
-        // }
+        if (
+            this.runtime.character.clientConfig?.telegram
+                ?.shouldIgnoreBotMessages &&
+            ctx.from.is_bot
+        ) {
+            return;
+        }
+        if (
+            this.runtime.character.clientConfig?.telegram
+                ?.shouldIgnoreDirectMessages &&
+            ctx.chat?.type === "private"
+        ) {
+            return;
+        }
 
         const message = ctx.message;
 
@@ -482,4 +492,4 @@ export class MessageManager {
             console.error("Error sending message:", error);
         }
     }
-}
+}
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -352,6 +352,16 @@ export type Character = {
         model?: string;
         embeddingModel?: string;
     };
+    clientConfig?: {
+        discord?: {
+            shouldIgnoreBotMessages?: boolean;
+            shouldIgnoreDirectMessages?: boolean;
+        };
+        telegram?: {
+            shouldIgnoreBotMessages?: boolean;
+            shouldIgnoreDirectMessages?: boolean;
+        };
+    };
     style: {
         all: string[];
         chat: string[];