src/assets/styles/global.css

@@ -364,7 +364,6 @@ Custom
   padding: 0.25rem 0.5rem;
   border-radius: 9999px;
   border: 1px solid;
-  text-transform: uppercase;
   letter-spacing: 0.025em;
 }
 

src/assets/styles/nav.css

@@ -29,10 +29,19 @@
 }
 
 .mobile-menu-dropdown.open {
-  max-height: 500px;
+  max-height: none;
+  overflow: visible;
+  padding-bottom: 0.75rem;
   opacity: 1;
 }
 
+.mobile-menu-dropdown a {
+  font-size: 0.95rem;
+  line-height: 1.25rem;
+  padding: 0.6rem 0.75rem;
+  border-radius: 12px;
+}
+
 @media (min-width: 768px) {
   .mobile-menu-dropdown {
     display: none;

src/components/AppLayout.tsx

@@ -46,7 +46,8 @@ export interface RootProps {
 
 export default function Root({ child, user = undefined, ...props }: RootProps): React.ReactElement {
   window.toast = toast;
-  const theme = document.documentElement.getAttribute("data-theme")
+  const theme = document.documentElement.getAttribute("data-theme") ?? null;
+  const toastTheme = theme ?? undefined;
   const loggedIn = props.loggedIn ?? Boolean(user);
   usePrimeReactThemeSwitcher(theme);
   // Avoid adding the Player island for subsite requests. We expose a
@@ -81,7 +82,7 @@ export default function Root({ child, user = undefined, ...props }: RootProps):
     let mounted = true;
     if (wantPlayer) {
       if (import.meta.env.DEV) { try { console.debug('[AppLayout] dynamic-import: requesting AudioPlayer'); } catch (e) { } }
-      import('./AudioPlayer.jsx')
+      import('./Radio.js')
         .then((mod) => {
           if (!mounted) return;
           // set the component factory
@@ -102,7 +103,7 @@ export default function Root({ child, user = undefined, ...props }: RootProps):
   return (
     <PrimeReactProvider>
       <CustomToastContainer
-        theme={theme}
+        theme={toastTheme}
         newestOnTop={true}
         closeOnClick={true} />
       <JoyUIRootIsland>
@@ -114,22 +115,22 @@ export default function Root({ child, user = undefined, ...props }: RootProps):
           Work in progress... bugs are to be expected.
         </Alert> */}
         {child == "LoginPage" && (<LoginPage {...props} loggedIn={loggedIn} />)}
-        {child == "LyricSearch" && (<LyricSearch {...props} client:only="react" />)}
+        {child == "LyricSearch" && (<LyricSearch />)}
         {child == "Player" && !isSubsite && PlayerComp && (
           <Suspense fallback={null}>
-            <PlayerComp client:only="react" user={user} />
+            <PlayerComp user={user} />
           </Suspense>
         )}
-        {child == "Memes" && <Memes client:only="react" />}
+        {child == "Memes" && <Memes />}
         {child == "DiscordLogs" && (
           <Suspense fallback={<div style={{ padding: '2rem', textAlign: 'center' }}>Loading...</div>}>
-            <DiscordLogs client:only="react" />
+            <DiscordLogs />
           </Suspense>
         )}
-        {child == "qs2.MediaRequestForm" && <MediaRequestForm client:only="react" />}
-        {child == "qs2.RequestManagement" && <RequestManagement client:only="react" />}
-        {child == "ReqForm" && <ReqForm {...props} client:only="react" />}
-        {child == "Lighting" && <Lighting key={window.location.pathname + Math.random()} client:only="react" />}
+        {child == "qs2.MediaRequestForm" && <MediaRequestForm />}
+        {child == "qs2.RequestManagement" && <RequestManagement />}
+        {child == "ReqForm" && <ReqForm />}
+        {child == "Lighting" && <Lighting key={window.location.pathname + Math.random()} />}
       </JoyUIRootIsland>
     </PrimeReactProvider>
   );

src/components/DiscordLogs.tsx

@@ -38,6 +38,9 @@ interface DiscordChannel {
     topic?: string;
     messageCount?: number;
     threads?: DiscordChannel[];
+    categoryName?: string | null;
+    categoryPosition?: number;
+    guild?: DiscordGuild;
 }
 
 interface DiscordEmoji {
@@ -134,14 +137,24 @@ interface DiscordMessage {
     tts?: boolean;
 }
 
+interface MemberSummary {
+    id: string;
+    username?: string;
+    displayName?: string;
+    avatar?: string;
+    color?: string | number;
+    isBot?: boolean;
+}
+
 interface MemberGroup {
     role?: DiscordRole;
-  members?: Array<{ id: string; color?: string | number }>;
+    members?: MemberSummary[];
 }
 
 interface MembersData {
     groups?: MemberGroup[];
     roles?: Map<string, DiscordRole> | Record<string, DiscordRole>;
+    totalMembers?: number;
 }
 
 interface DiscordGuild {
@@ -150,7 +163,7 @@ interface DiscordGuild {
     guildId?: string;
     guildName?: string;
     guildIcon?: string;
-  icon?: string;
+    icon?: string | null;
     roles?: DiscordRole[];
 }
 
@@ -180,7 +193,7 @@ interface MessageProps {
     message: DiscordMessage;
     isFirstInGroup: boolean;
     showTimestamp: boolean;
-  previewCache: Map<string, LinkPreviewData>;
+    previewCache: Record<string, LinkPreviewData>;
     onPreviewLoad: (url: string, preview: LinkPreviewData) => void;
     channelMap: Map<string, DiscordChannel>;
     usersMap: Record<string, DiscordUser>;
@@ -221,7 +234,7 @@ interface ArchivedMessageResult {
 interface ReactionPopupState {
   x: number;
   y: number;
-  emoji: { id?: string; name: string; animated?: boolean };
+    emoji: { id?: string; name: string; animated?: boolean; url?: string };
   users: Array<{ id: string; username?: string; displayName?: string; avatar?: string }>;
   loading?: boolean;
 }
@@ -663,7 +676,7 @@ const ARCHIVE_USERS = {
  * If members data is provided, looks up color from there
  * Returns user data if found, otherwise returns a basic object with just the username
  */
-function resolveArchivedUser(archivedUsername: string, usersMap?: Record<string, DiscordUser>, members?: MembersData): DiscordUser {
+function resolveArchivedUser(archivedUsername: string, usersMap?: Record<string, DiscordUser>, members?: MembersData | null): DiscordUser {
     // First check hardcoded archive users
     if (ARCHIVE_USERS[archivedUsername]) {
         const archivedUser = ARCHIVE_USERS[archivedUsername];
@@ -2480,19 +2493,19 @@ export default function DiscordLogs() {
             try {
                 const response = await authFetch('/api/discord/channels');
                 if (!response.ok) throw new Error('Failed to fetch channels');
-                const data = await response.json();
+                const data = await response.json() as DiscordChannel[];
 
                 // Separate categories (type 4), text channels (type 0), and threads (types 10, 11, 12)
-                const categories = {};
-                const textChannels = [];
-                const threads = [];
+                const categories: Record<string, { id: string; name: string; position: number; guildId?: string }> = {};
+                const textChannels: DiscordChannel[] = [];
+                const threads: DiscordChannel[] = [];
 
-                data.forEach(channel => {
+                (data as DiscordChannel[]).forEach((channel: DiscordChannel) => {
                     if (channel.type === 4) {
                         categories[channel.id] = {
                             id: channel.id,
                             name: channel.name,
-                            position: channel.position,
+                            position: channel.position ?? 0,
                             guildId: channel.guildId,
                         };
                     } else if (channel.type === 10 || channel.type === 11 || channel.type === 12) {
@@ -2503,8 +2516,8 @@ export default function DiscordLogs() {
                 });
 
                 // Create a map of parent channel ID to threads
-                const threadsByParent = {};
-                threads.forEach(thread => {
+                const threadsByParent: Record<string, DiscordChannel[]> = {};
+                threads.forEach((thread: DiscordChannel) => {
                     if (thread.parentId) {
                         if (!threadsByParent[thread.parentId]) {
                             threadsByParent[thread.parentId] = [];
@@ -2514,10 +2527,10 @@ export default function DiscordLogs() {
                 });
 
                 // Group channels by guild
-                const byGuild = {};
-                const guildMap = {};
+                const byGuild: Record<string, DiscordChannel[]> = {};
+                const guildMap: Record<string, DiscordGuild> = {};
 
-                textChannels.forEach(channel => {
+                textChannels.forEach((channel: DiscordChannel) => {
                     const guildId = channel.guildId || 'unknown';
                     if (!byGuild[guildId]) {
                         byGuild[guildId] = [];
@@ -2525,10 +2538,10 @@ export default function DiscordLogs() {
                             id: guildId,
                             name: channel.guildName || 'Discord Archive',
                             icon: channel.guildIcon || null,
-                        };
+                        } as DiscordGuild;
                     }
-                    const categoryName = channel.parentId ? categories[channel.parentId]?.name : null;
-                    const categoryPosition = channel.parentId ? categories[channel.parentId]?.position : -1;
+                    const categoryName = channel.parentId ? categories[channel.parentId]?.name ?? null : null;
+                    const categoryPosition = channel.parentId ? categories[channel.parentId]?.position ?? -1 : -1;
 
                     // Get threads for this channel
                     const channelThreads = threadsByParent[channel.id] || [];
@@ -2543,22 +2556,22 @@ export default function DiscordLogs() {
                         categoryName,
                         categoryPosition,
                         guild: guildMap[guildId],
-                        messageCount: channel.messageCount || 0,
+                        messageCount: channel.messageCount ?? 0,
                         threads: channelThreads.map(t => ({
                             id: t.id,
                             name: t.name,
                             type: t.type,
-                            messageCount: t.messageCount || 0,
+                            messageCount: t.messageCount ?? 0,
                             parentId: t.parentId,
                             guildId: t.guildId,
                             guildName: t.guildName,
                             guildIcon: t.guildIcon,
                         })),
-                    });
+                    } as DiscordChannel);
                 });
 
                 // Sort guilds - put "no place like ::1" first
-                const guildList = Object.values(guildMap).sort((a, b) => {
+                const guildList = (Object.values(guildMap) as DiscordGuild[]).sort((a, b) => {
                     if (a.name === 'no place like ::1') return -1;
                     if (b.name === 'no place like ::1') return 1;
                     return a.name.localeCompare(b.name);
@@ -2569,23 +2582,23 @@ export default function DiscordLogs() {
                     byGuild[guildId].sort((a, b) => {
                         // First sort by category position (no category = -1, comes first)
                         if (a.categoryPosition !== b.categoryPosition) {
-                            return a.categoryPosition - b.categoryPosition;
+                            return (a.categoryPosition ?? -1) - (b.categoryPosition ?? -1);
                         }
                         // Then by channel position within category
-                        return (a.position || 0) - (b.position || 0);
+                        return (a.position ?? 0) - (b.position ?? 0);
                     });
                 });
 
                 setGuilds(guildList);
                 setChannelsByGuild(byGuild);
-                setChannels(data);
+                setChannels(data as DiscordChannel[]);
 
                 // Check URL hash for deep linking
                 const hash = window.location.hash.slice(1); // Remove #
                 const [hashGuildId, hashChannelId, hashMessageId] = hash.split('/');
 
-                let initialGuild = null;
-                let initialChannel = null;
+                let initialGuild: DiscordGuild | null = null;
+                let initialChannel: DiscordChannel | null = null;
 
                 // Set target message ID for scrolling after messages load
                 if (hashMessageId) {
@@ -2596,7 +2609,7 @@ export default function DiscordLogs() {
                 if (hashGuildId && guildMap[hashGuildId]) {
                     initialGuild = guildMap[hashGuildId];
                     if (hashChannelId && byGuild[hashGuildId]) {
-                        initialChannel = byGuild[hashGuildId].find(c => c.id === hashChannelId && c.messageCount > 0);
+                        initialChannel = byGuild[hashGuildId].find(c => c.id === hashChannelId && (c.messageCount ?? 0) > 0) ?? null;
                     }
                 }
 
@@ -2606,7 +2619,7 @@ export default function DiscordLogs() {
                 }
                 if (!initialChannel && initialGuild && byGuild[initialGuild.id]?.length > 0) {
                     // Pick first channel with messages
-                    initialChannel = byGuild[initialGuild.id].find(c => c.type !== 4 && c.messageCount > 0);
+                    initialChannel = byGuild[initialGuild.id].find(c => c.type !== 4 && (c.messageCount ?? 0) > 0) ?? null;
                 }
 
                 if (initialGuild) {
@@ -2629,20 +2642,22 @@ export default function DiscordLogs() {
 
     // Load members when guild or channel changes
     useEffect(() => {
-        if (!selectedGuild) return;
+        const guildId = selectedGuild?.id;
+        if (!guildId) return;
 
         async function fetchMembers() {
             setLoadingMembers(true);
             try {
                 // Include channelId to filter members by channel visibility
-                let url = `/api/discord/members?guildId=${selectedGuild.id}`;
-                if (selectedChannel?.id) {
-                    url += `&channelId=${selectedChannel.id}`;
+                let url = `/api/discord/members?guildId=${guildId}`;
+                const channelId = selectedChannel?.id;
+                if (channelId) {
+                    url += `&channelId=${channelId}`;
                 }
                 const response = await authFetch(url);
                 if (!response.ok) throw new Error('Failed to fetch members');
                 const data = await response.json();
-                setMembers(data);
+                setMembers(data as MembersData);
             } catch (err) {
                 console.error('Failed to fetch members:', err);
                 setMembers(null);
@@ -2656,7 +2671,8 @@ export default function DiscordLogs() {
 
     // Load messages from API when channel changes
     useEffect(() => {
-        if (!selectedChannel) return;
+        const channelId = selectedChannel?.id;
+        if (!channelId) return;
 
         // Reset topic expanded state when channel changes
         setTopicExpanded(false);
@@ -2676,7 +2692,7 @@ export default function DiscordLogs() {
 
             try {
                 // If we have a target message ID, use 'around' to fetch messages centered on it
-                let url = `/api/discord/messages?channelId=${selectedChannel.id}&limit=50`;
+                let url = `/api/discord/messages?channelId=${channelId}&limit=50`;
                 if (targetMessageId) {
                     url += `&around=${targetMessageId}`;
                 }
@@ -2695,20 +2711,20 @@ export default function DiscordLogs() {
                 if (targetMessageId && messagesData.length === 0) {
                     console.warn(`Target message ${targetMessageId} not found, loading latest messages`);
                     pendingTargetMessageRef.current = null;
-                    const fallbackResponse = await authFetch(`/api/discord/messages?channelId=${selectedChannel.id}&limit=50`);
+                    const fallbackResponse = await authFetch(`/api/discord/messages?channelId=${channelId}&limit=50`);
                     if (fallbackResponse.ok) {
                         const fallbackData = await fallbackResponse.json();
                         const fallbackMessages = fallbackData.messages || fallbackData;
                         const fallbackUsers = fallbackData.users || {};
                         const fallbackEmojis = fallbackData.emojiCache || {};
-                        const normalizedFallback = fallbackMessages.map(msg => ({
+                        const normalizedFallback = fallbackMessages.map((msg: DiscordMessage) => ({
                             ...msg,
-                            referenced_message: msg.referencedMessage || msg.referenced_message,
+                            referenced_message: (msg as any).referencedMessage || msg.referenced_message,
                             attachments: (msg.attachments || []).map(att => ({
                                 ...att,
-                                content_type: att.contentType || att.content_type,
+                                content_type: (att as any).contentType || att.content_type,
                             })),
-                        }));
+                        } as DiscordMessage));
                         setMessages(normalizedFallback.reverse());
                         setUsersMap(fallbackUsers);
                         setEmojiCache(fallbackEmojis);
@@ -2720,14 +2736,14 @@ export default function DiscordLogs() {
                 }
 
                 // Normalize field names from API to component expectations
-                const normalizedMessages = messagesData.map(msg => ({
+                const normalizedMessages = messagesData.map((msg: DiscordMessage) => ({
                     ...msg,
-                    referenced_message: msg.referencedMessage || msg.referenced_message,
+                    referenced_message: (msg as any).referencedMessage || msg.referenced_message,
                     attachments: (msg.attachments || []).map(att => ({
                         ...att,
-                        content_type: att.contentType || att.content_type,
+                        content_type: (att as any).contentType || att.content_type,
                     })),
-                }));
+                } as DiscordMessage));
 
                 // When using 'around', messages come back in ASC order already
                 // When using default (no around), they come DESC so reverse them
@@ -2797,14 +2813,15 @@ export default function DiscordLogs() {
 
     // Load more messages (pagination)
     const loadMoreMessages = useCallback(async () => {
-        if (loadingMore || !hasMoreMessages || messages.length === 0) return;
+        const channelId = selectedChannel?.id;
+        if (loadingMore || !hasMoreMessages || messages.length === 0 || !channelId) return;
 
         setLoadingMore(true);
         try {
             // Get the oldest message ID for pagination (messages are in ASC order, so first = oldest)
             const oldestMessage = messages[0];
             const response = await authFetch(
-                `/api/discord/messages?channelId=${selectedChannel.id}&limit=50&before=${oldestMessage.id}`
+                `/api/discord/messages?channelId=${channelId}&limit=50&before=${oldestMessage.id}`
             );
             if (!response.ok) throw new Error('Failed to fetch more messages');
             const data = await response.json();
@@ -2814,14 +2831,14 @@ export default function DiscordLogs() {
             const usersData = data.users || {};
             const emojiCacheData = data.emojiCache || {};
 
-            const normalizedMessages = messagesData.map(msg => ({
+            const normalizedMessages = messagesData.map((msg: DiscordMessage) => ({
                 ...msg,
-                referenced_message: msg.referencedMessage || msg.referenced_message,
+                referenced_message: (msg as any).referencedMessage || msg.referenced_message,
                 attachments: (msg.attachments || []).map(att => ({
                     ...att,
-                    content_type: att.contentType || att.content_type,
+                    content_type: (att as any).contentType || att.content_type,
                 })),
-            }));
+            } as DiscordMessage));
 
             // Prepend older messages (reversed to maintain ASC order)
             setMessages(prev => [...normalizedMessages.reverse(), ...prev]);
@@ -2835,7 +2852,7 @@ export default function DiscordLogs() {
         } finally {
             setLoadingMore(false);
         }
-    }, [loadingMore, hasMoreMessages, messages, selectedChannel]);
+    }, [loadingMore, hasMoreMessages, messages, selectedChannel?.id]);
 
     // Jump to first message in channel
     const jumpToFirstMessage = useCallback(async () => {
@@ -2886,14 +2903,15 @@ export default function DiscordLogs() {
 
     // Load newer messages (when viewing historical/oldest messages)
     const loadNewerMessages = useCallback(async () => {
-        if (loadingNewer || !hasNewerMessages || messages.length === 0) return;
+        const channelId = selectedChannel?.id;
+        if (loadingNewer || !hasNewerMessages || messages.length === 0 || !channelId) return;
 
         setLoadingNewer(true);
         try {
             // Get the newest message ID currently loaded
             const newestMessage = messages[messages.length - 1];
             const response = await authFetch(
-                `/api/discord/messages?channelId=${selectedChannel.id}&limit=50&after=${newestMessage.id}`
+                `/api/discord/messages?channelId=${channelId}&limit=50&after=${newestMessage.id}`
             );
             if (!response.ok) throw new Error('Failed to fetch newer messages');
             const data = await response.json();
@@ -2902,14 +2920,14 @@ export default function DiscordLogs() {
             const usersData = data.users || {};
             const emojiCacheData = data.emojiCache || {};
 
-            const normalizedMessages = messagesData.map(msg => ({
+            const normalizedMessages = messagesData.map((msg: DiscordMessage) => ({
                 ...msg,
-                referenced_message: msg.referencedMessage || msg.referenced_message,
+                referenced_message: (msg as any).referencedMessage || msg.referenced_message,
                 attachments: (msg.attachments || []).map(att => ({
                     ...att,
-                    content_type: att.contentType || att.content_type,
+                    content_type: (att as any).contentType || att.content_type,
                 })),
-            }));
+            } as DiscordMessage));
 
             // Append newer messages
             setMessages(prev => [...prev, ...normalizedMessages]);
@@ -2924,7 +2942,7 @@ export default function DiscordLogs() {
         } finally {
             setLoadingNewer(false);
         }
-    }, [loadingNewer, hasNewerMessages, messages, selectedChannel]);
+    }, [loadingNewer, hasNewerMessages, messages, selectedChannel?.id]);
 
     // Infinite scroll: load more when scrolling near the top or bottom
     useEffect(() => {
@@ -2979,9 +2997,9 @@ export default function DiscordLogs() {
                     `/api/discord/messages?channelId=${selectedChannel.id}&limit=50&after=${newestMessage.id}`
                 );
 
-                let newMessages = [];
-                let newUsersData = {};
-                let newEmojiCacheData = {};
+                let newMessages: DiscordMessage[] = [];
+                let newUsersData: Record<string, DiscordUser> = {};
+                let newEmojiCacheData: Record<string, DiscordEmoji> = {};
 
                 if (newMsgsResponse.ok) {
                     const data = await newMsgsResponse.json();
@@ -2990,14 +3008,14 @@ export default function DiscordLogs() {
                     newEmojiCacheData = data.emojiCache || {};
 
                     if (messagesData.length > 0) {
-                        newMessages = messagesData.map(msg => ({
+                        newMessages = messagesData.map((msg: DiscordMessage) => ({
                             ...msg,
-                            referenced_message: msg.referencedMessage || msg.referenced_message,
+                            referenced_message: (msg as any).referencedMessage || msg.referenced_message,
                             attachments: (msg.attachments || []).map(att => ({
                                 ...att,
-                                content_type: att.contentType || att.content_type,
+                                content_type: (att as any).contentType || att.content_type,
                             })),
-                        }));
+                        } as DiscordMessage));
                     }
                 }
 
@@ -3006,7 +3024,7 @@ export default function DiscordLogs() {
                     `/api/discord/messages?channelId=${selectedChannel.id}&limit=100&editedSince=${encodeURIComponent(lastPollTimeRef.current)}`
                 );
 
-                let editedMessages = [];
+                let editedMessages: DiscordMessage[] = [];
                 if (editedResponse.ok) {
                     const editedData = await editedResponse.json();
                     const editedMessagesData = editedData.messages || editedData;
@@ -3015,14 +3033,14 @@ export default function DiscordLogs() {
                     newUsersData = { ...newUsersData, ...editedUsersData };
                     newEmojiCacheData = { ...newEmojiCacheData, ...editedEmojiCacheData };
 
-                    editedMessages = editedMessagesData.map(msg => ({
+                    editedMessages = editedMessagesData.map((msg: DiscordMessage) => ({
                         ...msg,
-                        referenced_message: msg.referencedMessage || msg.referenced_message,
+                        referenced_message: (msg as any).referencedMessage || msg.referenced_message,
                         attachments: (msg.attachments || []).map(att => ({
                             ...att,
-                            content_type: att.contentType || att.content_type,
+                            content_type: (att as any).contentType || att.content_type,
                         })),
-                    }));
+                    } as DiscordMessage));
                 }
 
                 // Update last poll time for next iteration
@@ -3037,7 +3055,7 @@ export default function DiscordLogs() {
                 if (newMessages.length > 0 || editedMessages.length > 0) {
                     setMessages(prev => {
                         // Create a map of existing messages by ID
-                        const msgMap = new Map(prev.map(m => [m.id, m]));
+                        const msgMap = new Map<string, DiscordMessage>(prev.map(m => [m.id, m]));
 
                         // Update with edited messages (overwrite existing)
                         for (const msg of editedMessages) {
@@ -3085,14 +3103,14 @@ export default function DiscordLogs() {
             try {
                 const response = await authFetch('/api/discord/channels');
                 if (!response.ok) return;
-                const data = await response.json();
+                const data = await response.json() as DiscordChannel[];
 
                 // Separate categories (type 4), text channels (type 0), and threads (types 10, 11, 12)
-                const categories = {};
-                const textChannels = [];
-                const threads = [];
+                const categories: Record<string, { id: string; name: string; position?: number; guildId?: string }> = {};
+                const textChannels: DiscordChannel[] = [];
+                const threads: DiscordChannel[] = [];
 
-                data.forEach(channel => {
+                data.forEach((channel: DiscordChannel) => {
                     if (channel.type === 4) {
                         categories[channel.id] = {
                             id: channel.id,
@@ -3108,8 +3126,8 @@ export default function DiscordLogs() {
                 });
 
                 // Create a map of parent channel ID to threads
-                const threadsByParent = {};
-                threads.forEach(thread => {
+                const threadsByParent: Record<string, DiscordChannel[]> = {};
+                threads.forEach((thread: DiscordChannel) => {
                     if (thread.parentId) {
                         if (!threadsByParent[thread.parentId]) {
                             threadsByParent[thread.parentId] = [];
@@ -3119,10 +3137,10 @@ export default function DiscordLogs() {
                 });
 
                 // Rebuild guild/channel maps
-                const byGuild = {};
-                const guildMap = {};
+                const byGuild: Record<string, DiscordChannel[]> = {};
+                const guildMap: Record<string, DiscordGuild> = {};
 
-                textChannels.forEach(channel => {
+                textChannels.forEach((channel: DiscordChannel) => {
                     const guildId = channel.guildId || 'unknown';
                     if (!byGuild[guildId]) {
                         byGuild[guildId] = [];
@@ -3163,7 +3181,7 @@ export default function DiscordLogs() {
                 });
 
                 // Sort guilds
-                const guildList = Object.values(guildMap).sort((a, b) => {
+                const guildList: DiscordGuild[] = Object.values(guildMap).sort((a: DiscordGuild, b: DiscordGuild) => {
                     if (a.name === 'no place like ::1') return -1;
                     if (b.name === 'no place like ::1') return 1;
                     return a.name.localeCompare(b.name);
@@ -3171,9 +3189,9 @@ export default function DiscordLogs() {
 
                 // Sort channels within each guild
                 Object.keys(byGuild).forEach(guildId => {
-                    byGuild[guildId].sort((a, b) => {
-                        if (a.categoryPosition !== b.categoryPosition) {
-                            return a.categoryPosition - b.categoryPosition;
+                    byGuild[guildId].sort((a: DiscordChannel, b: DiscordChannel) => {
+                        if ((a.categoryPosition ?? -1) !== (b.categoryPosition ?? -1)) {
+                            return (a.categoryPosition ?? -1) - (b.categoryPosition ?? -1);
                         }
                         return (a.position || 0) - (b.position || 0);
                     });
@@ -3241,15 +3259,17 @@ export default function DiscordLogs() {
             if (msg.author?.displayName?.toLowerCase().includes(query)) return true;
 
             // Check embed content
-            if (msg.embeds?.length > 0) {
-                for (const embed of msg.embeds) {
+            const embeds = msg.embeds ?? [];
+            if (embeds.length > 0) {
+                for (const embed of embeds) {
                     if (embed.title?.toLowerCase().includes(query)) return true;
                     if (embed.description?.toLowerCase().includes(query)) return true;
                     if (embed.author?.name?.toLowerCase().includes(query)) return true;
                     if (embed.footer?.text?.toLowerCase().includes(query)) return true;
                     // Check embed fields
-                    if (embed.fields?.length > 0) {
-                        for (const field of embed.fields) {
+                    const fields = embed.fields ?? [];
+                    if (fields.length > 0) {
+                        for (const field of fields) {
                             if (field.name?.toLowerCase().includes(query)) return true;
                             if (field.value?.toLowerCase().includes(query)) return true;
                         }
@@ -3279,15 +3299,29 @@ export default function DiscordLogs() {
     // Group messages by author and time window (5 minutes)
     // Messages are in ASC order (oldest first, newest at bottom), so we group accordingly
     // For archive channel, parse messages to get real author/timestamp for grouping
+interface MessageGroupDivider {
+    type: 'divider';
+    date: string | null;
+}
+
+interface MessageGroupMessages {
+    type: 'messages';
+    author: DiscordUser;
+    effectiveAuthor: DiscordUser;
+    messages: Array<DiscordMessage & { effectiveTimestamp: string | null }>;
+}
+
+type MessageGroup = MessageGroupDivider | MessageGroupMessages;
+
     const groupedMessages = useMemo(() => {
-        const groups = [];
-        let currentGroup = null;
-        let lastDate = null;
+        const groups: MessageGroup[] = [];
+        let currentGroup: MessageGroupMessages | null = null;
+        let lastDate: string | null = null;
 
         filteredMessages.forEach((message) => {
             // For archive channel, parse to get real author and timestamp
             let effectiveAuthor = message.author;
-            let effectiveTimestamp = message.timestamp;
+            let effectiveTimestamp: string | null = message.timestamp ?? null;
 
             if (isArchiveChannel) {
                 const parsed = parseArchivedMessage(message.content);
@@ -3295,25 +3329,34 @@ export default function DiscordLogs() {
                     // Use resolved user for proper grouping by real user ID
                     const resolvedUser = resolveArchivedUser(parsed.originalAuthor, usersMap, members);
                     effectiveAuthor = resolvedUser;
-                    effectiveTimestamp = parsed.originalTimestamp;
+                    effectiveTimestamp = parsed.originalTimestamp ?? null;
                 }
             }
 
-            const messageDate = new Date(effectiveTimestamp).toDateString();
+            const effectiveTs = effectiveTimestamp ?? message.timestamp ?? null;
+            const messageDate = effectiveTs ? new Date(effectiveTs).toDateString() : lastDate;
 
             // Check if we need a date divider (date changed from previous message)
             if (messageDate !== lastDate) {
                 if (currentGroup) groups.push(currentGroup);
-                groups.push({ type: 'divider', date: effectiveTimestamp });
+                groups.push({ type: 'divider', date: effectiveTs });
                 currentGroup = null;
                 lastDate = messageDate;
             }
 
+            const lastMessage = currentGroup?.messages[currentGroup.messages.length - 1];
+            const lastTimestamp = lastMessage?.effectiveTimestamp ?? lastMessage?.timestamp ?? null;
+            const timeGapExceeded = lastTimestamp && effectiveTs
+                ? Math.abs(new Date(lastTimestamp).getTime() - new Date(effectiveTs).getTime()) > 5 * 60 * 1000
+                : true;
+
             // For ASC order: check time diff from the LAST message in current group
             // (which is the most recent since we're iterating oldest to newest)
             const shouldStartNewGroup = !currentGroup ||
                 currentGroup.effectiveAuthor?.id !== effectiveAuthor?.id ||
-                Math.abs(new Date(currentGroup.messages[currentGroup.messages.length - 1].effectiveTimestamp) - new Date(effectiveTimestamp)) > 5 * 60 * 1000;
+                timeGapExceeded;
+
+            const messageWithEffective = { ...message, effectiveTimestamp: effectiveTs } as DiscordMessage & { effectiveTimestamp: string | null };
 
             if (shouldStartNewGroup) {
                 if (currentGroup) groups.push(currentGroup);
@@ -3321,10 +3364,10 @@ export default function DiscordLogs() {
                     type: 'messages',
                     author: effectiveAuthor,
                     effectiveAuthor,
-                    messages: [{ ...message, effectiveTimestamp }],
+                    messages: [messageWithEffective],
                 };
-            } else {
-                currentGroup.messages.push({ ...message, effectiveTimestamp });
+            } else if (currentGroup) {
+                currentGroup.messages.push(messageWithEffective);
             }
         });
 
@@ -3332,6 +3375,8 @@ export default function DiscordLogs() {
         return groups;
     }, [filteredMessages, isArchiveChannel, usersMap, members]);
 
+    const memberGroups = members?.groups ?? [];
+
     if (loading) {
         return (
             <div className="discord-logs-container">
@@ -3461,7 +3506,7 @@ export default function DiscordLogs() {
                                             setSelectedGuild(guild);
                                             const guildChannels = channelsByGuild[guild.id];
                                             // Select first channel with messages
-                                            const firstAccessible = guildChannels?.find(c => c.messageCount > 0);
+                                            const firstAccessible = guildChannels?.find(c => (c.messageCount ?? 0) > 0);
                                             if (firstAccessible) {
                                                 setSelectedChannel(firstAccessible);
                                             }
@@ -3494,28 +3539,29 @@ export default function DiscordLogs() {
                                     {/* Collapsible categories state and handler at top level */}
                                     {/* ...existing code... */}
                                     {(() => {
-                                        let lastCategory = null;
+                                        let lastCategory: string | null | undefined;
                                         // Filter out channels with no messages (no access), but include if they have threads with messages
                                         const accessibleChannels = channelsByGuild[selectedGuild.id].filter(c =>
-                                            c.messageCount > 0 || c.threads?.some(t => t.messageCount > 0)
+                                            (c.messageCount ?? 0) > 0 || c.threads?.some(t => (t.messageCount ?? 0) > 0)
                                         );
                                         return accessibleChannels.map((channel) => {
-                                            const showCategoryHeader = channel.categoryName !== lastCategory;
-                                            lastCategory = channel.categoryName;
+                                            const catName = channel.categoryName ?? null;
+                                            const showCategoryHeader = catName !== lastCategory;
+                                            lastCategory = catName;
                                             // Filter threads that have messages
-                                            const accessibleThreads = channel.threads?.filter(t => t.messageCount > 0) || [];
-                                            const isCollapsed = channel.categoryName && collapsedCategories[channel.categoryName];
+                                            const accessibleThreads = channel.threads?.filter(t => (t.messageCount ?? 0) > 0) || [];
+                                            const isCollapsed = catName ? collapsedCategories[catName] : false;
                                             return (
                                                 <React.Fragment key={channel.id}>
-                                                    {showCategoryHeader && channel.categoryName && (
-                                                        <div className="discord-category-header" onClick={() => handleCategoryToggle(channel.categoryName)} style={{ cursor: 'pointer', userSelect: 'none' }}>
+                                                    {showCategoryHeader && catName && (
+                                                        <div className="discord-category-header" onClick={() => handleCategoryToggle(catName)} style={{ cursor: 'pointer', userSelect: 'none' }}>
                                                             <svg viewBox="0 0 24 24" fill="currentColor" width="12" height="12" style={{ transform: isCollapsed ? 'rotate(-90deg)' : 'rotate(0deg)', transition: 'transform 0.15s' }}>
                                                                 <path d="M5.3 9.3a1 1 0 0 1 1.4 0l5.3 5.29 5.3-5.3a1 1 0 1 1 1.4 1.42l-6 6a1 1 0 0 1-1.4 0l-6-6a1 1 0 0 1 0-1.42Z" />
                                                             </svg>
-                                                            {channel.categoryName}
+                                                            {catName}
                                                         </div>
                                                     )}
-                                                    {!isCollapsed && channel.messageCount > 0 && (
+                                                    {!isCollapsed && (channel.messageCount ?? 0) > 0 && (
                                                         <button
                                                             className={`discord-channel-btn ${channel.categoryName ? 'has-category' : ''} ${selectedChannel?.id === channel.id ? 'active' : ''}`}
                                                             onClick={() => setSelectedChannel(channel)}
@@ -3616,7 +3662,7 @@ export default function DiscordLogs() {
                                     if (group.type === 'divider') {
                                         return (
                                             <div key={`divider-${groupIdx}`} className="discord-date-divider">
-                                                <span>{formatDateDivider(group.date)}</span>
+                                                <span>{formatDateDivider(group.date ?? '')}</span>
                                             </div>
                                         );
                                     }
@@ -3631,12 +3677,13 @@ export default function DiscordLogs() {
                                                     key={message.id}
                                                     message={message}
                                                     isFirstInGroup={msgIdx === 0}
+                                                    showTimestamp={msgIdx === 0}
                                                     previewCache={previewCache}
                                                     onPreviewLoad={handlePreviewLoad}
                                                     channelMap={channelMap}
                                                     usersMap={usersMap}
                                                     emojiCache={emojiCache}
-                                                    members={members}
+                                                    members={members ?? undefined}
                                                     onChannelSelect={handleChannelSelect}
                                                     channelName={selectedChannel?.name}
                                                     onReactionClick={handleReactionClick}
@@ -3669,17 +3716,25 @@ export default function DiscordLogs() {
                                 <div className="discord-member-list-loading">
                                     <ProgressSpinner style={{ width: '24px', height: '24px' }} strokeWidth="4" />
                                 </div>
-                            ) : members?.groups?.length > 0 ? (
+                            ) : memberGroups.length > 0 ? (
                                 <>
-                                    {members.groups.map((group) => (
-                                        <div key={group.role.id} className="discord-member-group">
+                                    {memberGroups.map((group, groupIdx) => {
+                                        const roleColor = group.role?.color ? String(group.role.color) : undefined;
+                                        const roleName = group.role?.name ?? 'Members';
+                                        const groupMembers = group.members ?? [];
+                                        const groupKey = group.role?.id ?? `group-${groupIdx}`;
+                                        return (
+                                            <div key={groupKey} className="discord-member-group">
                                                 <div
                                                     className="discord-member-group-header"
-                                                style={group.role.color ? { color: group.role.color } : undefined}
+                                                    style={roleColor ? { color: roleColor } : undefined}
                                                 >
-                                                {group.role.name} — {group.members.length}
+                                                    {roleName} — {groupMembers.length}
                                                 </div>
-                                            {group.members.map((member) => (
+                                                {groupMembers.map((member) => {
+                                                    const memberColor = member.color ? String(member.color) : undefined;
+                                                    const display = member.displayName || member.username || member.id;
+                                                    return (
                                                         <div key={member.id} className="discord-member-item">
                                                             {member.avatar ? (
                                                                 <img
@@ -3689,20 +3744,22 @@ export default function DiscordLogs() {
                                                                 />
                                                             ) : (
                                                                 <div className="discord-member-avatar-placeholder">
-                                                            {(member.displayName || member.username || 'U')[0].toUpperCase()}
+                                                                    {display[0]?.toUpperCase()}
                                                                 </div>
                                                             )}
                                                             <span
                                                                 className="discord-member-name"
-                                                        style={member.color ? { color: member.color } : undefined}
+                                                                style={memberColor ? { color: memberColor } : undefined}
                                                             >
-                                                        {member.displayName || member.username}
+                                                                {display}
                                                             </span>
                                                             {member.isBot && <span className="discord-bot-tag">APP</span>}
                                                         </div>
-                                            ))}
+                                                    );
+                                                })}
                                             </div>
-                                    ))}
+                                        );
+                                    })}
                                 </>
                             ) : (
                                 <div className="discord-member-list-empty">No members found</div>

src/components/SubsiteAppLayout.tsx

@@ -4,11 +4,13 @@
  * This is a minimal version that avoids importing from shared modules
  * that would pull in heavy CSS (AppLayout, Components, etc.)
  */
-import React, { Suspense, lazy, ReactNode } from 'react';
+import React, { Suspense, lazy } from 'react';
+import type { ReactNode } from 'react';
 import { ToastContainer, toast } from 'react-toastify';
 import { CssVarsProvider } from "@mui/joy";
-import { CacheProvider, EmotionCache } from "@emotion/react";
+import { CacheProvider } from "@emotion/react";
 import createCache from "@emotion/cache";
+import type { EmotionCache } from "@emotion/cache";
 import { PrimeReactProvider } from "primereact/api";
 
 // Import only minimal CSS - no theme CSS, no primeicons

src/components/TRip/RequestManagement.tsx

@@ -17,9 +17,9 @@ interface RequestJob {
   tracks: number;
   quality: string;
   status: string;
-  progress: number;
+  progress: number | string | null;
   type?: string;
-  tarball_path?: string;
+  tarball?: string;
   created_at?: string;
   updated_at?: string;
   [key: string]: unknown;
@@ -40,9 +40,13 @@ export default function RequestManagement() {
   const pollingDetailRef = useRef<ReturnType<typeof setInterval> | null>(null);
 
 
+  const resolveTarballPath = (job: RequestJob) => job.tarball;
+
   const tarballUrl = (absPath: string | undefined, quality: string) => {
     if (!absPath) return null;
     const filename = absPath.split("/").pop(); // get "SOMETHING.tar.gz"
+    // If the backend already stores a fully qualified URL, return as-is
+    if (/^https?:\/\//i.test(absPath)) return absPath;
     return `${TAR_BASE_URL}/${quality}/${filename}`;
   };
 
@@ -172,24 +176,21 @@ export default function RequestManagement() {
 
   const formatProgress = (p: unknown) => {
     if (p === null || p === undefined || p === "") return "—";
-    const num = Number(p);
-    if (Number.isNaN(num)) return "—";
-    const pct = num > 1 ? Math.round(num) : num;
+    const pct = computePct(p);
     return `${pct}%`;
   };
 
   const computePct = (p: unknown) => {
     if (p === null || p === undefined || p === "") return 0;
     const num = Number(p);
-    if (Number.isNaN(num)) return 0;
-    return Math.min(100, Math.max(0, num > 1 ? Math.round(num) : Math.round(num * 100)));
+    if (!Number.isFinite(num)) return 0;
+    const normalized = num > 1 ? num : num * 100;
+    return Math.min(100, Math.max(0, Math.round(normalized)));
   };
 
   const progressBarTemplate = (rowData: RequestJob) => {
     const p = rowData.progress;
-    if (p === null || p === undefined || p === 0) return "—";
-    const num = Number(p);
-    if (Number.isNaN(num)) return "—";
+    if (p === null || p === undefined || p === "") return "—";
     const pct = computePct(p);
 
     const getProgressColor = () => {
@@ -341,7 +342,7 @@ export default function RequestManagement() {
                 </span>
               }
               body={(row: RequestJob) => {
-                const url = tarballUrl(row.tarball_path, row.quality || "FLAC");
+                const url = tarballUrl(resolveTarballPath(row as RequestJob), row.quality || "FLAC");
                 if (!url) return "—";
                 const encodedURL = encodeURI(url);
 
@@ -409,18 +410,25 @@ export default function RequestManagement() {
                   <strong>Progress:</strong>
                   <div className="rm-progress-container mt-2">
                     <div className="rm-progress-track rm-progress-track-lg">
+                      {(() => {
+                        const pctDialog = computePct(selectedRequest.progress);
+                        const status = selectedRequest.status;
+                        const fillColor = status === "Failed" ? "bg-red-500" : status === "Finished" ? "bg-green-500" : "bg-blue-500";
+                        return (
                       <div
-                        className={`rm-progress-fill ${selectedRequest.status === "Failed" ? "bg-red-500" : selectedRequest.status === "Finished" ? "bg-green-500" : "bg-blue-500"}`}
+                          className={`rm-progress-fill ${fillColor}`}
                           style={{
-                          ['--rm-progress' as string]: (computePct(selectedRequest.progress) / 100).toString(),
-                          borderTopRightRadius: computePct(selectedRequest.progress) >= 100 ? '999px' : 0,
-                          borderBottomRightRadius: computePct(selectedRequest.progress) >= 100 ? '999px' : 0
+                            ['--rm-progress' as string]: (pctDialog / 100).toString(),
+                            borderTopRightRadius: pctDialog >= 100 ? '999px' : 0,
+                            borderBottomRightRadius: pctDialog >= 100 ? '999px' : 0
                           }}
-                        data-pct={computePct(selectedRequest.progress)}
-                        aria-valuenow={Math.min(100, Math.max(0, Number(selectedRequest.progress) > 1 ? Math.round(selectedRequest.progress) : selectedRequest.progress * 100))}
+                          data-pct={pctDialog}
+                          aria-valuenow={pctDialog}
                           aria-valuemin={0}
                           aria-valuemax={100}
                         />
+                        );
+                      })()}
                     </div>
                     <span className="rm-progress-text">{formatProgress(selectedRequest.progress)}</span>
                   </div>
@@ -437,17 +445,17 @@ export default function RequestManagement() {
 
             {/* --- Tarball Card --- */}
             {
-              selectedRequest.tarball_path && (
+              selectedRequest.tarball && (
                 <div className="p-3 bg-gray-100 dark:bg-neutral-800 rounded-md">
                   <p>
                     <strong>Tarball:</strong>{" "}
                     <a
-                      href={encodeURI(tarballUrl(selectedRequest.tarball_path, selectedRequest.quality) || "")}
+                      href={encodeURI(tarballUrl(resolveTarballPath(selectedRequest), selectedRequest.quality) || "")}
                       target="_blank"
                       rel="noopener noreferrer"
                       className="text-blue-500 hover:underline"
                     >
-                      {tarballUrl(selectedRequest.tarball_path, selectedRequest.quality)?.split("/").pop()}
+                      {tarballUrl(resolveTarballPath(selectedRequest), selectedRequest.quality)?.split("/").pop()}
                     </a>
                   </p>
                 </div>

src/components/req/ReqForm.tsx

@@ -5,19 +5,46 @@ import { Button } from "@mui/joy";
 import { AutoComplete } from "primereact/autocomplete";
 import { InputText } from "primereact/inputtext";
 
+declare global {
+    interface Window {
+        _t?: string;
+    }
+}
+
+type MediaType = 'movie' | 'tv' | string;
+
+interface SearchItem {
+    label: string;
+    year?: string;
+    mediaType?: MediaType;
+    poster_path?: string | null;
+    overview?: string;
+    title?: string;
+    type?: string;
+    requester?: string;
+}
+
+interface SubmittedRequest {
+    title: string;
+    year: string;
+    type: string;
+    requester: string;
+    poster_path?: string | null;
+}
+
 export default function ReqForm() {
-    const [type, setType] = useState("");
-    const [title, setTitle] = useState("");
-    const [year, setYear] = useState("");
-    const [requester, setRequester] = useState("");
-    const [selectedItem, setSelectedItem] = useState(null);
-    const [selectedOverview, setSelectedOverview] = useState("");
-    const [selectedTitle, setSelectedTitle] = useState("");
-    const [isSubmitting, setIsSubmitting] = useState(false);
-    const [suggestions, setSuggestions] = useState([]);
-    const [posterLoading, setPosterLoading] = useState(true);
-    const [submittedRequest, setSubmittedRequest] = useState(null); // Track successful submission
-    const [csrfToken, setCsrfToken] = useState(null);
+    const [type, setType] = useState<string>("");
+    const [title, setTitle] = useState<string>("");
+    const [year, setYear] = useState<string>("");
+    const [requester, setRequester] = useState<string>("");
+    const [selectedItem, setSelectedItem] = useState<SearchItem | null>(null);
+    const [selectedOverview, setSelectedOverview] = useState<string>("");
+    const [selectedTitle, setSelectedTitle] = useState<string>("");
+    const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
+    const [suggestions, setSuggestions] = useState<SearchItem[]>([]);
+    const [posterLoading, setPosterLoading] = useState<boolean>(true);
+    const [submittedRequest, setSubmittedRequest] = useState<SubmittedRequest | null>(null); // Track successful submission
+    const [csrfToken, setCsrfToken] = useState<string | null>(null);
 
     // Get CSRF token from window global on mount
     useEffect(() => {
@@ -36,7 +63,7 @@ export default function ReqForm() {
         }
     }, [title, selectedTitle, selectedOverview, selectedItem, type]);
 
-    const searchTitles = async (event) => {
+    const searchTitles = async (event: { query: string }) => {
         const query = event.query;
         if (query.length < 2) {
             setSuggestions([]);
@@ -48,7 +75,7 @@ export default function ReqForm() {
             if (!response.ok) {
                 throw new Error(`API error: ${response.status}`);
             }
-            const data = await response.json();
+            const data: SearchItem[] = await response.json();
             setSuggestions(data);
         } catch (error) {
             console.error('Error fetching suggestions:', error);
@@ -56,7 +83,7 @@ export default function ReqForm() {
         }
     };
 
-    const handleSubmit = async (e) => {
+    const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
         e.preventDefault();
         if (!title.trim()) {
             toast.error("Please fill in the required fields.");
@@ -101,7 +128,7 @@ export default function ReqForm() {
                 year,
                 type,
                 requester,
-                poster_path: selectedItem?.poster_path,
+                poster_path: selectedItem?.poster_path ?? null,
             });
         } catch (error) {
             console.error('Submission error:', error);
@@ -126,13 +153,13 @@ export default function ReqForm() {
 
     const attachScrollFix = () => {
         setTimeout(() => {
-            const panel = document.querySelector(".p-autocomplete-panel");
-            const items = panel?.querySelector(".p-autocomplete-items");
+            const panel = document.querySelector<HTMLElement>(".p-autocomplete-panel");
+            const items = panel?.querySelector<HTMLElement>(".p-autocomplete-items");
             if (items) {
                 items.style.maxHeight = "200px";
                 items.style.overflowY = "auto";
                 items.style.overscrollBehavior = "contain";
-                const wheelHandler = (e) => {
+                const wheelHandler = (e: WheelEvent) => {
                     const delta = e.deltaY;
                     const atTop = items.scrollTop === 0;
                     const atBottom = items.scrollTop + items.clientHeight >= items.scrollHeight;
@@ -148,7 +175,7 @@ export default function ReqForm() {
         }, 0);
     };
 
-    const formatMediaType = (mediaTypeValue) => {
+    const formatMediaType = (mediaTypeValue: MediaType | undefined) => {
         if (!mediaTypeValue) return "";
         if (mediaTypeValue === "tv") return "TV Series";
         if (mediaTypeValue === "movie") return "Movie";
@@ -239,16 +266,17 @@ export default function ReqForm() {
                             delay={300}
                             onChange={(e) => {
                                 // Handle both string input and object selection
-                                const val = e.target?.value ?? e.value;
-                                setTitle(typeof val === 'string' ? val : val?.label || '');
+                                const val = (e as any).target?.value ?? e.value;
+                                setTitle(typeof val === 'string' ? val : (val as SearchItem | undefined)?.label || '');
                             }}
-                            onSelect={(e) => {
-                                setType(e.value.mediaType === 'tv' ? 'tv' : 'movie');
-                                setTitle(e.value.label);
-                                setSelectedTitle(e.value.label);
-                                setSelectedItem(e.value);
-                                if (e.value.year) setYear(e.value.year);
-                                setSelectedOverview(e.value.overview || "");
+                            onSelect={(e: { value: SearchItem }) => {
+                                const item = e.value;
+                                setType(item.mediaType === 'tv' ? 'tv' : 'movie');
+                                setTitle(item.label);
+                                setSelectedTitle(item.label);
+                                setSelectedItem(item);
+                                if (item.year) setYear(item.year);
+                                setSelectedOverview(item.overview || "");
                             }}
                             placeholder="Enter movie or TV title"
                             title="Enter movie or TV show title"

src/config.ts

@@ -63,7 +63,7 @@ export const RADIO_API_URL: string = "https://radio-api.codey.lol";
 export const socialLinks: Record<string, string> = {
 };
 
-export const MAJOR_VERSION: string = "0.5"
+export const MAJOR_VERSION: string = "0.6"
 export const RELEASE_FLAG: string | null = null;
 export const ENVIRONMENT: "Dev" | "Prod" = import.meta.env.DEV ? "Dev" : "Prod";
 

src/layouts/WhitelabelLayout.tsx

@@ -1,4 +1,5 @@
-import React, { ReactNode, CSSProperties } from 'react';
+import React from 'react';
+import type { ReactNode, CSSProperties } from 'react';
 
 interface WhitelabelLayoutProps {
     children: ReactNode;

src/middleware.js

@@ -0,0 +1,511 @@
+import { defineMiddleware } from 'astro:middleware';
+import { SUBSITES, PROTECTED_ROUTES, PUBLIC_ROUTES } from './config.js';
+import { getSubsiteByHost, getSubsiteFromSignal } from './utils/subsites.js';
+
+// Polyfill Headers.getSetCookie for environments where it's not present.
+// Astro's Node adapter expects headers.getSetCookie() to exist when
+// 'set-cookie' headers are present; in some Node runtimes Headers lacks it
+// which leads to TypeError: headers.getSetCookie is not a function.
+if (typeof globalThis.Headers !== 'undefined' && typeof globalThis.Headers.prototype.getSetCookie !== 'function') {
+  try {
+    Object.defineProperty(globalThis.Headers.prototype, 'getSetCookie', {
+      value: function () {
+        const cookies = [];
+        for (const [name, val] of this.entries()) {
+          if (name && name.toLowerCase() === 'set-cookie') cookies.push(val);
+        }
+        return cookies;
+      },
+      configurable: true,
+      writable: true,
+    });
+  } catch (err) {
+    // If we can't patch Headers, swallow silently — code will still try to
+    // access getSetCookie, but our other guards handle missing function calls.
+    console.warn('[middleware] Failed to polyfill Headers.getSetCookie', err);
+  }
+}
+
+const API_URL = "https://api.codey.lol";
+const AUTH_TIMEOUT_MS = 3000; // 3 second timeout for auth requests
+
+// Deduplication for concurrent refresh requests (prevents race condition where
+// multiple SSR requests try to refresh simultaneously, causing 401s after the
+// first one rotates the refresh token)
+let refreshPromise = null;
+let lastRefreshResult = null;
+let lastRefreshTime = 0;
+const REFRESH_RESULT_TTL = 5000; // Cache successful refresh result for 5 seconds
+
+// Auth check function (mirrors requireAuthHook logic but for middleware)
+async function checkAuth(request) {
+  try {
+    const cookieHeader = request.headers.get("cookie") ?? "";
+    
+    // Add timeout to prevent hanging
+    let controller = new AbortController;
+    let timeout = setTimeout(() => controller.abort(), AUTH_TIMEOUT_MS);
+    let res;
+    try {
+      res = await fetch(`${API_URL}/auth/id`, {
+        headers: { Cookie: cookieHeader },
+        credentials: "include",
+        signal: controller.signal,
+      });
+    } catch (err) {
+      clearTimeout(timeout);
+      console.error("[middleware] auth/id failed or timed out", err.name === 'AbortError' ? 'timeout' : err);
+      return { authenticated: false, user: null, cookies: null };
+    }
+    clearTimeout(timeout);
+
+    if (res.status === 401) {
+      // Check if we even have a refresh token before attempting refresh
+      if (!cookieHeader.includes('refresh_token=')) {
+        return { authenticated: false, user: null, cookies: null };
+      }
+
+      // Check if we have a recent successful refresh result we can reuse
+      const now = Date.now();
+      if (lastRefreshResult && (now - lastRefreshTime) < REFRESH_RESULT_TTL) {
+        console.log(`[middleware] Reusing cached refresh result from ${now - lastRefreshTime}ms ago`);
+        return lastRefreshResult;
+      }
+
+      // Deduplicate concurrent refresh requests
+      if (refreshPromise) {
+        console.log(`[middleware] Waiting for in-flight refresh request`);
+        return refreshPromise;
+      }
+
+      // Start a new refresh request
+      refreshPromise = (async () => {
+        console.log(`[middleware] Starting token refresh...`);
+        let controller = new AbortController();
+        let timeout = setTimeout(() => controller.abort(), AUTH_TIMEOUT_MS);
+        let refreshRes;
+        try {
+          refreshRes = await fetch(`${API_URL}/auth/refresh`, {
+            method: "POST",
+            headers: { Cookie: cookieHeader },
+            credentials: "include",
+            signal: controller.signal,
+          });
+        } catch (err) {
+          clearTimeout(timeout);
+          console.error("[middleware] auth/refresh failed or timed out", err.name === 'AbortError' ? 'timeout' : err);
+          return { authenticated: false, user: null, cookies: null };
+        }
+        clearTimeout(timeout);
+
+        if (!refreshRes.ok) {
+          // Log the response body for debugging
+          let errorDetail = '';
+          try {
+            const errorBody = await refreshRes.text();
+            errorDetail = ` - ${errorBody}`;
+          } catch {}
+          console.error(`[middleware] Token refresh failed ${refreshRes.status}${errorDetail}`);
+          return { authenticated: false, user: null, cookies: null };
+        }
+
+        console.log(`[middleware] Token refresh succeeded`);
+
+        // Get refreshed cookies
+        let setCookies = [];
+        if (typeof refreshRes.headers.getSetCookie === 'function') {
+          setCookies = refreshRes.headers.getSetCookie();
+        } else {
+          const setCookieHeader = refreshRes.headers.get("set-cookie");
+          if (setCookieHeader) {
+            setCookies = setCookieHeader.split(/,(?=\s*[a-zA-Z_][a-zA-Z0-9_]*=)/);
+          }
+        }
+
+        if (setCookies.length === 0) {
+          console.error("[middleware] No set-cookie headers in refresh response");
+          return { authenticated: false, user: null, cookies: null };
+        }
+
+        // Build new cookie header for retry
+        const newCookieHeader = setCookies.map(c => c.split(";")[0].trim()).join("; ");
+
+        // Retry auth/id with new cookies and timeout
+        controller = new AbortController();
+        timeout = setTimeout(() => controller.abort(), AUTH_TIMEOUT_MS);
+        let retryRes;
+        try {
+          retryRes = await fetch(`${API_URL}/auth/id`, {
+            headers: { Cookie: newCookieHeader },
+            credentials: "include",
+            signal: controller.signal,
+          });
+        } catch (err) {
+          clearTimeout(timeout);
+          console.error("[middleware] auth/id retry failed or timed out", err.name === 'AbortError' ? 'timeout' : err);
+          return { authenticated: false, user: null, cookies: null };
+        }
+        clearTimeout(timeout);
+
+        if (!retryRes.ok) {
+          console.error(`[middleware] auth/id retry failed with status ${retryRes.status}`);
+          return { authenticated: false, user: null, cookies: null };
+        }
+
+        const user = await retryRes.json();
+        return { authenticated: true, user, cookies: setCookies };
+      })();
+
+      // Clear the promise when done and cache the result
+      refreshPromise.then(result => {
+        if (result.authenticated) {
+          lastRefreshResult = result;
+          lastRefreshTime = Date.now();
+        }
+        refreshPromise = null;
+      }).catch(() => {
+        refreshPromise = null;
+      });
+
+      return refreshPromise;
+    }
+
+    if (!res.ok) {
+      return { authenticated: false, user: null, cookies: null };
+    }
+
+    const user = await res.json();
+    return { authenticated: true, user, cookies: null };
+  } catch (err) {
+    console.error("[middleware] Auth check error:", err);
+    return { authenticated: false, user: null, cookies: null };
+  }
+}
+
+// Check if a path matches any protected route and return the config
+function getProtectedRouteConfig(pathname) {
+  // Normalize pathname for comparison (lowercase)
+  const normalizedPath = pathname.toLowerCase();
+  
+  for (const route of PROTECTED_ROUTES) {
+    const routePath = typeof route === 'string' ? route : route.path;
+    const normalizedRoute = routePath.toLowerCase();
+    const matches = normalizedPath === normalizedRoute || normalizedPath.startsWith(normalizedRoute + '/');
+    if (matches) {
+      // Check if this path is excluded from protection
+      const excludes = (typeof route === 'object' && route.exclude) || [];
+      for (const excludePath of excludes) {
+        const normalizedExclude = excludePath.toLowerCase();
+        if (normalizedPath === normalizedExclude || normalizedPath.startsWith(normalizedExclude + '/')) {
+          if (import.meta.env.DEV) console.log(`[middleware] Path ${pathname} excluded from protection by ${excludePath}`);
+          return null; // Excluded, not protected
+        }
+      }
+      return typeof route === 'string' ? { path: route, roles: null } : route;
+    }
+  }
+  return null;
+}
+
+// Check if a path is explicitly public (but NOT if it matches a protected route)
+function isPublicRoute(pathname) {
+  // If the path matches a protected route, it's NOT public
+  if (getProtectedRouteConfig(pathname)) {
+    return false;
+  }
+  
+  for (const route of PUBLIC_ROUTES) {
+    // For routes ending with /, match any path starting with that prefix
+    if (route.endsWith('/') && route !== '/') {
+      if (pathname.startsWith(route)) {
+        if (import.meta.env.DEV) console.log(`[middleware] isPublicRoute: ${pathname} matched ${route} (prefix)`);
+        return true;
+      }
+    } else {
+      // For other routes, match exactly or as a path prefix (route + /)
+      if (pathname === route) {
+        if (import.meta.env.DEV) console.log(`[middleware] isPublicRoute: ${pathname} matched ${route} (exact)`);
+        return true;
+      }
+      // Special case: don't treat / as a prefix for all paths
+      if (route !== '/' && pathname.startsWith(route + '/')) {
+        if (import.meta.env.DEV) console.log(`[middleware] isPublicRoute: ${pathname} matched ${route}/ (subpath)`);
+        return true;
+      }
+    }
+  }
+  if (import.meta.env.DEV) console.log(`[middleware] isPublicRoute(${pathname}) = false`);
+  return false;
+}
+
+export const onRequest = defineMiddleware(async (context, next) => {
+  try {
+    const pathname = context.url.pathname;
+    
+    // Skip auth check for static assets
+    const skipAuthPrefixes = ['/_astro', '/_', '/assets', '/scripts', '/favicon', '/images', '/_static'];
+    const shouldSkipAuth = skipAuthPrefixes.some(p => pathname.startsWith(p));
+    
+    // Check if route is protected (requires auth)
+    const protectedConfig = getProtectedRouteConfig(pathname);
+    const isApiRoute = pathname.startsWith('/api/');
+    if (import.meta.env.DEV) console.log(`[middleware] Path: ${pathname}, Protected: ${!!protectedConfig}, SkipAuth: ${shouldSkipAuth}`);
+    
+    // Always attempt auth for non-static routes to populate user info
+    if (!shouldSkipAuth) {
+      const { authenticated, user, cookies } = await checkAuth(context.request);
+      if (import.meta.env.DEV) console.log(`[middleware] Auth result: authenticated=${authenticated}`);
+      
+      // Expose authenticated user and refreshed cookies to downstream handlers/layouts
+      if (authenticated && user) {
+        context.locals.user = user;
+        if (cookies && cookies.length > 0) {
+          context.locals.refreshedCookies = cookies;
+        }
+      }
+      
+      // For protected routes, enforce authentication
+      if (protectedConfig && !isPublicRoute(pathname)) {
+        if (!authenticated) {
+          if (isApiRoute) {
+            // Return JSON 401 for API routes
+            return new Response(JSON.stringify({ error: 'Unauthorized', message: 'Authentication required' }), {
+              status: 401,
+              headers: { 'Content-Type': 'application/json' },
+            });
+          }
+          // Redirect to login with return URL
+          const returnUrl = encodeURIComponent(pathname + context.url.search);
+          if (import.meta.env.DEV) console.log(`[middleware] Auth required for ${pathname}, redirecting to login`);
+          return context.redirect(`/login?returnUrl=${returnUrl}`, 302);
+        }
+        
+        // Check role-based access if roles are specified
+        if (protectedConfig.roles && protectedConfig.roles.length > 0) {
+          const userRoles = user?.roles || [];
+          const isAdmin = userRoles.includes('admin');
+          const hasRequiredRole = isAdmin || protectedConfig.roles.some(role => userRoles.includes(role));
+          if (!hasRequiredRole) {
+            if (import.meta.env.DEV) console.log(`[middleware] User lacks required role for ${pathname}`);
+            if (isApiRoute) {
+              // Return JSON 403 for API routes
+              return new Response(JSON.stringify({ 
+                error: 'Forbidden', 
+                message: 'Insufficient permissions',
+                requiredRoles: protectedConfig.roles 
+              }), {
+                status: 403,
+                headers: { 'Content-Type': 'application/json' },
+              });
+            }
+            // Store required roles in locals for the login page to access
+            context.locals.accessDenied = true;
+            context.locals.requiredRoles = protectedConfig.roles;
+            context.locals.returnUrl = pathname + context.url.search;
+            // Rewrite to login page - this renders /login but keeps the URL and locals
+            return context.rewrite('/login');
+          }
+        }
+        
+        if (import.meta.env.DEV) console.log(`[middleware] Auth OK for ${pathname}, user: ${user?.username || user?.id || 'unknown'}`);
+      }
+    }
+
+    // Check the Host header to differentiate subdomains
+    // Build a headers map safely because Headers.get(':authority') throws
+    const headersMap = {};
+    for (const [k, v] of context.request.headers) {
+      headersMap[k.toLowerCase()] = v;
+    }
+    const hostHeader = headersMap['host'] || '';
+    // Node/http2 might store host as :authority (pseudo header); it appears under iteration as ':authority'
+    const authorityHeader = headersMap[':authority'] || '';
+    // Fallback to context.url.hostname if available (some environments populate it)
+    const urlHost = context.url?.hostname || '';
+    const host = (hostHeader || authorityHeader || urlHost).split(':')[0]; // normalize remove port
+
+    const requestIp = (headersMap['x-forwarded-for']?.split(',')[0]?.trim())
+      || headersMap['x-real-ip']
+      || headersMap['cf-connecting-ip']
+      || headersMap['forwarded']?.split(';').find(kv => kv.trim().startsWith('for='))?.split('=')[1]?.replace(/"/g, '')
+      || context.request.headers.get('x-client-ip')
+      || 'unknown';
+
+    // Cloudflare geo data (available in production)
+    const cfCountry = headersMap['cf-ipcountry'] || null;
+    const userAgent = headersMap['user-agent'] || null;
+
+    // Debug info for incoming requests
+    if (import.meta.env.DEV) console.log(`[middleware] incoming: host=${hostHeader} ip=${requestIp} path=${context.url.pathname}`);
+
+
+    // When the host header is missing, log all headers for debugging and
+    // attempt to determine host from forwarded headers or a dev query header.
+    if (!host) {
+      if (import.meta.env.DEV) console.log('[middleware] WARNING: Host header missing. Dumping headers:');
+      for (const [k, v] of context.request.headers) {
+        if (import.meta.env.DEV) console.log(`[middleware]   header: ${k}=${v}`);
+      }
+    }
+
+    // Determine if how the request says it wants the whitelabel
+    const forwardedHost = headersMap['x-forwarded-host'] || '';
+    const xWhitelabel = headersMap['x-whitelabel'] || '';
+    const forceWhitelabelQuery = context.url.searchParams.get('whitelabel');
+
+    // Make whitelabel detection dynamic based on `SUBSITES` mapping and incoming signals
+    // We'll detect by full host (host/forwarded/authority) or by short-name match
+    const subsiteHosts = Object.keys(SUBSITES || {});
+
+    const hostSubsite = getSubsiteByHost(host);
+    const forwardedSubsite = getSubsiteByHost(forwardedHost);
+    const authoritySubsite = getSubsiteByHost(authorityHeader);
+    const headerSignalSubsite = getSubsiteFromSignal(xWhitelabel);
+    const querySignalSubsite = getSubsiteFromSignal(forceWhitelabelQuery);
+
+    const wantsSubsite = Boolean(hostSubsite || forwardedSubsite || authoritySubsite || headerSignalSubsite || querySignalSubsite);
+
+    // Use central SUBSITES mapping
+    // import from config.js near top to ensure single source of truth
+    // (we import lazily here for compatibility with middleware runtime)
+    const subsites = SUBSITES || {};
+
+    // Check if the request matches a subsite
+    const subsitePath = subsites[host];
+    if (subsitePath) {
+      const skipPrefixes = ['/_astro', '/_', '/assets', '/scripts', '/favicon', '/api', '/robots.txt', '/_static'];
+      const shouldSkip = skipPrefixes.some((p) => context.url.pathname.startsWith(p));
+
+      if (!shouldSkip && !context.url.pathname.startsWith(subsitePath)) {
+        const newPath = `${subsitePath}${context.url.pathname}`;
+        if (import.meta.env.DEV) console.log(`[middleware] Rewriting ${host} ${context.url.pathname} -> ${newPath}`);
+        return context.rewrite(newPath);
+      }
+    } else {
+      // If the path appears to be a subsite path (like /subsites/req) but the host isn't a subsite,
+      // block so the main site doesn't accidentally serve that content.
+      const allPaths = Object.values(subsites || {});
+      const pathLooksLikeSubsite = allPaths.some((p) => context.url.pathname.startsWith(p));
+      if (pathLooksLikeSubsite) {
+        if (import.meta.env.DEV) console.log(`[middleware] Blocking subsite path on main domain: ${host}${context.url.pathname}`);
+        return new Response('Not found', { status: 404 });
+      }
+    }
+
+    // Block /subsites/req/* on main domain (codey.lol, local.codey.lol, etc)
+    const isMainDomain = !wantsSubsite;
+    if (isMainDomain && Object.values(subsites || {}).some(p => context.url.pathname.startsWith(p))) {
+      // Immediately return a 404 for /req on the main domain
+      if (Object.values(subsites || {}).includes(context.url.pathname)) {
+        if (import.meta.env.DEV) console.log(`[middleware] Blocking subsite root on main domain: ${hostHeader}${context.url.pathname}`);
+        return new Response('Not found', { status: 404 });
+      }
+      if (import.meta.env.DEV) console.log(`[middleware] Blocking subsite wildcard path on main domain: ${hostHeader}${context.url.pathname}`);
+      return new Response('Not found', { status: 404 });
+    }
+
+    // Explicitly handle the forceWhitelabelQuery to rewrite the path
+    if (forceWhitelabelQuery) {
+      const forced = getSubsiteFromSignal(forceWhitelabelQuery);
+      const subsitePath = forced?.path || (`/${forceWhitelabelQuery}`.startsWith('/') ? `/${forceWhitelabelQuery}` : `/${forceWhitelabelQuery}`);
+      if (import.meta.env.DEV) console.log(`[middleware] Forcing whitelabel via query: ${forceWhitelabelQuery} -> rewrite to ${subsitePath}${context.url.pathname}`);
+      context.url.pathname = `${subsitePath}${context.url.pathname}`;
+    }
+
+    // Pass the whitelabel value explicitly to context.locals
+    // set a normalized whitelabel short name if available
+    const chosen = querySignalSubsite?.short || headerSignalSubsite?.short || hostSubsite?.short || forwardedSubsite?.short || authoritySubsite?.short || null;
+    context.locals.whitelabel = chosen;
+    context.locals.isSubsite = Boolean(wantsSubsite);
+    if (import.meta.env.DEV) console.log(`[middleware] Setting context.locals.whitelabel: ${context.locals.whitelabel}`);
+
+    // Final debug: show the final pathname we hand to Astro
+    if (import.meta.env.DEV) console.log(`[middleware] Final pathname: ${context.url.pathname}`);
+
+    // Let Astro handle the request first
+    const response = await next();
+
+    // Add security headers to response
+    const securityHeaders = new Headers(response.headers);
+    
+    // Prevent clickjacking
+    securityHeaders.set('X-Frame-Options', 'SAMEORIGIN');
+    
+    // Prevent MIME type sniffing
+    securityHeaders.set('X-Content-Type-Options', 'nosniff');
+    
+    // XSS protection (legacy, but still useful)
+    securityHeaders.set('X-XSS-Protection', '1; mode=block');
+    
+    // Referrer policy - send origin only on cross-origin requests
+    securityHeaders.set('Referrer-Policy', 'strict-origin-when-cross-origin');
+    
+    // HSTS - enforce HTTPS (only in production)
+    if (!import.meta.env.DEV) {
+      securityHeaders.set('Strict-Transport-Security', 'max-age=31536000; includeSubDomains');
+    }
+    
+    // Permissions policy - restrict sensitive APIs
+    securityHeaders.set('Permissions-Policy', 'geolocation=(), microphone=(), camera=()');
+    
+    // Content Security Policy - restrict resource loading
+    // Note: 'unsafe-inline' and 'unsafe-eval' needed for React/Astro hydration
+    // In production, consider using nonces or hashes for stricter CSP
+    const cspDirectives = [
+      "default-src 'self'",
+      "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://www.youtube.com https://www.youtube-nocookie.com https://s.ytimg.com https://challenges.cloudflare.com https://static.cloudflareinsights.com",
+      // Allow Cloudflare's inline event handlers (for Turnstile/challenges)
+      "script-src-attr 'unsafe-inline'",
+      "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com",
+      "font-src 'self' https://fonts.gstatic.com data:",
+      "img-src 'self' data: blob: https: http:",
+      "media-src 'self' blob: https:",
+      "connect-src 'self' https://api.codey.lol https://*.codey.lol https://*.audio.tidal.com wss:",
+      // Allow YouTube for video embeds and Cloudflare for challenges/Turnstile
+      "frame-src 'self' https://www.youtube.com https://www.youtube-nocookie.com https://challenges.cloudflare.com",
+      "object-src 'none'",
+      "base-uri 'self'",
+      "form-action 'self'",
+      "frame-ancestors 'self'",
+      "upgrade-insecure-requests",
+    ].join('; ');
+    securityHeaders.set('Content-Security-Policy', cspDirectives);
+
+    // Forward any refreshed auth cookies to the client
+    if (context.locals.refreshedCookies && context.locals.refreshedCookies.length > 0) {
+      const newResponse = new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: securityHeaders,
+      });
+      context.locals.refreshedCookies.forEach(cookie => {
+        newResponse.headers.append('set-cookie', cookie.trim());
+      });
+      
+      // If it's a 404, redirect to home
+      if (newResponse.status === 404 && !context.url.pathname.startsWith('/api/')) {
+        if (import.meta.env.DEV) console.log(`404 redirect: ${context.url.pathname} -> /`);
+        return context.redirect('/', 302);
+      }
+      
+      return newResponse;
+    }
+
+    // If it's a 404, redirect to home
+    if (response.status === 404 && !context.url.pathname.startsWith('/api/')) {
+      if (import.meta.env.DEV) console.log(`404 redirect: ${context.url.pathname} -> /`);
+      return context.redirect('/', 302);
+    }
+
+    // Return response with security headers
+    return new Response(response.body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: securityHeaders,
+    });
+  } catch (error) {
+    // Handle any middleware errors by redirecting to home
+    console.error('Middleware error:', error);
+    return context.redirect('/', 302);
+  }
+});

src/middleware.ts

@@ -2,6 +2,30 @@ import { defineMiddleware } from 'astro:middleware';
 import { SUBSITES, PROTECTED_ROUTES, PUBLIC_ROUTES, type ProtectedRoute } from './config.ts';
 import { getSubsiteByHost, getSubsiteFromSignal, type SubsiteInfo } from './utils/subsites.ts';
 
+declare module 'astro' {
+  interface Locals {
+    user?: AuthUser;
+    refreshedCookies?: string[];
+    accessDenied?: boolean;
+    requiredRoles?: string[];
+    returnUrl?: string;
+    whitelabel?: string | null;
+    isSubsite?: boolean;
+  }
+}
+
+declare module 'astro:middleware' {
+  interface Locals {
+    user?: AuthUser;
+    refreshedCookies?: string[];
+    accessDenied?: boolean;
+    requiredRoles?: string[];
+    returnUrl?: string;
+    whitelabel?: string | null;
+    isSubsite?: boolean;
+  }
+}
+
 export interface AuthUser {
   id?: string;
   username?: string;
@@ -313,9 +337,9 @@ export const onRequest = defineMiddleware(async (context, next) => {
               });
             }
             // Store required roles in locals for the login page to access
-            context.locals.accessDenied = true;
-            context.locals.requiredRoles = protectedConfig.roles;
-            context.locals.returnUrl = pathname + context.url.search;
+            (context.locals as any).accessDenied = true;
+            (context.locals as any).requiredRoles = protectedConfig.roles;
+            (context.locals as any).returnUrl = pathname + context.url.search;
             // Rewrite to login page - this renders /login but keeps the URL and locals
             return context.rewrite('/login');
           }
@@ -374,8 +398,8 @@ export const onRequest = defineMiddleware(async (context, next) => {
     const hostSubsite = getSubsiteByHost(host);
     const forwardedSubsite = getSubsiteByHost(forwardedHost);
     const authoritySubsite = getSubsiteByHost(authorityHeader);
-    const headerSignalSubsite = getSubsiteFromSignal(xWhitelabel);
-    const querySignalSubsite = getSubsiteFromSignal(forceWhitelabelQuery);
+    const headerSignalSubsite = getSubsiteFromSignal(xWhitelabel || undefined);
+    const querySignalSubsite = getSubsiteFromSignal(forceWhitelabelQuery || undefined);
 
     const wantsSubsite = Boolean(hostSubsite || forwardedSubsite || authoritySubsite || headerSignalSubsite || querySignalSubsite);
 
@@ -420,7 +444,7 @@ export const onRequest = defineMiddleware(async (context, next) => {
 
     // Explicitly handle the forceWhitelabelQuery to rewrite the path
     if (forceWhitelabelQuery) {
-      const forced = getSubsiteFromSignal(forceWhitelabelQuery);
+      const forced = getSubsiteFromSignal(forceWhitelabelQuery || undefined);
       const subsitePath = forced?.path || (`/${forceWhitelabelQuery}`.startsWith('/') ? `/${forceWhitelabelQuery}` : `/${forceWhitelabelQuery}`);
       if (import.meta.env.DEV) console.log(`[middleware] Forcing whitelabel via query: ${forceWhitelabelQuery} -> rewrite to ${subsitePath}${context.url.pathname}`);
       context.url.pathname = `${subsitePath}${context.url.pathname}`;
@@ -433,7 +457,6 @@ export const onRequest = defineMiddleware(async (context, next) => {
     // Also make it explicit whether this request maps to a subsite (any configured SUBSITES value)
     // Middleware already resolved `wantsSubsite` which is true if host/forwarded/authority/header/query indicate a subsite.
     // Expose a simple boolean so server-rendered pages/layouts or components can opt-out of loading/hydrating
-    // heavyweight subsystems (like the AudioPlayer) when the request is for a subsite.
     context.locals.isSubsite = Boolean(wantsSubsite);
     if (import.meta.env.DEV) console.log(`[middleware] Setting context.locals.whitelabel: ${context.locals.whitelabel}`);
 

src/pages/api/discord/cached-video.ts

@@ -120,6 +120,10 @@ export async function GET({ request }: APIContext): Promise<Response> {
       }
 
       // Partial content
+      if (result.start == null || result.end == null) {
+        console.error('[cached-video] Missing range bounds in partial response');
+        return new Response('Invalid range', { status: 500 });
+      }
       headers.set('Content-Range', `bytes ${result.start}-${result.end}/${result.total}`);
       headers.set('Content-Length', String(result.end - result.start + 1));
       return new Response(result.stream, { status: 206, headers });

src/pages/api/discord/channels.ts

@@ -27,9 +27,9 @@ interface ChannelRow {
 export async function GET({ request }: APIContext): Promise<Response> {
   // Rate limit check
   const rateCheck = checkRateLimit(request, {
-    limit: 20,
+    limit: 60,
     windowMs: 1000,
-    burstLimit: 100,
+    burstLimit: 240,
     burstWindowMs: 10_000,
   });
 

src/pages/api/discord/members.ts

@@ -22,7 +22,12 @@ const ADMINISTRATOR = 0x8n;   // 8
  * 3. Apply member-specific overwrites (allow/deny)
  * 4. Check if VIEW_CHANNEL permission is granted
  */
-async function getChannelVisibleMembers(channelId, guildId) {
+interface RoleOverwrite {
+  allow: bigint;
+  deny: bigint;
+}
+
+async function getChannelVisibleMembers(channelId: string, guildId: string): Promise<Set<string>> {
   // Get guild info including owner
   const guildInfo = await sql`
     SELECT owner_id FROM guilds WHERE guild_id = ${guildId}
@@ -43,8 +48,8 @@ async function getChannelVisibleMembers(channelId, guildId) {
   `;
 
   // Build overwrite lookups
-  const roleOverwrites = new Map();
-  const memberOverwrites = new Map();
+  const roleOverwrites = new Map<string, RoleOverwrite>();
+  const memberOverwrites = new Map<string, RoleOverwrite>();
   for (const ow of overwrites) {
     const targetId = ow.target_id.toString();
     const allow = BigInt(ow.allow_permissions);
@@ -67,16 +72,16 @@ async function getChannelVisibleMembers(channelId, guildId) {
   const allRoles = await sql`
     SELECT role_id, permissions FROM roles WHERE guild_id = ${guildId}
   `;
-  const rolePermissions = new Map();
+  const rolePermissions = new Map<string, bigint>();
   for (const role of allRoles) {
     rolePermissions.set(role.role_id.toString(), BigInt(role.permissions || 0));
   }
 
-  const visibleMemberIds = new Set();
+  const visibleMemberIds = new Set<string>();
 
   for (const member of members) {
     const userId = member.user_id.toString();
-    const memberRoles = (member.roles || []).map(r => r.toString());
+    const memberRoles = (member.roles || []).map((r: bigint | string) => r.toString());
 
     // Owner always has access
     if (ownerId && member.user_id.toString() === ownerId.toString()) {
@@ -138,9 +143,9 @@ async function getChannelVisibleMembers(channelId, guildId) {
 export async function GET({ request }) {
   // Rate limit check
   const rateCheck = checkRateLimit(request, {
-    limit: 20,
+    limit: 80,
     windowMs: 1000,
-    burstLimit: 100,
+    burstLimit: 320,
     burstWindowMs: 10_000,
   });
 
@@ -187,7 +192,7 @@ export async function GET({ request }) {
     }
 
     // If channelId provided, get visible members for that channel
-    let visibleMemberIds = null;
+    let visibleMemberIds: Set<string> | null = null;
     if (channelId) {
       visibleMemberIds = await getChannelVisibleMembers(channelId, guildId);
     }
@@ -226,14 +231,22 @@ export async function GET({ request }) {
     `;
 
     // Create role lookup map
-    const roleMap = {};
+    interface RoleInfo {
+      id: string;
+      name: string;
+      color: string | null;
+      position: number;
+      hoist: boolean;
+    }
+
+    const roleMap: Record<string, RoleInfo> = {};
     roles.forEach(role => {
       roleMap[role.role_id.toString()] = {
         id: role.role_id.toString(),
         name: role.name,
-        color: role.color ? `#${role.color.toString(16).padStart(6, '0')}` : null,
-        position: role.position,
-        hoist: role.hoist, // "hoist" means the role is displayed separately in member list
+        color: role.color ? `#${Number(role.color).toString(16).padStart(6, '0')}` : null,
+        position: Number(role.position ?? 0),
+        hoist: Boolean(role.hoist), // "hoist" means the role is displayed separately in member list
       };
     });
 
@@ -243,11 +256,24 @@ export async function GET({ request }) {
       : members;
 
     // Format members with their highest role for color
-    const formattedMembers = filteredMembers.map(member => {
-      const memberRoles = (member.roles || []).map(r => r.toString());
+    interface FormattedMember {
+      id: string;
+      username: string;
+      displayName: string;
+      avatar: string | null;
+      isBot: boolean;
+      color: string | null;
+      primaryRoleId: string | null;
+      primaryRoleName: string | null;
+      roles: string[];
+    }
+
+    const formattedMembers: FormattedMember[] = filteredMembers.map(member => {
+      const memberRoles = (member.roles || []).map((r: bigint | string) => r.toString());
       
       // Find highest positioned role with color for display
-      let displayRole = null;
+      let displayRole: RoleInfo | null = null;
+      let displayRoleColor: string | null = null;
       let highestPosition = -1;
       
       memberRoles.forEach(roleId => {
@@ -256,6 +282,7 @@ export async function GET({ request }) {
           highestPosition = role.position;
           if (role.color && role.color !== '#000000') {
             displayRole = role;
+            displayRoleColor = role.color;
           }
         }
       });
@@ -263,7 +290,7 @@ export async function GET({ request }) {
       // Find all hoisted roles for grouping
       const hoistedRoles = memberRoles
         .map(rid => roleMap[rid])
-        .filter(r => r && r.hoist)
+        .filter((r): r is RoleInfo => Boolean(r && r.hoist))
         .sort((a, b) => b.position - a.position);
 
       const primaryRole = hoistedRoles[0] || displayRole || null;
@@ -284,7 +311,7 @@ export async function GET({ request }) {
         displayName: member.nickname || member.global_name || member.username,
         avatar: avatarUrl,
         isBot: member.is_bot || false,
-        color: displayRole?.color || null,
+        color: displayRoleColor,
         primaryRoleId: primaryRole?.id || null,
         primaryRoleName: primaryRole?.name || null,
         roles: memberRoles,
@@ -292,8 +319,8 @@ export async function GET({ request }) {
     });
 
     // Group members by their primary (highest hoisted) role
-    const membersByRole = {};
-    const noRoleMembers = [];
+    const membersByRole: Record<string, { role: RoleInfo; members: FormattedMember[] }> = {};
+    const noRoleMembers: FormattedMember[] = [];
 
     formattedMembers.forEach(member => {
       if (member.primaryRoleId) {
@@ -316,7 +343,7 @@ export async function GET({ request }) {
     // Add "Online" or default group for members without hoisted roles
     if (noRoleMembers.length > 0) {
       sortedGroups.push({
-        role: { id: 'none', name: 'Members', color: null, position: -1 },
+        role: { id: 'none', name: 'Members', color: null, position: -1, hoist: false },
         members: noRoleMembers,
       });
     }

src/pages/api/discord/messages.ts

@@ -99,9 +99,9 @@ function getSafeImageUrl(originalUrl: string | null, baseUrl: string): string |
 export async function GET({ request }: APIContext) {
   // Rate limit check
   const rateCheck = checkRateLimit(request, {
-    limit: 30,
+    limit: 100,
     windowMs: 1000,
-    burstLimit: 150,
+    burstLimit: 400,
     burstWindowMs: 10_000,
   });
 
@@ -920,7 +920,7 @@ export async function GET({ request }: APIContext) {
       }
       const ext = stickerExtensions[sticker.format_type] || 'png';
       // Use cached sticker image if available, otherwise fall back to Discord CDN
-      let stickerUrl = null;
+      let stickerUrl: string | null = null;
       if (sticker.cached_image_id) {
         const sig = signImageId(sticker.cached_image_id);
         stickerUrl = `${baseUrl}/api/discord/cached-image?id=${sticker.cached_image_id}&sig=${sig}`;

src/pages/api/discord/search.ts

@@ -182,7 +182,20 @@ export async function GET({ request }) {
       LEFT JOIN video_cache vc ON a.cached_video_id = vc.video_id
       WHERE a.message_id = ANY(${messageIds})
       ORDER BY a.attachment_id
-    `;
+    ` as unknown as Array<{
+      message_id: string;
+      attachment_id: string;
+      filename: string | null;
+      url: string;
+      proxy_url: string | null;
+      content_type: string | null;
+      size: number | null;
+      width: number | null;
+      height: number | null;
+      cached_image_id: number | null;
+      cached_video_id: number | null;
+      video_file_path: string | null;
+    }>;
 
     // Fetch cached video URLs for video attachments
     const videoUrls = attachments
@@ -193,9 +206,9 @@ export async function GET({ request }) {
       SELECT source_url, video_id
       FROM video_cache
       WHERE source_url = ANY(${videoUrls})
-    ` : [];
+    ` as unknown as Array<{ source_url: string; video_id: number }> : [];
 
-    const videoCacheMap = {};
+    const videoCacheMap: Record<string, number> = {};
     cachedVideos.forEach(v => {
       videoCacheMap[v.source_url] = v.video_id;
     });
@@ -234,7 +247,13 @@ export async function GET({ request }) {
       .filter(m => m.reference_message_id)
       .map(m => m.reference_message_id);
 
-    let referencedMessages = [];
+    let referencedMessages: Array<{
+      message_id: string;
+      content: string;
+      author_id: string;
+      author_username: string;
+      author_display_name: string;
+    }> = [];
     if (referencedIds.length > 0) {
       referencedMessages = await sql`
         SELECT 

src/pages/api/image-proxy.ts

@@ -263,7 +263,8 @@ export async function GET({ request }) {
     return proxyResponse;
 
   } catch (err) {
-    console.error('[image-proxy] Error fetching image:', err.message);
+    const message = err instanceof Error ? err.message : String(err);
+    console.error('[image-proxy] Error fetching image:', message);
     return new Response('Failed to fetch image', { status: 500 });
   }
 }

src/pages/api/link-preview.ts

@@ -24,6 +24,7 @@ interface LinkPreviewMeta {
   type: string | null;
   video: string | null;
   themeColor: string | null;
+  trusted: boolean;
 }
 
 // Trusted domains that can be loaded client-side
@@ -73,6 +74,7 @@ function parseMetaTags(html: string, url: string): LinkPreviewMeta {
     type: null,
     video: null,
     themeColor: null,
+    trusted: false,
   };
 
   const decode = str => str?.replace(/&(#(?:x[0-9a-fA-F]+|\d+)|[a-zA-Z]+);/g,
@@ -253,6 +255,13 @@ export async function GET({ request }) {
     }
 
     // Read first 50KB
+    if (!response.body) {
+      return new Response(JSON.stringify({ error: 'Empty response body' }), {
+        status: 502,
+        headers: { 'Content-Type': 'application/json' },
+      });
+    }
+
     const reader = response.body.getReader();
     let html = '';
     let bytesRead = 0;
@@ -281,7 +290,8 @@ export async function GET({ request }) {
     return resp;
 
   } catch (err) {
-    console.error('[link-preview] Error fetching URL:', err.message);
+    const message = err instanceof Error ? err.message : String(err);
+    console.error('[link-preview] Error fetching URL:', message);
     // Don't expose internal error details to client
     return new Response(JSON.stringify({ error: 'Failed to fetch preview' }), {
       status: 500,

src/pages/api/search.ts

@@ -30,7 +30,7 @@ interface SearchSuggestion {
 
 export async function GET({ request }: APIContext): Promise<Response> {
     const host = request.headers.get('host');
-    const subsite = getSubsiteByHost(host);
+    const subsite = getSubsiteByHost(host || undefined);
 
     if (!subsite || subsite.short !== 'req') {
         return new Response('Not found', { status: 404 });

src/pages/lighting.astro

@@ -7,7 +7,7 @@ import Root from "@/components/AppLayout.jsx";
 const user = Astro.locals.user as any;
 ---
 
-<Base>
+<Base title="Lighting">
   <section class="page-section">
     <Root child="Lighting" user?={user} client:only="react" />
   </section>

src/pages/login.astro

@@ -9,7 +9,7 @@ const accessDenied = Astro.locals.accessDenied || false;
 const requiredRoles = Astro.locals.requiredRoles || [];
 
 ---
-<Base>
+<Base title="Login">
   <section class="page-section">
     <Root child="LoginPage" loggedIn={isLoggedIn} accessDenied={accessDenied} requiredRoles={requiredRoles} client:only="react" />
   </section>

src/pages/memes.astro

@@ -4,7 +4,7 @@ import Root from "../components/AppLayout.jsx";
 import "@styles/MemeGrid.css";
 ---
 
-<Base hideFooter>
+<Base hideFooter title="Memes">
   <section class="page-section">
     <Root child="Memes" client:only="react" />
   </section>

src/utils/apiAuth.ts

@@ -76,7 +76,7 @@ export async function requireApiAuth(request: Request): Promise<AuthResult> {
     }
     clearTimeout(timeout);
 
-    let newSetCookieHeader = null;
+    let newSetCookieHeader: string[] | null = null;
 
     // If unauthorized, try to refresh the token
     if (res.status === 401) {

src/utils/db.ts

@@ -5,7 +5,7 @@ import postgres from 'postgres';
 import type { Sql } from 'postgres';
 
 // Database connection configuration
-const sql: Sql = postgres({
+const sql: Sql<any> = postgres({
   host: import.meta.env.DISCORD_DB_HOST || 'localhost',
   port: parseInt(import.meta.env.DISCORD_DB_PORT || '5432', 10),
   database: import.meta.env.DISCORD_DB_NAME || 'discord',

src/utils/subsites.ts

@@ -1,4 +1,4 @@
-import { SUBSITES, WHITELABELS, WhitelabelConfig } from '../config.ts';
+import { SUBSITES, WHITELABELS, type WhitelabelConfig } from '../config.ts';
 
 export interface SubsiteInfo {
   host: string;