Release 202507061803

Release 202507031546
Release 202507031255
2025-07-06 18:03:45 +00:00 · 2025-07-03 15:46:21 +00:00 · 2025-07-03 12:55:03 +00:00 · 2025-07-03 11:29:46 +00:00 · 2025-07-03 11:17:39 +00:00 · 2025-07-03 11:07:41 +00:00
28 changed files with 637 additions and 254 deletions
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -7,7 +7,8 @@
    "golang.go",
    "bradlc.vscode-tailwindcss",
    "craigrbroughton.htmx-attributes",
-    "nefrob.vscode-just-syntax"
+    "nefrob.vscode-just-syntax",
+    "prisma.prisma"
  ],
  "unwantedRecommendations": []
 }
--- a/web/astro.config.mjs
+++ b/web/astro.config.mjs
@@ -14,6 +14,8 @@ import { postgresListener } from './src/lib/postgresListenerIntegration'
 import { getServerEnvVariable } from './src/lib/serverEnvVariables'

 const SITE_URL = getServerEnvVariable('SITE_URL')
+const ONION_ADDRESS = getServerEnvVariable('ONION_ADDRESS')
+const I2P_ADDRESS = getServerEnvVariable('I2P_ADDRESS')

 export default defineConfig({
  site: SITE_URL,
@@ -95,6 +97,18 @@ export default defineConfig({
  server: {
    open: false,
    allowedHosts: [new URL(SITE_URL).hostname],
+    headers: {
+      'Onion-Location': ONION_ADDRESS,
+      'X-I2P-Location': I2P_ADDRESS,
+      'X-Frame-Options': 'DENY',
+      // Astro is working on this feature, when it's stable use it instead of this.
+      // https://astro.build/blog/astro-590/#experimental-content-security-policy-support
+      'Content-Security-Policy':
+        SITE_URL === 'http://localhost:4321'
+          ? "frame-ancestors 'none'; upgrade-insecure-requests"
+          : "default-src 'self'; img-src 'self' *; frame-ancestors 'none'; upgrade-insecure-requests",
+      'Strict-Transport-Security': 'max-age=31536000; includeSubdomains; preload;',
+    },
  },
  image: {
    domains: [new URL(SITE_URL).hostname],
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -11,7 +11,7 @@
        "@astrojs/check": "0.9.4",
        "@astrojs/db": "0.15.0",
        "@astrojs/mdx": "4.3.0",
-        "@astrojs/node": "9.2.2",
+        "@astrojs/node": "9.3.0",
        "@astrojs/rss": "4.0.12",
        "@astrojs/sitemap": "3.4.1",
        "@fontsource-variable/space-grotesk": "5.2.8",
@@ -22,12 +22,13 @@
        "@types/mime-types": "3.0.1",
        "@types/pg": "8.15.4",
        "@vercel/og": "0.6.8",
-        "astro": "5.10.1",
+        "astro": "5.11.0",
        "astro-loading-indicator": "0.7.0",
        "astro-remote": "0.3.4",
        "astro-seo-schema": "5.0.0",
        "canvas": "3.1.2",
        "clsx": "2.1.1",
+        "he": "1.2.0",
        "htmx.org": "2.0.6",
        "javascript-time-ago": "2.5.11",
        "libphonenumber-js": "1.12.9",
@@ -50,8 +51,8 @@
        "web-push": "3.6.7"
      },
      "devDependencies": {
-        "@eslint/js": "9.30.0",
-        "@faker-js/faker": "9.8.0",
+        "@eslint/js": "9.30.1",
+        "@faker-js/faker": "9.9.0",
        "@iconify-json/material-symbols": "1.2.28",
        "@iconify-json/mdi": "1.2.3",
        "@iconify-json/ri": "1.2.5",
@@ -59,6 +60,7 @@
        "@tailwindcss/forms": "0.5.10",
        "@tailwindcss/typography": "0.5.16",
        "@types/eslint__js": "9.14.0",
+        "@types/he": "1.2.3",
        "@types/lodash-es": "4.17.12",
        "@types/qrcode": "1.5.5",
        "@types/react": "19.1.8",
@@ -70,12 +72,12 @@
        "astro-icon": "1.1.5",
        "date-fns": "4.1.0",
        "esbuild": "0.25.5",
-        "eslint": "9.30.0",
+        "eslint": "9.30.1",
        "eslint-import-resolver-typescript": "4.4.4",
        "eslint-plugin-astro": "1.3.1",
        "eslint-plugin-import": "2.32.0",
        "eslint-plugin-jsx-a11y": "6.10.2",
-        "globals": "16.2.0",
+        "globals": "16.3.0",
        "prettier": "3.6.2",
        "prettier-plugin-astro": "0.14.1",
        "prettier-plugin-tailwindcss": "0.6.13",
@@ -295,9 +297,9 @@
      }
    },
    "node_modules/@astrojs/node": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@astrojs/node/-/node-9.2.2.tgz",
-      "integrity": "sha512-PtLPuuojmcl9O3CEvXqL/D+wB4x5DlbrGOvP0MeTAh/VfKFprYAzgw1+45xsnTO+QvPWb26l1cT+ZQvvohmvMw==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@astrojs/node/-/node-9.3.0.tgz",
+      "integrity": "sha512-IV8NzGStHAsKBz1ljxxD8PBhBfnw/BEx/PZfsncTNXg9D4kQtZbSy+Ak0LvDs+rPmK0VeXLNn0HAdWuHCVg8cw==",
      "license": "MIT",
      "dependencies": {
        "@astrojs/internal-helpers": "0.6.1",
@@ -2639,9 +2641,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.30.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.0.tgz",
-      "integrity": "sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -2676,9 +2678,9 @@
      }
    },
    "node_modules/@faker-js/faker": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.8.0.tgz",
-      "integrity": "sha512-U9wpuSrJC93jZBxx/Qq2wPjCuYISBueyVUGK7qqdmj7r/nxaxwW8AQDCLeRO7wZnjj94sh3p246cAYjUKuqgfg==",
+      "version": "9.9.0",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.9.0.tgz",
+      "integrity": "sha512-OEl393iCOoo/z8bMezRlJu+GlRGlsKbUAN7jKB6LhnKoqKve5DXRpalbItIIcwnCjs1k/FOPjFzcA6Qn+H+YbA==",
      "dev": true,
      "funding": [
        {
@@ -4763,6 +4765,13 @@
        "@types/unist": "*"
      }
    },
+    "node_modules/@types/he": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@types/he/-/he-1.2.3.tgz",
+      "integrity": "sha512-q67/qwlxblDzEDvzHhVkwc1gzVWxaNxeyHUBF4xElrvjL11O+Ytze+1fGpBHlr/H9myiBUaUXNnNPmBHxxfAcA==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/@types/json-schema": {
      "version": "7.0.15",
      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -6324,9 +6333,9 @@
      }
    },
    "node_modules/astro": {
-      "version": "5.10.1",
-      "resolved": "https://registry.npmjs.org/astro/-/astro-5.10.1.tgz",
-      "integrity": "sha512-DJVmt+51jU1xmgmAHCDwuUgcG/5aVFSU+tcX694acAZqPVt8EMUAmUZcJDX36Z7/EztnPph9HR3pm72jS2EgHQ==",
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/astro/-/astro-5.11.0.tgz",
+      "integrity": "sha512-MEICntERthUxJPSSDsDiZuwiCMrsaYy3fnDhp4c6ScUfldCB8RBnB/myYdpTFXpwYBy6SgVsHQ1H4MuuA7ro/Q==",
      "license": "MIT",
      "dependencies": {
        "@astrojs/compiler": "^2.12.2",
@@ -9030,9 +9039,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.30.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.0.tgz",
-      "integrity": "sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
+      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -9042,7 +9051,7 @@
        "@eslint/config-helpers": "^0.3.0",
        "@eslint/core": "^0.14.0",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.30.0",
+        "@eslint/js": "9.30.1",
        "@eslint/plugin-kit": "^0.3.1",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
@@ -10392,9 +10401,9 @@
      }
    },
    "node_modules/globals": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
-      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -10820,6 +10829,15 @@
        "url": "https://opencollective.com/unified"
      }
    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "license": "MIT",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
    "node_modules/hex-rgb": {
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
--- a/web/package.json
+++ b/web/package.json
@@ -27,7 +27,7 @@
    "@astrojs/check": "0.9.4",
    "@astrojs/db": "0.15.0",
    "@astrojs/mdx": "4.3.0",
-    "@astrojs/node": "9.2.2",
+    "@astrojs/node": "9.3.0",
    "@astrojs/rss": "4.0.12",
    "@astrojs/sitemap": "3.4.1",
    "@fontsource-variable/space-grotesk": "5.2.8",
@@ -38,12 +38,13 @@
    "@types/mime-types": "3.0.1",
    "@types/pg": "8.15.4",
    "@vercel/og": "0.6.8",
-    "astro": "5.10.1",
+    "astro": "5.11.0",
    "astro-loading-indicator": "0.7.0",
    "astro-remote": "0.3.4",
    "astro-seo-schema": "5.0.0",
    "canvas": "3.1.2",
    "clsx": "2.1.1",
+    "he": "1.2.0",
    "htmx.org": "2.0.6",
    "javascript-time-ago": "2.5.11",
    "libphonenumber-js": "1.12.9",
@@ -66,8 +67,8 @@
    "web-push": "3.6.7"
  },
  "devDependencies": {
-    "@eslint/js": "9.30.0",
-    "@faker-js/faker": "9.8.0",
+    "@eslint/js": "9.30.1",
+    "@faker-js/faker": "9.9.0",
    "@iconify-json/material-symbols": "1.2.28",
    "@iconify-json/mdi": "1.2.3",
    "@iconify-json/ri": "1.2.5",
@@ -75,6 +76,7 @@
    "@tailwindcss/forms": "0.5.10",
    "@tailwindcss/typography": "0.5.16",
    "@types/eslint__js": "9.14.0",
+    "@types/he": "1.2.3",
    "@types/lodash-es": "4.17.12",
    "@types/qrcode": "1.5.5",
    "@types/react": "19.1.8",
@@ -86,12 +88,12 @@
    "astro-icon": "1.1.5",
    "date-fns": "4.1.0",
    "esbuild": "0.25.5",
-    "eslint": "9.30.0",
+    "eslint": "9.30.1",
    "eslint-import-resolver-typescript": "4.4.4",
    "eslint-plugin-astro": "1.3.1",
    "eslint-plugin-import": "2.32.0",
    "eslint-plugin-jsx-a11y": "6.10.2",
-    "globals": "16.2.0",
+    "globals": "16.3.0",
    "prettier": "3.6.2",
    "prettier-plugin-astro": "0.14.1",
    "prettier-plugin-tailwindcss": "0.6.13",
--- a/web/prisma/migrations/20250706140819_strict_commenting_enabled/migration.sql
+++ b/web/prisma/migrations/20250706140819_strict_commenting_enabled/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Service" ADD COLUMN     "strictCommentingEnabled" BOOLEAN NOT NULL DEFAULT false;
--- a/web/prisma/schema.prisma
+++ b/web/prisma/schema.prisma
@@ -406,6 +406,8 @@ model Service {
  Notification                    Notification[]
  affiliatedUsers                 ServiceUser[]             @relation("ServiceUsers")

+  strictCommentingEnabled Boolean @default(false)
+
  @@index([listedAt])
  @@index([approvedAt])
  @@index([verifiedAt])
--- a/web/prisma/seed.ts
+++ b/web/prisma/seed.ts
@@ -720,6 +720,7 @@ const generateFakeService = (users: User[]) => {
      }),
      { probability: 0.33 }
    ),
+    strictCommentingEnabled: faker.datatype.boolean(0.33333),
  } as const satisfies Prisma.ServiceCreateInput
 }

--- a/web/prisma/triggers/01_karma_tx.sql
+++ b/web/prisma/triggers/01_karma_tx.sql
@@ -283,7 +283,7 @@ BEGIN
    -- and ensure it wasn't already APPROVED.
    IF OLD.status IS DISTINCT FROM 'APPROVED' AND NEW.status = 'APPROVED' THEN
        -- Fetch service details for the description
-        SELECT name, visibility INTO service_name, service_visibility FROM "Service" WHERE id = NEW."serviceId";
+        SELECT name, "serviceVisibility" INTO service_name, service_visibility FROM "Service" WHERE id = NEW."serviceId";
        
        -- Only award karma if the service is public
        IF service_visibility = 'PUBLIC' THEN
--- a/web/src/actions/admin/service.ts
+++ b/web/src/actions/admin/service.ts
@@ -63,6 +63,7 @@ const serviceSchemaBase = z.object({
  overallScore: zodCohercedNumber(z.number().int().min(0).max(10)).optional(),
  serviceVisibility: z.nativeEnum(ServiceVisibility),
  internalNote: z.string().optional(),
+  strictCommentingEnabled: z.boolean().optional().default(false),
 })

 // Define schema for the create action input
@@ -127,6 +128,7 @@ export const adminServiceActions = {
          verificationSummary: input.verificationSummary,
          verificationProofMd: input.verificationProofMd,
          acceptedCurrencies: input.acceptedCurrencies,
+          strictCommentingEnabled: input.strictCommentingEnabled,
          // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
          referral: input.referral || null,
          serviceVisibility: input.serviceVisibility,
@@ -247,6 +249,7 @@ export const adminServiceActions = {
          verificationSummary: input.verificationSummary,
          verificationProofMd: input.verificationProofMd,
          acceptedCurrencies: input.acceptedCurrencies,
+          strictCommentingEnabled: input.strictCommentingEnabled,
          // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
          referral: input.referral || null,
          serviceVisibility: input.serviceVisibility,
--- a/web/src/components/AnnouncementBanner.astro
+++ b/web/src/components/AnnouncementBanner.astro
@@ -85,7 +85,7 @@ const Tag = announcement.link ? 'a' : 'div'
  </div>

  {
-    !!announcement.linkText && (
+    !!announcement.link && !!announcement.linkText && (
      <div class="text-day-300 group-focus-visible:outline-primary transition-background 2xs:px-4 relative inline-flex h-full shrink-0 cursor-pointer items-center justify-center gap-1.5 overflow-hidden rounded-full border border-white/20 bg-black/10 p-[1px] px-1 py-1 text-sm font-medium shadow-sm backdrop-blur-3xl transition-colors group-hover:bg-white/5 group-focus-visible:ring-2 group-focus-visible:ring-blue-500 group-focus-visible:ring-offset-2 group-focus-visible:ring-offset-black/80 sm:min-w-[120px]">
        <span class="2xs:inline-block hidden">{announcement.linkText}</span>
        <Icon
--- a/web/src/components/BaseHead.astro
+++ b/web/src/components/BaseHead.astro
@@ -1,6 +1,7 @@
 ---
 import LoadingIndicator from 'astro-loading-indicator/component'
 import { Schema } from 'astro-seo-schema'
+import { ONION_ADDRESS } from 'astro:env/server'
 import { ClientRouter } from 'astro:transitions'
 import { pwaAssetsHead } from 'virtual:pwa-assets/head'
 import { pwaInfo } from 'virtual:pwa-info'
@@ -78,30 +79,32 @@ const fullTitle = `${pageTitle} | KYCnot.me ${modeName}`
 const ogImageUrl = makeOgImageUrl(ogImage, Astro.url)
 ---

-<!-- Primary Meta Tags -->
+{/* Primary Meta Tags */}
 <meta name="generator" content={Astro.generator} />
 <meta name="description" content={description} />
 <title>{fullTitle}</title>
-<!-- {canonicalUrl && <link rel="canonical" href={canonicalUrl} />} -->
+{/* canonicalUrl && <link rel="canonical" href={canonicalUrl} /> */}
+<meta http-equiv="onion-location" content={ONION_ADDRESS} />

-<!-- Open Graph / Facebook -->
+{/* Open Graph / Facebook */}
 <meta property="og:type" content="website" />
 <meta property="og:url" content={Astro.url} />
 <meta property="og:title" content={fullTitle} />
 <meta property="og:description" content={description} />
 {!!ogImageUrl && <meta property="og:image" content={ogImageUrl} />}

-<!-- Twitter -->
+{/* Twitter */}
 <meta property="twitter:card" content="summary_large_image" />
 <meta property="twitter:url" content={Astro.url} />
 <meta property="twitter:title" content={fullTitle} />
 <meta property="twitter:description" content={description} />
 {!!ogImageUrl && <meta property="twitter:image" content={ogImageUrl} />}

-<!-- Other -->
+{/* Other */}
 <link rel="sitemap" href="/sitemap-index.xml" />
+<link rel="sitemap" href="/sitemaps/search.xml" />

-<!-- PWA -->
+{/* PWA */}
 {pwaAssetsHead.themeColor && <meta name="theme-color" content={pwaAssetsHead.themeColor.content} />}
 {pwaAssetsHead.links.filter((link) => link.rel !== 'icon').map((link) => <link {...link} />)}
 {pwaInfo && <Fragment set:html={pwaInfo.webManifest.linkTag} />}
@@ -115,10 +118,10 @@ const ogImageUrl = makeOgImageUrl(ogImage, Astro.url)
 <TailwindJsPluggin />
 {htmx && <HtmxScript />}

-<!-- JSON-LD Schemas -->
+{/* JSON-LD Schemas */}
 {schemas?.map((item) => <Schema item={item} />)}

-<!-- Breadcrumbs -->
+{/* Breadcrumbs */}
 {
  breadcrumbLists.map((breadcrumbList) => (
    <Schema
--- a/web/src/components/CommentItem.astro
+++ b/web/src/components/CommentItem.astro
@@ -33,6 +33,7 @@ type Props = HTMLAttributes<'div'> & {
  highlightedCommentId: number | null
  serviceSlug: string
  itemReviewedId: string
+  strictCommentingEnabled?: boolean
 }

 const {
@@ -42,6 +43,7 @@ const {
  highlightedCommentId = null,
  serviceSlug,
  itemReviewedId,
+  strictCommentingEnabled,
  class: className,
  ...htmlProps
 } = Astro.props
@@ -492,6 +494,7 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
          serviceId={comment.serviceId}
          parentId={comment.id}
          commentId={comment.id}
+          strictCommentingEnabled={strictCommentingEnabled}
          class="mt-2 hidden peer-checked/collapse:hidden peer-checked/reply:block"
        />
      </>
--- a/web/src/components/CommentReply.astro
+++ b/web/src/components/CommentReply.astro
@@ -20,6 +20,7 @@ type Props = Omit<HTMLAttributes<'form'>, 'action' | 'enctype' | 'method'> & {
  serviceId: number
  parentId?: number
  commentId?: number
+  strictCommentingEnabled?: boolean
  activeRatingComment?: Prisma.CommentGetPayload<{
    select: {
      id: true
@@ -28,7 +29,15 @@ type Props = Omit<HTMLAttributes<'form'>, 'action' | 'enctype' | 'method'> & {
  }> | null
 }

-const { serviceId, parentId, commentId, activeRatingComment, class: className, ...htmlProps } = Astro.props
+const {
+  serviceId,
+  parentId,
+  commentId,
+  activeRatingComment,
+  strictCommentingEnabled,
+  class: className,
+  ...htmlProps
+} = Astro.props

 const MIN_COMMENT_LENGTH = parentId ? 10 : 30

@@ -117,6 +126,7 @@ const userCommentsDisabled = user ? user.karmaUnlocks.commentsDisabled : false
                      maxlength: 100,
                      placeholder: 'Order ID / URL / Proof',
                      class: 'bg-night-800',
+                      required: strictCommentingEnabled,
                    }}
                    descriptionLabel="Only visible to admins, to verify your comment"
                    class="grow"
--- a/web/src/components/CommentSection.astro
+++ b/web/src/components/CommentSection.astro
@@ -35,6 +35,7 @@ type Props = {
      name: true
      description: true
      createdAt: true
+      strictCommentingEnabled: true
    }
  }>
 }
@@ -173,7 +174,12 @@ function makeReplySchema(comment: CommentWithRepliesPopulated): Comment {
      comment: comments.map(makeReplySchema),
    } as WithContext<DiscussionForumPosting>}
  />
-  <CommentReply serviceId={service.id} activeRatingComment={activeRatingComment} class="xs:mb-4 mb-2" />
+  <CommentReply
+    serviceId={service.id}
+    activeRatingComment={activeRatingComment}
+    strictCommentingEnabled={service.strictCommentingEnabled}
+    class="xs:mb-4 mb-2"
+  />

  <div class="mb-6 flex flex-wrap items-center justify-between gap-2">
    <div class="flex items-center">
@@ -258,6 +264,7 @@ function makeReplySchema(comment: CommentWithRepliesPopulated): Comment {
            showPending={params.showPending}
            serviceSlug={service.slug}
            itemReviewedId={itemReviewedId}
+            strictCommentingEnabled={service.strictCommentingEnabled}
          />
        ))
      ) : (
--- a/web/src/components/InputCheckbox.astro
+++ b/web/src/components/InputCheckbox.astro
@@ -7,6 +7,8 @@ import type { ComponentProps } from 'astro/types'

 type Props = Pick<ComponentProps<typeof InputWrapper>, 'error' | 'name' | 'required'> & {
  disabled?: boolean
+  checked?: boolean
+  descriptionInline?: string
  id?: string
 } & (
    | {
@@ -19,13 +21,11 @@ type Props = Pick<ComponentProps<typeof InputWrapper>, 'error' | 'name' | 'requi
      }
  )

-const { disabled, name, required, error, id, label } = Astro.props
+const { disabled, name, required, error, id, label, checked, descriptionInline } = Astro.props

 const hasError = !!error && error.length > 0
 ---

-{}
-
 <div>
  <label
    class={cn(
@@ -41,9 +41,11 @@ const hasError = !!error && error.length > 0
      name={name}
      required={required}
      disabled={disabled}
+      checked={checked}
      class={cn(disabled && 'opacity-50')}
    />
    <span class="text-sm leading-none text-pretty">{label ?? <slot />}</span>
+    {descriptionInline && <p class="text-day-400 text-xs">{descriptionInline}</p>}
  </label>

  {
--- a/web/src/components/ServiceFiltersPillsRow.astro
+++ b/web/src/components/ServiceFiltersPillsRow.astro
@@ -10,7 +10,8 @@ import { transformCase } from '../lib/strings'

 import ServiceFiltersPill from './ServiceFiltersPill.astro'

-import type { AttributeOption, ServicesFiltersObject, ServicesFiltersOptions } from '../pages/index.astro'
+import type { ServicesFiltersOptions } from '../lib/searchFiltersOptions'
+import type { AttributeOption, ServicesFiltersObject } from '../pages/index.astro'
 import type { Prisma } from '@prisma/client'
 import type { HTMLAttributes } from 'astro/types'

--- a/web/src/components/ServicesFilters.astro
+++ b/web/src/components/ServicesFilters.astro
@@ -1,15 +1,15 @@
 ---
 import { Icon } from 'astro-icon/components'

-import { kycLevels } from '../constants/kycLevels'
 import { cn } from '../lib/cn'
 import { makeOverallScoreInfo } from '../lib/overallScore'
-import { type ServicesFiltersObject, type ServicesFiltersOptions } from '../pages/index.astro'
+import { type ServicesFiltersObject } from '../pages/index.astro'

 import Button from './Button.astro'
 import PillsRadioGroup from './PillsRadioGroup.astro'
 import Tooltip from './Tooltip.astro'

+import type { ServicesFiltersOptions } from '../lib/searchFiltersOptions'
 import type { HTMLAttributes } from 'astro/types'

 export type Props = HTMLAttributes<'form'> & {
@@ -111,7 +111,7 @@ const {
    <legend class="font-title mb-3 leading-none text-green-500">Type</legend>
    <ul class="[&:not(:has(~_.peer:checked))]:[&>li:not([data-show-always])]:hidden">
      {
-        options.categories?.map((category) => (
+        options.categories.map((category) => (
          <li data-show-always={category.showAlways ? '' : undefined}>
            <label class="flex cursor-pointer items-center gap-2 text-sm text-white">
              <input
@@ -252,7 +252,7 @@ const {
    </div>
    <div class="text-day-400 mt-1 flex justify-between px-1 text-xs">
      {
-        kycLevels.map((level) => (
+        options.kycLevels.map((level) => (
          <span class="flex w-0 items-center justify-center text-center whitespace-nowrap">
            {level.value}
            <Icon name={level.icon} class="ms-1 size-3 shrink-0" />
@@ -334,7 +334,7 @@ const {
                <li data-show-always={attribute.showAlways ? '' : undefined} class="cursor-pointer">
                  <fieldset class="relative flex max-w-full min-w-0 cursor-pointer items-center text-sm text-white">
                    <legend class="sr-only">
-                      {attribute.title} ({attribute._count?.services})
+                      {attribute.title} ({attribute._count.services})
                    </legend>
                    <input
                      type="radio"
@@ -417,7 +417,7 @@ const {
                      <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
                        {attribute.title}
                      </span>
-                      <span class="text-day-500 ml-2 font-normal">{attribute._count?.services}</span>
+                      <span class="text-day-500 ml-2 font-normal">{attribute._count.services}</span>
                    </label>
                    <label
                      for={emptyId}
@@ -432,7 +432,7 @@ const {
                      <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
                        {attribute.title}
                      </span>
-                      <span class="text-day-500 ml-2 font-normal">{attribute._count?.services}</span>
+                      <span class="text-day-500 ml-2 font-normal">{attribute._count.services}</span>
                    </label>
                  </fieldset>
                </li>
--- a/web/src/components/ServicesSearchResults.astro
+++ b/web/src/components/ServicesSearchResults.astro
@@ -15,7 +15,8 @@ import Button from './Button.astro'
 import ServiceCard from './ServiceCard.astro'
 import ServiceFiltersPillsRow from './ServiceFiltersPillsRow.astro'

-import type { AttributeOption, ServicesFiltersObject, ServicesFiltersOptions } from '../pages/index.astro'
+import type { ServicesFiltersOptions } from '../lib/searchFiltersOptions'
+import type { AttributeOption, ServicesFiltersObject } from '../pages/index.astro'
 import type { Prisma } from '@prisma/client'
 import type { ComponentProps, HTMLAttributes } from 'astro/types'

@@ -82,6 +83,7 @@ const urlIfIncludingCommunity = urlWithParams(Astro.url, {
  ]),
 })

+// NOTE: If you make changes to this function, remember to update the sitemap: src/pages/sitemaps/search.xml.ts
 const searchTitle = (() => {
  if (filters.q) {
    return `Search results for “${filters.q}”`
--- a/web/src/constants/readStatus.ts
+++ b/web/src/constants/readStatus.ts
@@ -0,0 +1,33 @@
+import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
+import { transformCase } from '../lib/strings'
+
+type ReadStatusInfo<T extends string | null | undefined = string> = {
+  id: T
+  label: string
+  readValue: boolean
+}
+
+export const {
+  dataArray: readStatuses,
+  getFn: getReadStatus,
+  zodEnumById: readStatusZodEnum,
+} = makeHelpersForOptions(
+  'id',
+  (id): ReadStatusInfo<typeof id> => ({
+    id,
+    label: id ? transformCase(id, 'title') : String(id),
+    readValue: false,
+  }),
+  [
+    {
+      id: 'unread',
+      label: 'Unread',
+      readValue: false,
+    },
+    {
+      id: 'read',
+      label: 'Read',
+      readValue: true,
+    },
+  ] as const satisfies ReadStatusInfo[]
+)
--- a/web/src/lib/searchFiltersOptions.ts
+++ b/web/src/lib/searchFiltersOptions.ts
@@ -0,0 +1,187 @@
+import { orderBy, groupBy } from 'lodash-es'
+
+import { getAttributeCategoryInfo } from '../constants/attributeCategories'
+import { getAttributeTypeInfo } from '../constants/attributeTypes'
+import { currencies } from '../constants/currencies'
+import { kycLevels } from '../constants/kycLevels'
+import { networks } from '../constants/networks'
+import { verificationStatuses } from '../constants/verificationStatus'
+
+import type { Prisma } from '@prisma/client'
+
+const MIN_CATEGORIES_TO_SHOW = 8
+const MIN_ATTRIBUTES_TO_SHOW = 8
+
+export const sortOptions = [
+  {
+    value: 'score-desc',
+    label: 'Score (High → Low)',
+    orderBy: {
+      key: 'overallScore',
+      direction: 'desc',
+    },
+  },
+  {
+    value: 'score-asc',
+    label: 'Score (Low → High)',
+    orderBy: {
+      key: 'overallScore',
+      direction: 'asc',
+    },
+  },
+  {
+    value: 'name-asc',
+    label: 'Name (A → Z)',
+    orderBy: {
+      key: 'name',
+      direction: 'asc',
+    },
+  },
+  {
+    value: 'name-desc',
+    label: 'Name (Z → A)',
+    orderBy: {
+      key: 'name',
+      direction: 'desc',
+    },
+  },
+  {
+    value: 'recent',
+    label: 'Date listed (New → Old)',
+    orderBy: {
+      key: 'listedAt',
+      direction: 'desc',
+    },
+  },
+  {
+    value: 'oldest',
+    label: 'Date listed (Old → New)',
+    orderBy: {
+      key: 'listedAt',
+      direction: 'asc',
+    },
+  },
+] as const satisfies {
+  value: string
+  label: string
+  orderBy: {
+    key: keyof Prisma.ServiceSelect
+    direction: 'asc' | 'desc'
+  }
+}[]
+
+export const defaultSortOption = sortOptions[0]
+
+export const modeOptions = [
+  {
+    value: 'or',
+    label: 'OR',
+  },
+  {
+    value: 'and',
+    label: 'AND',
+  },
+] as const satisfies {
+  value: string
+  label: string
+}[]
+
+export function makeSearchFiltersOptions({
+  filters,
+  categories,
+  attributes,
+}: {
+  filters: {
+    categories: string[]
+    attr: Record<number, '' | 'no' | 'yes'> | undefined
+  } | null
+  categories: Prisma.CategoryGetPayload<{
+    select: {
+      name: true
+      namePluralLong: true
+      slug: true
+      icon: true
+      _count: {
+        select: {
+          services: {
+            where: {
+              serviceVisibility: { in: ['PUBLIC', 'ARCHIVED'] }
+            }
+          }
+        }
+      }
+    }
+  }>[]
+  attributes: Prisma.AttributeGetPayload<{
+    select: {
+      id: true
+      slug: true
+      title: true
+      category: true
+      type: true
+      _count: {
+        select: {
+          services: true
+        }
+      }
+    }
+  }>[]
+}) {
+  const attributesByCategory = orderBy(
+    Object.entries(
+      groupBy(
+        attributes.map((attr) => {
+          return {
+            typeInfo: getAttributeTypeInfo(attr.type),
+            ...attr,
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            value: filters?.attr?.[attr.id] || undefined,
+          }
+        }),
+        'category'
+      )
+    ).map(([category, attributes]) => ({
+      category,
+      categoryInfo: getAttributeCategoryInfo(category),
+      attributes: orderBy(
+        attributes,
+        ['value', 'type', '_count.services', 'title'],
+        ['asc', 'asc', 'desc', 'asc']
+      ).map((attr, i) => ({
+        ...attr,
+        showAlways: i < MIN_ATTRIBUTES_TO_SHOW || attr.value !== undefined,
+      })),
+    })),
+    ['category'],
+    ['asc']
+  )
+
+  const categoriesSorted = orderBy(
+    categories.map((category) => {
+      const checked = filters?.categories.includes(category.slug) ?? false
+
+      return {
+        ...category,
+        checked,
+      }
+    }),
+    ['checked', '_count.services', 'name'],
+    ['desc', 'desc', 'asc']
+  ).map((category, i) => ({
+    ...category,
+    showAlways: i < MIN_CATEGORIES_TO_SHOW || category.checked,
+  }))
+
+  return {
+    currencies,
+    categories: categoriesSorted,
+    sort: sortOptions,
+    modeOptions,
+    network: networks,
+    verification: verificationStatuses,
+    attributesByCategory,
+    kycLevels,
+  } as const
+}
+
+export type ServicesFiltersOptions = ReturnType<typeof makeSearchFiltersOptions>
--- a/web/src/pages/admin/comments.astro
+++ b/web/src/pages/admin/comments.astro
@@ -5,6 +5,7 @@ import { Icon } from 'astro-icon/components'
 import BadgeSmall from '../../components/BadgeSmall.astro'
 import CommentModeration from '../../components/CommentModeration.astro'
 import MyPicture from '../../components/MyPicture.astro'
+import Pagination from '../../components/Pagination.astro'
 import TimeFormatted from '../../components/TimeFormatted.astro'
 import UserBadge from '../../components/UserBadge.astro'
 import {
@@ -27,7 +28,7 @@ if (!user || (!user.admin && !user.moderator)) {
 const { data: params } = zodParseQueryParamsStoringErrors(
  {
    status: commentStatusFiltersZodEnum.default('all'),
-    page: z.number().int().positive().default(1),
+    page: z.coerce.number().int().positive().default(1),
  },
  Astro
 )
@@ -241,29 +242,5 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
  </div>

  <!-- Pagination -->
-  {
-    totalPages > 1 && (
-      <div class="mt-8 flex justify-center gap-2">
-        {params.page > 1 && (
-          <a
-            href={urlWithParams(Astro.url, { page: params.page - 1 })}
-            class="font-title rounded-md border border-zinc-700 px-3 py-1 text-sm transition-colors hover:border-green-500/50"
-          >
-            Previous
-          </a>
-        )}
-        <span class="font-title px-3 py-1 text-sm">
-          Page {params.page} of {totalPages}
-        </span>
-        {params.page < totalPages && (
-          <a
-            href={urlWithParams(Astro.url, { page: params.page + 1 })}
-            class="font-title rounded-md border border-zinc-700 px-3 py-1 text-sm transition-colors hover:border-green-500/50"
-          >
-            Next
-          </a>
-        )}
-      </div>
-    )
-  }
+  {totalPages > 1 && <Pagination currentPage={params.page} totalPages={totalPages} class="mt-8" />}
 </BaseLayout>
--- a/web/src/pages/admin/services/[slug]/edit.astro
+++ b/web/src/pages/admin/services/[slug]/edit.astro
@@ -10,6 +10,7 @@ import Button from '../../../../components/Button.astro'
 import FormSection from '../../../../components/FormSection.astro'
 import FormSubSection from '../../../../components/FormSubSection.astro'
 import InputCardGroup from '../../../../components/InputCardGroup.astro'
+import InputCheckbox from '../../../../components/InputCheckbox.astro'
 import InputCheckboxGroup from '../../../../components/InputCheckboxGroup.astro'
 import InputImageFile from '../../../../components/InputImageFile.astro'
 import InputSelect from '../../../../components/InputSelect.astro'
@@ -545,6 +546,13 @@ const apiCalls = await Astro.locals.banners.try(
          cardSize="sm"
        />

+        <InputCheckbox
+          label="Strict Commenting"
+          name="strictCommentingEnabled"
+          checked={service.strictCommentingEnabled}
+          descriptionInline="Require proof of being a client for comments."
+        />
+
        <InputSubmitButton label="Update" icon="ri:save-line" hideCancel />
      </form>
    </FormSection>
--- a/web/src/pages/admin/services/new.astro
+++ b/web/src/pages/admin/services/new.astro
@@ -3,6 +3,7 @@ import { AttributeCategory, Currency, VerificationStatus } from '@prisma/client'
 import { Icon } from 'astro-icon/components'
 import { actions, isInputError } from 'astro:actions'

+import InputCheckbox from '../../../components/InputCheckbox.astro'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
 import { cn } from '../../../lib/cn'
 import { prisma } from '../../../lib/prisma'
@@ -368,6 +369,13 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
        }
      </div>

+      <InputCheckbox
+        label="Strict Commenting"
+        name="strictCommentingEnabled"
+        checked={false}
+        descriptionInline="Require proof of being a client for comments."
+      />
+
      <button
        type="submit"
        class="font-title inline-flex justify-center rounded-md border border-green-500/30 bg-green-500/10 px-4 py-2 text-sm text-green-400 shadow-xs transition-colors duration-200 hover:bg-green-500/20 focus:ring-2 focus:ring-green-500 focus:ring-offset-2 focus:ring-offset-black focus:outline-hidden"
--- a/web/src/pages/index.astro
+++ b/web/src/pages/index.astro
@@ -9,9 +9,7 @@ import Pagination from '../components/Pagination.astro'
 import ServiceFiltersPillsRow from '../components/ServiceFiltersPillsRow.astro'
 import ServicesFilters from '../components/ServicesFilters.astro'
 import ServicesSearchResults from '../components/ServicesSearchResults.astro'
-import { getAttributeCategoryInfo } from '../constants/attributeCategories'
-import { getAttributeTypeInfo } from '../constants/attributeTypes'
-import { currencies, currenciesZodEnumBySlug, currencySlugToId } from '../constants/currencies'
+import { currenciesZodEnumBySlug, currencySlugToId } from '../constants/currencies'
 import { networks } from '../constants/networks'
 import {
  verificationStatuses,
@@ -25,89 +23,18 @@ import { parseIntWithFallback } from '../lib/numbers'
 import { areEqualObjectsWithoutOrder } from '../lib/objects'
 import { zodParseQueryParamsStoringErrors } from '../lib/parseUrlFilters'
 import { prisma } from '../lib/prisma'
+import {
+  defaultSortOption,
+  makeSearchFiltersOptions,
+  modeOptions,
+  sortOptions,
+} from '../lib/searchFiltersOptions'
 import { makeSortSeed } from '../lib/sortSeed'

 import type { Prisma } from '@prisma/client'

-const MIN_CATEGORIES_TO_SHOW = 8
-const MIN_ATTRIBUTES_TO_SHOW = 8
-
 const PAGE_SIZE = 30

-const sortOptions = [
-  {
-    value: 'score-desc',
-    label: 'Score (High → Low)',
-    orderBy: {
-      key: 'overallScore',
-      direction: 'desc',
-    },
-  },
-  {
-    value: 'score-asc',
-    label: 'Score (Low → High)',
-    orderBy: {
-      key: 'overallScore',
-      direction: 'asc',
-    },
-  },
-  {
-    value: 'name-asc',
-    label: 'Name (A → Z)',
-    orderBy: {
-      key: 'name',
-      direction: 'asc',
-    },
-  },
-  {
-    value: 'name-desc',
-    label: 'Name (Z → A)',
-    orderBy: {
-      key: 'name',
-      direction: 'desc',
-    },
-  },
-  {
-    value: 'recent',
-    label: 'Date listed (New → Old)',
-    orderBy: {
-      key: 'listedAt',
-      direction: 'desc',
-    },
-  },
-  {
-    value: 'oldest',
-    label: 'Date listed (Old → New)',
-    orderBy: {
-      key: 'listedAt',
-      direction: 'asc',
-    },
-  },
-] as const satisfies {
-  value: string
-  label: string
-  orderBy: {
-    key: keyof Prisma.ServiceSelect
-    direction: 'asc' | 'desc'
-  }
-}[]
-
-const defaultSortOption = sortOptions[0]
-
-const modeOptions = [
-  {
-    value: 'or',
-    label: 'OR',
-  },
-  {
-    value: 'and',
-    label: 'AND',
-  },
-] as const satisfies {
-  value: string
-  label: string
-}[]
-
 export type AttributeOption = {
  value: string
  prefix: string
@@ -478,62 +405,11 @@ const [categories, [services, totalServices], countCommunityOnly, attributes] =
    ],
  ])

-const attributesByCategory = orderBy(
-  Object.entries(
-    groupBy(
-      attributes.map((attr) => {
-        return {
-          typeInfo: getAttributeTypeInfo(attr.type),
-          ...attr,
-          // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-          value: filters.attr?.[attr.id] || undefined,
-        }
-      }),
-      'category'
-    )
-  ).map(([category, attributes]) => ({
-    category,
-    categoryInfo: getAttributeCategoryInfo(category),
-    attributes: orderBy(
-      attributes,
-      ['value', 'type', '_count.services', 'title'],
-      ['asc', 'asc', 'desc', 'asc']
-    ).map((attr, i) => ({
-      ...attr,
-      showAlways: i < MIN_ATTRIBUTES_TO_SHOW || attr.value !== undefined,
-    })),
-  })),
-  ['category'],
-  ['asc']
-)
-
-const categoriesSorted = orderBy(
-  categories.map((category) => {
-    const checked = filters.categories.includes(category.slug)
-
-    return {
-      ...category,
-      checked,
-    }
-  }),
-  ['checked', '_count.services', 'name'],
-  ['desc', 'desc', 'asc']
-).map((category, i) => ({
-  ...category,
-  showAlways: i < MIN_CATEGORIES_TO_SHOW || category.checked,
-}))
-
-const filtersOptions = {
-  currencies,
-  categories: categoriesSorted,
-  sort: sortOptions,
-  modeOptions,
-  network: networks,
-  verification: verificationStatuses,
-  attributesByCategory,
-} as const
-
-export type ServicesFiltersOptions = typeof filtersOptions
+const filtersOptions = makeSearchFiltersOptions({
+  filters,
+  categories,
+  attributes,
+})

 const searchResultsId = 'search-results'
 const showFiltersId = 'show-filters'
--- a/web/src/pages/notifications.astro
+++ b/web/src/pages/notifications.astro
@@ -5,10 +5,12 @@ import { actions } from 'astro:actions'

 import Button from '../components/Button.astro'
 import CopyButton from '../components/CopyButton.astro'
+import Pagination from '../components/Pagination.astro'
 import PushNotificationBanner from '../components/PushNotificationBanner.astro'
 import TimeFormatted from '../components/TimeFormatted.astro'
 import Tooltip from '../components/Tooltip.astro'
 import { getNotificationTypeInfo } from '../constants/notificationTypes'
+import { getReadStatus, readStatusZodEnum } from '../constants/readStatus'
 import BaseLayout from '../layouts/BaseLayout.astro'
 import { cn } from '../lib/cn'
 import { getOrCreateNotificationPreferences } from '../lib/notificationPreferences'
@@ -16,6 +18,10 @@ import { makeNotificationActions, makeNotificationContent, makeNotificationTitle
 import { zodParseQueryParamsStoringErrors } from '../lib/parseUrlFilters'
 import { prisma } from '../lib/prisma'
 import { makeLoginUrl } from '../lib/redirectUrls'
+import { transformCase } from '../lib/strings'
+import { urlWithParams } from '../lib/urls'
+
+import type { Prisma } from '@prisma/client'

 const user = Astro.locals.user
 if (!user) return Astro.redirect(makeLoginUrl(Astro.url))
@@ -25,20 +31,26 @@ const PAGE_SIZE = 20
 const { data: params } = zodParseQueryParamsStoringErrors(
  {
    page: z.coerce.number().int().min(1).default(1),
+    readStatus: readStatusZodEnum.optional(),
  },
  Astro
 )
 const skip = (params.page - 1) * PAGE_SIZE

+const readStatusInfo = params.readStatus ? getReadStatus(params.readStatus) : undefined
+
+const notificationWhereClause: Prisma.NotificationWhereInput = {
+  userId: user.id,
+  read: readStatusInfo?.readValue,
+}
+
 const [dbNotifications, notificationPreferences, totalNotifications, pushSubscriptions] =
  await Astro.locals.banners.tryMany([
    [
      'Error while fetching notifications',
      () =>
        prisma.notification.findMany({
-          where: {
-            userId: user.id,
-          },
+          where: notificationWhereClause,
          orderBy: {
            createdAt: 'desc',
          },
@@ -153,7 +165,7 @@ const [dbNotifications, notificationPreferences, totalNotifications, pushSubscri
    ],
    [
      'Error while fetching total notifications',
-      () => prisma.notification.count({ where: { userId: user.id } }),
+      () => prisma.notification.count({ where: notificationWhereClause }),
      0,
    ],
    [
@@ -227,13 +239,18 @@ const notifications = dbNotifications.map((notification) => ({
      )
    }

-    <div class="mb-4 flex items-center justify-between">
+    <div class="xs:flex-row xs:flex-wrap mb-4 flex flex-col items-center justify-between gap-2">
      <h1 class="font-title flex items-center text-2xl leading-tight font-bold tracking-wider">
        <Icon name="ri:notification-line" class="mr-2 size-6 text-zinc-400" />
-        Notifications
+
+        {transformCase(`${readStatusInfo?.label ?? ''} notifications`.trim(), 'sentence')}
      </h1>

-      <form method="POST" action={actions.notification.updateReadStatus}>
+      <form
+        method="POST"
+        action={actions.notification.updateReadStatus}
+        class="xs:justify-start flex flex-1 flex-row-reverse flex-wrap items-center justify-center gap-2"
+      >
        <input type="hidden" name="notificationId" value="all" />
        <input type="hidden" name="read" value="true" />
        <Button
@@ -243,6 +260,25 @@ const notifications = dbNotifications.map((notification) => ({
          disabled={notifications.length === 0}
          color="white"
        />
+        {
+          params.readStatus === 'unread' ? (
+            <Button
+              as="a"
+              href={urlWithParams(Astro.url, { readStatus: null }, { clearExisting: true })}
+              label="See all"
+              icon="ri:eye-line"
+              color="black"
+            />
+          ) : (
+            <Button
+              as="a"
+              href={urlWithParams(Astro.url, { readStatus: 'unread' }, { clearExisting: true })}
+              label="See unread only"
+              icon="ri:eye-off-line"
+              color="black"
+            />
+          )
+        }
      </form>
    </div>

@@ -323,31 +359,12 @@ const notifications = dbNotifications.map((notification) => ({
          ))}

          {totalPages > 1 && (
-            <div class="mt-8 flex justify-center gap-4">
-              <form method="GET" action="/notifications" class="inline">
-                <input type="hidden" name="page" value={params.page - 1} />
-                <button
-                  type="submit"
-                  class="rounded-md border border-zinc-700 bg-zinc-800 px-4 py-2 text-sm text-zinc-200 transition-colors duration-200 hover:bg-zinc-700"
-                  disabled={params.page <= 1}
-                >
-                  Previous
-                </button>
-              </form>
-              <span class="inline-flex items-center px-2 text-sm text-zinc-400">
-                Page {params.page} of {totalPages}
-              </span>
-              <form method="GET" action="/notifications" class="inline">
-                <input type="hidden" name="page" value={params.page + 1} />
-                <button
-                  type="submit"
-                  class="rounded-md border border-zinc-700 bg-zinc-800 px-4 py-2 text-sm text-zinc-200 transition-colors duration-200 hover:bg-zinc-700"
-                  disabled={params.page >= totalPages}
-                >
-                  Next
-                </button>
-              </form>
-            </div>
+            <Pagination
+              currentPage={params.page}
+              totalPages={totalPages}
+              currentUrl={Astro.url}
+              class="mt-8"
+            />
          )}
        </div>
      )
--- a/web/src/pages/service/[slug].astro
+++ b/web/src/pages/service/[slug].astro
@@ -102,6 +102,7 @@ const [service, dbNotificationPreferences] = await Astro.locals.banners.tryMany(
          userSentimentAt: true,
          averageUserRating: true,
          isRecentlyApproved: true,
+          strictCommentingEnabled: true,
          contactMethods: {
            select: {
              value: true,
@@ -1533,6 +1534,20 @@ const activeEventToShow =
        <li>Moderation is light.</li>
        <li>Double-check before trusting.</li>
      </ul>
+
+      {
+        service.strictCommentingEnabled && (
+          <p class="mt-2">
+            <Icon
+              name="ri:verified-badge-fill"
+              class="me-0.5 inline-block size-4 align-[-0.3em] text-orange-100/95"
+            />
+            <span class="font-medium text-orange-100/95">Proof of being a client required</span>, for this
+            service.
+          </p>
+        )
+      }
+
      <div class="absolute inset-y-2 right-2 flex flex-col justify-center">
        <Icon name="ri:alert-line" class="xs:opacity-20 h-full max-h-16 w-auto opacity-10" />
      </div>
--- a/web/src/pages/sitemaps/search.xml.ts
+++ b/web/src/pages/sitemaps/search.xml.ts
@@ -0,0 +1,190 @@
+/* eslint-disable import/no-named-as-default-member */
+import he from 'he'
+
+import { prisma } from '../../lib/prisma'
+import { makeSearchFiltersOptions } from '../../lib/searchFiltersOptions'
+
+import type { APIRoute } from 'astro'
+
+export const GET: APIRoute = async ({ site }) => {
+  if (!site) return new Response('Site URL not configured', { status: 500 })
+
+  try {
+    const searchUrls = await generateSEOSitemapUrls(site.href)
+
+    const result = `
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  ${searchUrls.map((url) => `<url><loc>${he.encode(url)}</loc></url>`).join('\n')}
+</urlset>
+  `.trim()
+
+    return new Response(result, {
+      headers: {
+        'Content-Type': 'application/xml',
+      },
+    })
+  } catch (error) {
+    console.error('Failed to generate SEO sitemap URLs:', error)
+    return new Response('Failed to generate SEO sitemap URLs', { status: 500 })
+  }
+}
+
+async function generateSEOSitemapUrls(siteUrl: string) {
+  const [categories, attributes] = await Promise.all([
+    prisma.category.findMany({
+      select: {
+        name: true,
+        namePluralLong: true,
+        slug: true,
+        icon: true,
+        _count: {
+          select: {
+            services: {
+              where: {
+                serviceVisibility: { in: ['PUBLIC', 'ARCHIVED'] },
+              },
+            },
+          },
+        },
+      },
+    }),
+    prisma.attribute.findMany({
+      select: {
+        id: true,
+        slug: true,
+        title: true,
+        category: true,
+        type: true,
+        _count: {
+          select: {
+            services: {
+              where: {
+                service: {
+                  serviceVisibility: { in: ['PUBLIC', 'ARCHIVED'] },
+                },
+              },
+            },
+          },
+        },
+      },
+      orderBy: [{ category: 'asc' }, { type: 'asc' }, { title: 'asc' }],
+    }),
+  ])
+
+  const filtersOptions = makeSearchFiltersOptions({
+    filters: null,
+    categories,
+    attributes,
+  })
+
+  const byCategory = filtersOptions.categories.map(
+    (category) =>
+      new URLSearchParams({
+        categories: category.slug,
+      })
+  )
+
+  const byVerificationStatus = filtersOptions.verification.map(
+    (status) =>
+      new URLSearchParams({
+        verification: status.slug,
+      })
+  )
+
+  const byKycLevel = filtersOptions.kycLevels.map(
+    (level) =>
+      new URLSearchParams({
+        'max-kyc': level.id,
+      })
+  )
+
+  const byCurrency = filtersOptions.currencies.map(
+    (currency) =>
+      new URLSearchParams({
+        currencies: currency.slug,
+      })
+  )
+
+  const withOneAttribute = filtersOptions.attributesByCategory
+    .flatMap(({ attributes }) => attributes)
+    .map(
+      (attribute) =>
+        new URLSearchParams({
+          [`attr-${attribute.id.toString()}`]: 'yes',
+        })
+    )
+  const withoutOneAttribute = filtersOptions.attributesByCategory
+    .flatMap(({ attributes }) => attributes)
+    .map(
+      (attribute) =>
+        new URLSearchParams({
+          [`attr-${attribute.id.toString()}`]: 'no',
+        })
+    )
+
+  const byCategoryAndCurrency = filtersOptions.categories.flatMap((category) =>
+    filtersOptions.currencies.map(
+      (currency) =>
+        new URLSearchParams({
+          categories: category.slug,
+          currencies: currency.slug,
+        })
+    )
+  )
+
+  const byCategoryAndAttributes = filtersOptions.categories.flatMap((category) =>
+    filtersOptions.attributesByCategory
+      .flatMap(({ attributes }) => attributes)
+      .flatMap((attribute) => [
+        new URLSearchParams({
+          categories: category.slug,
+          [`attr-${attribute.id.toString()}`]: 'yes',
+        }),
+        new URLSearchParams({
+          categories: category.slug,
+          [`attr-${attribute.id.toString()}`]: 'no',
+        }),
+      ])
+  )
+
+  const relevantCurrencies = [
+    'xmr',
+    'btc',
+  ] as const satisfies (typeof filtersOptions.currencies)[number]['slug'][]
+
+  const byCategoryAndAttributesAndRelevantCurrency = filtersOptions.categories.flatMap((category) =>
+    filtersOptions.attributesByCategory
+      .flatMap(({ attributes }) => attributes)
+      .flatMap((attribute) =>
+        relevantCurrencies.map(
+          (currency) =>
+            new URLSearchParams({
+              categories: category.slug,
+              currencies: currency,
+              [`attr-${attribute.id.toString()}`]:
+                attribute.type === 'GOOD' || attribute.type === 'INFO' ? 'yes' : 'no',
+            })
+        )
+      )
+  )
+
+  const allQueryParams = [
+    ...byCategory,
+    ...byVerificationStatus,
+    ...byKycLevel,
+    ...byCurrency,
+    ...withOneAttribute,
+    ...withoutOneAttribute,
+
+    ...byCategoryAndCurrency,
+    ...byCategoryAndAttributes,
+    ...byCategoryAndAttributesAndRelevantCurrency,
+  ] satisfies URLSearchParams[]
+
+  return allQueryParams.map((queryParams) => {
+    const url = new URL(siteUrl)
+    url.search = queryParams.toString()
+    return url.href
+  })
+}
--- a/web/src/robots.txt.ts
+++ b/web/src/robots.txt.ts
@@ -1,14 +1,15 @@
 import type { APIRoute } from 'astro'

-const getRobotsTxt = (sitemapURL: URL) => `
+const getRobotsTxt = (sitemaps: `/${string}`[], siteUrl: URL) => `
 User-agent: *
 Allow: /
 Disallow: /admin/

-Sitemap: ${sitemapURL.href}
+${sitemaps.map((sitemap) => `Sitemap: ${new URL(sitemap, siteUrl).href}`).join('\n')}
 `

 export const GET: APIRoute = ({ site }) => {
-  const sitemapURL = new URL('sitemap-index.xml', site)
-  return new Response(getRobotsTxt(sitemapURL))
+  if (!site) return new Response('Site URL not configured', { status: 500 })
+
+  return new Response(getRobotsTxt(['/sitemap-index.xml', '/sitemaps/search.xml'], site))
 }
Author	SHA1	Message	Date
pluja	7a294cb0a1	Release 202507061803	2025-07-06 18:03:45 +00:00
pluja	349c26a4df	Release 202507031546	2025-07-03 15:46:21 +00:00
pluja	86b1afb2c7	Release 202507031255	2025-07-03 12:55:03 +00:00
pluja	99bc1f4e0f	Release 202507031129	2025-07-03 11:29:46 +00:00
pluja	3166349dfb	Release 202507031117	2025-07-03 11:17:39 +00:00
pluja	5a54352d95	Release 202507031107	2025-07-03 11:07:41 +00:00