Upload 2 files

src/components/PixiGame.tsx

@@ -32,7 +32,7 @@ export const PixiGame = (props: {
   const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId: props.worldId, oauthToken }) ?? null;
   
   const humanPlayerId = [...props.game.world.players.values()].find(
-    (p) => !! p && p.human === humanTokenIdentifier,
+    (p) => p.human === humanTokenIdentifier,
   )?.id;
 
   const moveTo = useSendInput(props.engineId, 'moveTo');

src/components/PlayerDetails.tsx

@@ -14,7 +14,7 @@ export default function PlayerDetails({
   worldId,
   engineId,
   game,
-  playerId: SelectedPlayerId,
+  playerId: playerId,
   setSelectedElement,
   scrollViewRef,
   currentPlayerId,
@@ -31,34 +31,34 @@ export default function PlayerDetails({
   const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
   const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId, oauthToken });  
 
-  const humanPlayer = [...game.world.players.values()].find(
-    (p) => game.playerDescriptions.get(p.id)?.name === humanTokenIdentifier,
-  );
+  onst players = [...game.world.players.values()];
+  const humanPlayer = players.find((p) => p.human === humanTokenIdentifier);
   const humanConversation = humanPlayer ? game.world.playerConversation(humanPlayer) : undefined;
   // Always select the other player if we're in a conversation with them.
   if (humanPlayer && humanConversation) {
     const otherPlayerIds = [...humanConversation.participants.keys()].filter(
-      (p) => !!p && p !== humanPlayer.id,
+      (p) => p !== humanPlayer.id,
     );
-    SelectedPlayerId = otherPlayerIds[0];
+    playerId = otherPlayerIds[0];
   }
 
-  const player = SelectedPlayerId && game.world.players.get(SelectedPlayerId);
+
+  const player = playerId && game.world.players.get(playerId);
   const playerConversation = player && game.world.playerConversation(player);
 
   const previousConversation = useQuery(
     api.world.previousConversation,
-    SelectedPlayerId ? { worldId, playerId: SelectedPlayerId } : 'skip',
+    playerId ? { worldId, playerId: playerId } : 'skip',
   );
 
-  const playerDescription = SelectedPlayerId && game.playerDescriptions.get(SelectedPlayerId);
+  const playerDescription = playerId && game.playerDescriptions.get(playerId);
 
   const startConversation = useSendInput(engineId, 'startConversation');
   const acceptInvite = useSendInput(engineId, 'acceptInvite');
   const rejectInvite = useSendInput(engineId, 'rejectInvite');
   const leaveConversation = useSendInput(engineId, 'leaveConversation');
 
-  if (!SelectedPlayerId) {
+  if (!playerId) {
     return (
       <div className="h-full text-xl flex text-center items-center p-4">
         Click on an agent on the map to see chat history.
@@ -68,7 +68,7 @@ export default function PlayerDetails({
   if (!player) {
     return null;
   }
-  const isMe = humanPlayer && SelectedPlayerId === currentPlayerId;
+  const isMe = humanPlayer && player.id === humanPlayer.id;
   const canInvite = !isMe && !playerConversation && humanPlayer && !humanConversation;
   const sameConversation =
     !isMe &&
@@ -79,10 +79,10 @@ export default function PlayerDetails({
   
   const humanStatus =
     humanPlayer && humanConversation && humanConversation.participants.get(humanPlayer.id)?.status;
-  const playerStatus = playerConversation && playerConversation.participants.get(SelectedPlayerId)?.status;
+  const playerStatus = playerConversation && playerConversation.participants.get(playerId)?.status;
   const haveInvite = sameConversation && humanStatus?.kind === 'invited';
   const waitingForAccept =
-    sameConversation && playerConversation.participants.get(SelectedPlayerId)?.status.kind === 'invited';
+    sameConversation && playerConversation.participants.get(playerId)?.status.kind === 'invited';
   const waitingForNearby =
     sameConversation && playerStatus?.kind === 'walkingOver' && humanStatus?.kind === 'walkingOver';
 
@@ -92,14 +92,14 @@ export default function PlayerDetails({
     humanStatus?.kind === 'participating';
 
   const onStartConversation = async () => {
-    if (!humanPlayer || !SelectedPlayerId) {
+    if (!humanPlayer || !playerId) {
       return;
     }
     console.log(`Starting conversation`);
-    await toastOnError(startConversation({ playerId: humanPlayer.id, invitee: SelectedPlayerId }));
+    await toastOnError(startConversation({ playerId: humanPlayer.id, invitee: playerId }));
   };
   const onAcceptInvite = async () => {
-    if (!humanPlayer || !humanConversation || !SelectedPlayerId) {
+    if (!humanPlayer || !humanConversation || !playerId) {
       return;
     }
     await toastOnError(