Merge pull request #142 from cephie-studios/canary

fix: public ranks & crowns

Author: dev-banane

package-lock.json

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
 import { getTesterSettings } from '../db/testers.js';
 import { getActiveNotifications } from '../db/notifications.js';
 import { mainDb, flightsDb, redisConnection } from '../db/connection.js';
-import { getTopUsers, STATS_KEYS } from '../db/leaderboard.js';
+import { getTopUsers, STATS_KEYS, getUserRank } from '../db/leaderboard.js';
 import { getUserById } from '../db/users.js';
 import { getWaypointData } from '../utils/getData.js';
 import { findPath } from '../utils/findRoute.js';
@@ -555,6 +555,32 @@ router.get('/leaderboard', async (req, res) => {
   }
 });
 
+// GET: /api/data/ranks/:userId - Fetch leaderboard ranks for a specific user
+router.get('/ranks/:userId', async (req, res) => {
+  try {
+    const { userId } = req.params;
+
+    if (!userId) {
+      return res.status(400).json({ error: 'Missing userId parameter' });
+    }
+
+    const user = await getUserById(userId);
+    if (!user) {
+      return res.status(404).json({ error: 'User not found' });
+    }
+
+    const ranks: Record<string, number | null> = {};
+    for (const key of STATS_KEYS) {
+      ranks[key] = await getUserRank(userId, key);
+    }
+
+    res.json(ranks);
+  } catch (error) {
+    console.error('Error fetching user ranks:', error);
+    res.status(500).json({ error: 'Failed to fetch user ranks' });
+  }
+});
+
 // GET: /api/data/tester-settings - get tester gate settings
 router.get('/tester-settings', async (req, res) => {
   try {

server/routes/data.ts

@@ -301,10 +301,6 @@ export default function Flights() {
       setFlights((prev) => prev.filter((flight) => flight.id !== flightId));
     };
 
-    const handleFlightError = (error: string) => {
-      console.error('Flight websocket error:', error);
-    };
-
     const socket = createFlightsSocket(
       sessionId,
       accessId,
@@ -313,7 +309,9 @@ export default function Flights() {
       handleFlightUpdate,
       handleFlightAdded,
       handleFlightDeleted,
-      handleFlightError
+      (error: { action: string; flightId?: string | number; error: string }) => {
+        console.error('Flight websocket error:', error);
+      }
     );
     socket.socket.on('sessionUpdated', (updates) => {
       setSession((prev) => (prev ? { ...prev, ...updates } : null));

src/pages/Flights.tsx

@@ -38,7 +38,7 @@ import { SiRoblox } from 'react-icons/si';
 import { fetchPilotProfile } from '../utils/fetch/pilot';
 import { getCurrentUser } from '../utils/fetch/auth';
 import { useAuth } from '../hooks/auth/useAuth';
-import { fetchBackgrounds } from '../utils/fetch/data';
+import { fetchBackgrounds, fetchUserRanks } from '../utils/fetch/data';
 import type { PilotProfile, Role } from '../types/pilot';
 import Button from '../components/common/Button';
 import Loader from '../components/common/Loader';
@@ -146,8 +146,13 @@ export default function PilotProfile() {
       const data = await fetchPilotProfile(username!);
       if (data) {
         setProfile(data);
-        if (!isCurrentUser) {
-          setUserStats(data.user.statistics || {});
+        setUserStats(data.user.statistics || {});
+
+        try {
+          const profileRanks = await fetchUserRanks(data.user.id);
+          setRanks(profileRanks || {});
+        } catch {
+          // ignore
         }
       } else {
         setError('Pilot not found');
@@ -163,7 +168,6 @@ export default function PilotProfile() {
     try {
       const userData = await getCurrentUser();
       setUserStats(userData.statistics || {});
-      setRanks(userData.ranks || {});
     } catch {
       // ignore
     }
@@ -323,7 +327,7 @@ export default function PilotProfile() {
     profile.user.vatsim_rating_long
   );
 
-  const hasCrown = isCurrentUser && isRankOne(ranks);
+  const hasCrown = isRankOne(ranks);
 
   return (
     <div className="min-h-screen bg-zinc-950 text-white">

src/pages/PilotProfile.tsx

@@ -105,6 +105,18 @@ export async function fetchActiveNotifications(): Promise<AdminNotification[]> {
   return await response.json();
 }
 
+export async function fetchUserRanks(
+  userId: string
+): Promise<Record<string, number | null>> {
+  const response = await fetch(
+    `${import.meta.env.VITE_SERVER_URL}/api/data/ranks/${userId}`
+  );
+  if (!response.ok) {
+    throw new Error('Failed to fetch user ranks');
+  }
+  return response.json();
+}
+
 export async function fetchRoute(from: string, to: string): Promise<{
   path: Array<{ name: string; x: number; y: number; type: string }>;
   distance: number;