Fix public team and popular articles

Author: Llewellyn500

app/team/page.tsx

@@ -59,7 +59,9 @@ type AuthorType = {
 
 async function getAuthors() {
   try {
-    const authors = await getAllAuthors();
+    const authors = (await getAllAuthors()).filter(
+      (author) => author.role !== "moderator" && author.showOnTeam,
+    );
     return authors.map((author) => ({
       uid: author.uid,
       name: author.name,

components/PopularArticles.tsx

@@ -6,7 +6,6 @@ import {
   onSnapshot,
   query,
   where,
-  orderBy,
   Timestamp,
 } from "firebase/firestore";
 import { db } from "@/lib/firebase";
@@ -36,34 +35,40 @@ export default function PopularArticles({
     useState<Article[]>(initialArticles);
 
   useEffect(() => {
-    // Query Firestore for articles that have popularity == true AND publish == true
-    // Then order by date descending (assuming 'date' is a valid field in the documents)
+    // Keep the live query on one indexed field, then filter and rank locally.
+    // This avoids requiring a composite index for the public sidebar.
     const articlesQuery = query(
       collection(db, "articles"),
-      where("popularity", "==", true),
       where("publish", "==", true),
-      orderBy("popularityRank", "asc"),
     );
 
     const unsubscribe = onSnapshot(
       articlesQuery,
       (snapshot) => {
-        const articles: Article[] = snapshot.docs.map((doc) => {
-          const data = doc.data();
-          return {
-            id: doc.id,
-            title: data.title || "",
-            slug: data.slug || "",
-            authorName: data.authorName || "Unknown Team Member",
-            popularity: data.popularity || false,
-            publish: data.publish || false,
-            date:
-              data.date instanceof Timestamp
-                ? data.date
-                : (data.date ?? new Date().toISOString()),
-            popularityRank: data.popularityRank,
-          } as Article;
-        });
+        const articles: Article[] = snapshot.docs
+          .map((doc) => {
+            const data = doc.data();
+            return {
+              id: doc.id,
+              title: data.title || "",
+              slug: data.slug || "",
+              authorName: data.authorName || "Unknown Team Member",
+              popularity: data.popularity || false,
+              publish: data.publish || false,
+              date:
+                data.date instanceof Timestamp
+                  ? data.date
+                  : (data.date ?? new Date().toISOString()),
+              popularityRank: data.popularityRank,
+            } as Article;
+          })
+          .filter((article) => article.popularity)
+          .sort(
+            (left, right) =>
+              (left.popularityRank ?? Number.MAX_SAFE_INTEGER) -
+                (right.popularityRank ?? Number.MAX_SAFE_INTEGER) ||
+              left.title.localeCompare(right.title),
+          );
 
         setPopularArticles(articles);
       },

lib/content.ts

@@ -97,6 +97,8 @@ export type AuthorRecord = {
     body: string;
   };
   socials: SocialMap;
+  role: string;
+  showOnTeam: boolean;
   updatedAt?: Date;
 };
 
@@ -395,6 +397,8 @@ function normalizeAuthorDoc(doc: ContentDocument): AuthorRecord {
     slug: pickString(data, ["slug"]) || "",
     biography: extractBiography(data.biography, name),
     socials: normalizeSocials(data.socials),
+    role: (pickString(data, ["role"]) || "").toLowerCase(),
+    showOnTeam: data.showOnTeam !== false,
     updatedAt: pickDate(data, AUTHOR_UPDATED_FIELDS),
   };
 }