Merge pull request #1085 from hackclub/unlisted-shop-items

Don't show unlisted items on the shop
hackclub · Jan 9, 2025 · 3e4ba6b · 3e4ba6b
2 parents 52f7e3d + e8fb9a2
commit 3e4ba6b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/app/harbor/shop/shop-utils.ts b/src/app/harbor/shop/shop-utils.ts
@@ -40,13 +40,17 @@ export async function getShop(): Promise<ShopItem[]> {
     return
   }
   const person = await getSelfPerson(session.slackId)
+  const filter = person.fields.academy_completed
+    ? '{enabled_main_game}'
+    : '{enabled_high_seas}'
 
   return new Promise((resolve, reject) => {
     base()('shop_items')
       .select({
-        filterByFormula: person.fields.academy_completed
-          ? '{enabled_main_game}'
-          : '{enabled_high_seas}',
+        filterByFormula: `AND(
+          unlisted = FALSE(),
+          ${filter} = TRUE()
+        )`,
         sort: [{ field: 'tickets_us', direction: 'asc' }],
       })
       .eachPage(