Merge branch 'main' into ai-integration

Author: jherr

convex/schema.ts

@@ -32,6 +32,7 @@ const schema = defineSchema({
       v.union(...validCapabilities.map((cap) => v.literal(cap)))
     ),
     adsDisabled: v.optional(v.boolean()),
+    interestedInHidingAds: v.optional(v.boolean()),
   }).searchIndex('search_email', {
     searchField: 'email',
   }),

convex/users.ts

@@ -51,10 +51,19 @@ export const listUsers = query({
       page: v.optional(v.number()),
     }),
     emailFilter: v.optional(v.string()),
+    nameFilter: v.optional(v.string()),
     capabilityFilter: v.optional(
-      v.union(v.literal('admin'), v.literal('disableAds'), v.literal('builder'))
+      v.array(
+        v.union(
+          v.literal('admin'),
+          v.literal('disableAds'),
+          v.literal('builder')
+        )
+      )
     ),
+    noCapabilitiesFilter: v.optional(v.boolean()),
     adsDisabledFilter: v.optional(v.boolean()),
+    interestedInHidingAdsFilter: v.optional(v.boolean()),
   },
   handler: async (ctx, args) => {
     // Validate admin capability
@@ -80,17 +89,40 @@ export const listUsers = query({
     candidates.sort((a: any, b: any) => b._creationTime - a._creationTime)
 
     const filtered = candidates.filter((user: any) => {
-      if (args.capabilityFilter) {
+      // Name filter (in-memory search on name and displayUsername)
+      if (args.nameFilter && args.nameFilter.length > 0) {
+        const name = (user.name || user.displayUsername || '').toLowerCase()
+        const searchTerm = args.nameFilter.toLowerCase()
+        if (!name.includes(searchTerm)) {
+          return false
+        }
+      }
+
+      // No capabilities filter
+      if (args.noCapabilitiesFilter === true) {
+        if (!Array.isArray(user.capabilities) || user.capabilities.length > 0) {
+          return false
+        }
+      }
+
+      if (args.capabilityFilter && args.capabilityFilter.length > 0) {
         if (
           !Array.isArray(user.capabilities) ||
-          !user.capabilities.includes(args.capabilityFilter)
+          !args.capabilityFilter.some((cap) => user.capabilities.includes(cap))
         ) {
           return false
         }
       }
       if (typeof args.adsDisabledFilter === 'boolean') {
         if (Boolean(user.adsDisabled) !== args.adsDisabledFilter) return false
       }
+      if (typeof args.interestedInHidingAdsFilter === 'boolean') {
+        if (
+          Boolean(user.interestedInHidingAds) !==
+          args.interestedInHidingAdsFilter
+        )
+          return false
+      }
       return true
     })
 
@@ -171,3 +203,23 @@ export const adminSetAdsDisabled = mutation({
     return { success: true }
   },
 })
+
+// Set interest in hiding ads (for opt-in waitlist)
+export const setInterestedInHidingAds = mutation({
+  args: {
+    interested: v.boolean(),
+  },
+  handler: async (ctx, args) => {
+    const user = await getCurrentUserConvex(ctx)
+    if (!user) {
+      throw new Error('Not authenticated')
+    }
+
+    // Update user's interestedInHidingAds flag
+    await ctx.db.patch(user.userId as Id<'users'>, {
+      interestedInHidingAds: args.interested,
+    })
+
+    return { success: true }
+  },
+})

media/brand.sketch

@@ -62,12 +62,11 @@
     "downshift": "^9.0.9",
     "eslint-config-react-app": "^7.0.1",
     "gray-matter": "^4.0.3",
+    "hast-util-is-element": "^3.0.0",
+    "hast-util-to-string": "^3.0.1",
     "html-react-parser": "^5.1.10",
     "import-meta-resolve": "^4.0.0",
     "lru-cache": "^7.13.1",
-    "marked": "^13.0.2",
-    "marked-alert": "^2.0.1",
-    "marked-gfm-heading-id": "^4.0.0",
     "mermaid": "^11.11.0",
     "qss": "^3.0.0",
     "react": "^19.2.0",
@@ -76,11 +75,22 @@
     "react-icons": "^5.3.0",
     "react-instantsearch": "7",
     "react-markdown": "^6.0.3",
+    "rehype-autolink-headings": "^7.1.0",
+    "rehype-callouts": "^2.1.2",
+    "rehype-parse": "^9.0.1",
+    "rehype-raw": "^7.0.0",
+    "rehype-slug": "^6.0.0",
+    "rehype-stringify": "^10.0.1",
+    "remark-gfm": "^4.0.1",
+    "remark-parse": "^11.0.0",
+    "remark-rehype": "^11.1.2",
     "remix-utils": "^8.5.0",
     "remove-markdown": "^0.5.0",
     "shiki": "^1.4.0",
     "tailwind-merge": "^1.14.0",
     "tiny-invariant": "^1.3.3",
+    "unified": "^11.0.5",
+    "unist-util-visit": "^5.0.0",
     "vite-bundle-analyzer": "^1.2.1",
     "vite-tsconfig-paths": "^5.0.1",
     "zod": "^4.0.17",