Merge branch 'develop' into main

Author: odilitime

Dockerfile

@@ -52,4 +52,4 @@ COPY --from=builder /app/scripts ./scripts
 COPY --from=builder /app/characters ./characters
 
 # Set the command to run the application
-CMD ["pnpm", "start", "--non-interactive"]
+CMD ["pnpm", "start"]

agent/src/index.ts

@@ -648,14 +648,15 @@ const startAgents = async () => {
     }
 
     // upload some agent functionality into directClient
-    directClient.startAgent = async character => {
-      // wrap it so we don't have to inject directClient later
-      return startAgent(character, directClient)
+    directClient.startAgent = async (character) => {
+        // wrap it so we don't have to inject directClient later
+        return startAgent(character, directClient);
     };
     directClient.start(serverPort);
 
-    elizaLogger.log("Visit the following URL to chat with your agents:");
-    elizaLogger.log(`http://localhost:5173`);
+    elizaLogger.log(
+        "Run `pnpm start:client` to start the client and visit the outputted URL (http://localhost:5173) to chat with your agents"
+    );
 };
 
 startAgents().catch((error) => {

packages/client-discord/src/voice.ts

@@ -25,7 +25,7 @@ import {
     VoiceConnectionStatus,
     createAudioPlayer,
     createAudioResource,
-    getVoiceConnection,
+    getVoiceConnections,
     joinVoiceChannel,
     entersState,
 } from "@discordjs/voice";
@@ -194,7 +194,9 @@ export class VoiceManager extends EventEmitter {
     }
 
     async joinChannel(channel: BaseGuildVoiceChannel) {
-        const oldConnection = getVoiceConnection(channel.guildId as string);
+        const oldConnection = this.getVoiceConnection(
+            channel.guildId as string
+        );
         if (oldConnection) {
             try {
                 oldConnection.destroy();
@@ -212,6 +214,7 @@ export class VoiceManager extends EventEmitter {
             adapterCreator: channel.guild.voiceAdapterCreator as any,
             selfDeaf: false,
             selfMute: false,
+            group: this.client.user.id,
         });
 
         try {
@@ -328,14 +331,25 @@ export class VoiceManager extends EventEmitter {
         }
     }
 
+    private getVoiceConnection(guildId: string) {
+        const connections = getVoiceConnections(this.client.user.id);
+        if (!connections) {
+            return;
+        }
+        const connection = [...connections.values()].find(
+            (connection) => connection.joinConfig.guildId === guildId
+        );
+        return connection;
+    }
+
     private async monitorMember(
         member: GuildMember,
         channel: BaseGuildVoiceChannel
     ) {
         const userId = member?.id;
         const userName = member?.user?.username;
         const name = member?.user?.displayName;
-        const connection = getVoiceConnection(member?.guild?.id);
+        const connection = this.getVoiceConnection(member?.guild?.id);
         const receiveStream = connection?.receiver.subscribe(userId, {
             autoDestroy: true,
             emitClose: true,
@@ -1069,7 +1083,7 @@ export class VoiceManager extends EventEmitter {
     }
 
     async handleLeaveChannelCommand(interaction: any) {
-        const connection = getVoiceConnection(interaction.guildId as any);
+        const connection = this.getVoiceConnection(interaction.guildId as any);
 
         if (!connection) {
             await interaction.reply("Not currently in a voice channel.");