Update agent.js

Author: serefyarar

agent.js

@@ -181,15 +181,16 @@ export const agentLogic = async ({messages, conversationId, senderFid, name}) =>
             'accepted',
         );
 
+        const otherFid = parseInt(match.user1_fid) === senderFid 
+        ? match.user2_fid 
+        : match.user1_fid;
+    
+        const currentUser = await findUserByFid(senderFid);
+        const otherUser = await findUserByFid(otherFid);
+
         // If this is the first acceptance, notify the other user
         if (match.status === 'pending') {
-            const otherFid = parseInt(match.user1_fid) === senderFid 
-                ? match.user2_fid 
-                : match.user1_fid;
-            
-            const currentUser = await findUserByFid(senderFid);
-            const otherUser = await findUserByFid(otherFid);
-            
+
             await sendToolMessage({fid: senderFid, messages, content: JSON.stringify({
                 result: 'pending',
                 content: `Waiting for ${otherUser.name} to accept`
@@ -200,26 +201,23 @@ export const agentLogic = async ({messages, conversationId, senderFid, name}) =>
             return;
 
         } else if (match.status === 'accepted') {
-            // Both users have accepted, create the group
-            const currentUser = await findUserByFid(match.user1_fid);
-            const matchedUser = await findUserByFid(match.user2_fid);
-            
+            // Both users have accepted, create the group            
             await sendToolMessage({fid: currentUser.fid, messages, content: JSON.stringify({
                 result: 'accepted',
-                content: `You and ${matchedUser.name} now both accepted. Agent now will connect both of you.`
+                content: `You and ${otherUser.name} now both accepted. Agent now will connect both of you.`
             })}); 
 
-            const otherMessages = await farcaster.getMessages(`${matchedUser.fid}-${agentFID}`)
-            await sendToolMessage({fid: matchedUser.fid, messages: otherMessages, content: JSON.stringify({
+            const otherMessages = await farcaster.getMessages(`${otherUser.fid}-${agentFID}`)
+            await sendToolMessage({fid: otherUser.fid, messages: otherMessages, content: JSON.stringify({
                 result: 'accepted',
                 content: `You and ${currentUser.name} is accepted. Agent now will connect both of you. `
             })})
 
-            const groupMessage = await prepareMatchSuccessMessage(currentUser, matchedUser);
+            const groupMessage = await prepareMatchSuccessMessage(currentUser, otherUser);
 
             await farcaster.matchUsers(
-                `${currentUser.name} <> ${matchedUser.name}`,
-                [parseInt(currentUser.fid), parseInt(matchedUser.fid)],
+                `${currentUser.name} <> ${otherUser.name}`,
+                [parseInt(currentUser.fid), parseInt(otherUser.fid)],
                 groupMessage
             );
         }