Merge branch 'v2-develop' into 0xbbjoker/fix-pglite

elizaOS · Feb 25, 2025 · 3c2fb1c · 3c2fb1c
2 parents 6a7a3c6 + 13224d6
commit 3c2fb1c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/packages/core/src/bootstrap.ts b/packages/core/src/bootstrap.ts
@@ -48,6 +48,7 @@ type UserJoinedParams = {
   user: any;
   serverId: string;
   channelId: string;
+  channelType: ChannelType,
   source: string;
 };
 
@@ -326,6 +327,7 @@ const syncLargeServerUsers = async (
             Array.from(activeUsers),
             guild.id,
             channelId,
+            ChannelType.GROUP,
             source
           );
         }
@@ -354,7 +356,7 @@ const syncLargeServerUsers = async (
           }));
 
           // Sync this batch to the general server (not channel-specific)
-          await syncMultipleUsers(runtime, users, guild.id, null, source);
+          await syncMultipleUsers(runtime, users, guild.id, null, ChannelType.WORLD, source);
 
           // Add a delay between batches to avoid rate limits
           if (i + batchSize < onlineMembersArray.length) {
@@ -458,7 +460,7 @@ const syncRegularServerUsers = async (
       }));
 
       // Note: null channelId means this sync is server-wide
-      await syncMultipleUsers(runtime, users, guild.id, null, source);
+      await syncMultipleUsers(runtime, users, guild.id, null, ChannelType.WORLD, source);
 
       // Add a small delay between batches
       if (i + batchSize < membersArray.length) {
@@ -480,13 +482,15 @@ const syncSingleUser = async (
   user: any,
   serverId: string,
   channelId: string,
+  type: ChannelType,
   source: string
 ) => {
   logger.info(`Syncing user: ${user.username || user.id}`);
 
   try {
     const userId = stringToUuid(`${user.id}-${runtime.agentId}`);
     const roomId = stringToUuid(`${channelId}-${runtime.agentId}`);
+    const worldId = stringToUuid(`${serverId}-${runtime.agentId}`);
 
     // Ensure user exists
     await runtime.getOrCreateUser(
@@ -495,6 +499,8 @@ const syncSingleUser = async (
       user.displayName || user.username || `User${user.id}`,
       source
     );
+
+    await runtime.ensureRoomExists({id: roomId, source, type, channelId, serverId, worldId});
 
     // Add user to the channel's room
     await runtime.ensureParticipantInRoom(userId, roomId);
@@ -513,13 +519,14 @@ const syncMultipleUsers = async (
   users: any[],
   serverId: string,
   channelId: string,
+  type: ChannelType,
   source: string
 ) => {
   logger.info(`Syncing ${users.length} users for channel ${channelId}`);
 
   try {
     const roomId = stringToUuid(`${channelId}-${runtime.agentId}`);
-
+    const worldId = stringToUuid(`${serverId}-${runtime.agentId}`);
     // Process users in batches to avoid overwhelming the system
     const batchSize = 10;
     for (let i = 0; i < users.length; i += batchSize) {
@@ -538,6 +545,7 @@ const syncMultipleUsers = async (
               source
             );
 
+            await runtime.ensureRoomExists({id: roomId, source, type, channelId, serverId, worldId});
             // Add user to the room
             await runtime.ensureParticipantInRoom(userId, roomId);
           } catch (err) {
@@ -588,8 +596,8 @@ const events = {
     }
   ],
   USER_JOINED: [
-    async ({ runtime, user, serverId, channelId, source }: UserJoinedParams) => {
-      await syncSingleUser(runtime, user, serverId, channelId, source);
+    async ({ runtime, user, serverId, channelId, channelType, source }: UserJoinedParams) => {
+      await syncSingleUser(runtime, user, serverId, channelId, channelType, source);
     }
   ],
 };

diff --git a/packages/plugin-discord/src/index.ts b/packages/plugin-discord/src/index.ts
@@ -166,6 +166,7 @@ export class DiscordClient extends EventEmitter implements IDiscordClient {
       },
       serverId: guild.id,
       channelId: null, // No specific channel for server joins
+      channelType: ChannelType.WORLD,
       source: "discord"
     });
 
@@ -183,6 +184,7 @@ export class DiscordClient extends EventEmitter implements IDiscordClient {
           },
           serverId: guild.id,
           channelId: channelId,
+          channelType: ChannelType.GROUP,
           source: "discord"
         });
       }