Release 2025-05-23-R3WZ

Release 2025-05-22-SwZ1
Release 2025-05-22-XDxe
2025-05-23 11:52:16 +00:00 · 2025-05-22 23:07:55 +00:00 · 2025-05-22 22:58:18 +00:00 · 2025-05-22 22:38:41 +00:00 · 2025-05-22 19:43:20 +00:00 · 2025-05-22 19:19:07 +00:00
42 changed files with 1337 additions and 1099 deletions
--- a/.platform/hooks/predeploy/01_dump_database.sh
+++ b/.platform/hooks/predeploy/01_dump_database.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+pwd
+just dump-db
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -70,7 +70,7 @@ services:
    expose:
      - 4321
    healthcheck:
-      test: ["CMD", "curl", "-k", "--silent", "--fail", "http://localhost:4321"]
+      test: ["CMD", "curl", "-k", "--silent", "--fail", "http://localhost:4321/health"]
      interval: 10s
      timeout: 5s
      retries: 5
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -19,9 +19,8 @@ ENV HOST=0.0.0.0
 ENV PORT=4321
 EXPOSE 4321

-# Add entrypoint script and make it executable
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+# Add knm-migrate command script and make it executable
+COPY migrate.sh /usr/local/bin/knm-migrate
+RUN chmod +x /usr/local/bin/knm-migrate

-ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["node", "./dist/server/entry.mjs"]
--- a/web/docker-entrypoint.sh
+++ b/web/docker-entrypoint.sh
@@ -16,6 +16,4 @@ for trigger_file in prisma/triggers/*.sql; do
  fi
 done

-# Start the application
-echo "Starting the application..."
-exec "$@"
+echo "Migrations completed."
--- a/web/prisma/migrations/20250523111356_remove_icon_id_from_contact_methods/migration.sql
+++ b/web/prisma/migrations/20250523111356_remove_icon_id_from_contact_methods/migration.sql
@@ -0,0 +1,13 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `iconId` on the `ServiceContactMethod` table. All the data in the column will be lost.
+  - You are about to drop the column `info` on the `ServiceContactMethod` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "ServiceContactMethod" DROP COLUMN "iconId",
+DROP COLUMN "info",
+ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER COLUMN "label" DROP NOT NULL;
--- a/web/prisma/schema.prisma
+++ b/web/prisma/schema.prisma
@@ -397,12 +397,15 @@ model Service {
 }

 model ServiceContactMethod {
-  id        Int     @id @default(autoincrement())
-  label     String
+  id    Int     @id @default(autoincrement())
+  /// Only include it if you want to override the formatted value.
+  label String?
  /// Including the protocol (e.g. "mailto:", "tel:", "https://")
-  value     String
-  iconId    String
-  info      String
+  value String
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @default(now()) @updatedAt
+
  services  Service @relation("ServiceToContactMethod", fields: [serviceId], references: [id], onDelete: Cascade)
  serviceId Int
 }
--- a/web/scripts/faker.ts
+++ b/web/scripts/faker.ts
@@ -845,40 +845,29 @@ const generateFakeComment = (userId: number, serviceId: number, parentId?: numbe
 const generateFakeServiceContactMethod = (serviceId: number) => {
  const types = [
    {
-      label: 'Email',
      value: `mailto:${faker.internet.email()}`,
-      iconId: 'ri:mail-line',
-      info: faker.lorem.sentence(),
    },
    {
-      label: 'Phone',
      value: `tel:${faker.phone.number({ style: 'international' })}`,
-      iconId: 'ri:phone-line',
-      info: faker.lorem.sentence(),
    },
    {
-      label: 'WhatsApp',
      value: `https://wa.me/${faker.phone.number({ style: 'international' })}`,
-      iconId: 'ri:whatsapp-line',
-      info: faker.lorem.sentence(),
    },
    {
-      label: 'Telegram',
      value: `https://t.me/${faker.internet.username()}`,
-      iconId: 'ri:telegram-line',
-      info: faker.lorem.sentence(),
    },
    {
-      label: 'Website',
+      value: `https://x.com/${faker.internet.username()}`,
+    },
+    {
+      value: faker.internet.url(),
+    },
+    {
+      label: faker.lorem.word({ length: 2 }),
      value: faker.internet.url(),
-      iconId: 'ri:global-line',
-      info: faker.lorem.sentence(),
    },
    {
-      label: 'LinkedIn',
      value: `https://www.linkedin.com/company/${faker.helpers.slugify(faker.company.name())}`,
-      iconId: 'ri:linkedin-box-line',
-      info: faker.lorem.sentence(),
    },
  ] as const satisfies Partial<Prisma.ServiceContactMethodCreateInput>[]

--- a/web/src/actions/admin/service.ts
+++ b/web/src/actions/admin/service.ts
@@ -14,7 +14,7 @@ import {
 } from '../../lib/zodUtils'

 const serviceSchemaBase = z.object({
-  id: z.number(),
+  id: z.number().int().positive(),
  slug: z
    .string()
    .regex(/^[a-z0-9-]+$/, 'Allowed characters: lowercase letters, numbers, and hyphens')
@@ -56,15 +56,6 @@ const addSlugIfMissing = <
    }),
 })

-const contactMethodSchema = z.object({
-  id: z.number().optional(),
-  label: z.string().min(1).max(50),
-  value: z.string().min(1).max(200),
-  iconId: z.string().min(1).max(50),
-  info: z.string().max(200).optional().default(''),
-  serviceId: z.number(),
-})
-
 export const adminServiceActions = {
  create: defineProtectedAction({
    accept: 'form',
@@ -195,7 +186,11 @@ export const adminServiceActions = {
  createContactMethod: defineProtectedAction({
    accept: 'form',
    permissions: 'admin',
-    input: contactMethodSchema.omit({ id: true }),
+    input: z.object({
+      label: z.string().min(1).max(50).optional(),
+      value: z.string().url(),
+      serviceId: z.number().int().positive(),
+    }),
    handler: async (input) => {
      const contactMethod = await prisma.serviceContactMethod.create({
        data: input,
@@ -207,7 +202,12 @@ export const adminServiceActions = {
  updateContactMethod: defineProtectedAction({
    accept: 'form',
    permissions: 'admin',
-    input: contactMethodSchema,
+    input: z.object({
+      id: z.number().int().positive().optional(),
+      label: z.string().min(1).max(50).optional(),
+      value: z.string().url(),
+      serviceId: z.number().int().positive(),
+    }),
    handler: async (input) => {
      const { id, ...data } = input
      const contactMethod = await prisma.serviceContactMethod.update({
@@ -222,7 +222,7 @@ export const adminServiceActions = {
    accept: 'form',
    permissions: 'admin',
    input: z.object({
-      id: z.number(),
+      id: z.number().int().positive(),
    }),
    handler: async (input) => {
      await prisma.serviceContactMethod.delete({
--- a/web/src/actions/comment.ts
+++ b/web/src/actions/comment.ts
@@ -14,9 +14,9 @@ import { timeTrapSecretKey } from '../lib/timeTrapSecret'

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

-const COMMENT_RATE_LIMIT_WINDOW_MINUTES = 5
+const COMMENT_RATE_LIMIT_WINDOW_MINUTES = 2
 const MAX_COMMENTS_PER_WINDOW = 1
-const MAX_COMMENTS_PER_WINDOW_VERIFIED_USER = 5
+const MAX_COMMENTS_PER_WINDOW_VERIFIED_USER = 10

 export const commentActions = {
  vote: defineProtectedAction({
--- a/web/src/components/Button.astro
+++ b/web/src/components/Button.astro
@@ -19,6 +19,7 @@ type Props<Tag extends 'a' | 'button' | 'label' = 'button'> = Polymorphic<
      dataAstroReload?: boolean
      children?: never
      disabled?: boolean
+      inlineIcon?: boolean
    }
 >

@@ -26,7 +27,7 @@ export type ButtonProps<Tag extends 'a' | 'button' | 'label' = 'button'> = Props

 const button = tv({
  slots: {
-    base: 'inline-flex items-center justify-center gap-2 rounded-lg border transition-colors duration-100 focus-visible:ring-2 focus-visible:ring-current focus-visible:ring-offset-2 focus-visible:ring-offset-black focus-visible:outline-hidden',
+    base: 'inline-flex shrink-0 items-center justify-center gap-2 rounded-lg border transition-colors duration-100 focus-visible:ring-2 focus-visible:ring-current focus-visible:ring-offset-2 focus-visible:ring-offset-black focus-visible:outline-hidden',
    icon: 'size-4 shrink-0',
    label: 'text-left whitespace-nowrap',
    endIcon: 'size-4 shrink-0',
@@ -51,6 +52,11 @@ const button = tv({
        label: 'font-bold tracking-wider uppercase',
      },
    },
+    iconOnly: {
+      true: {
+        base: 'p-0',
+      },
+    },
    color: {
      black: {
        base: 'border-night-500 bg-night-800 hover:bg-night-900 hover:text-day-200 focus-visible:bg-night-500 text-white/50 focus-visible:text-white focus-visible:ring-white',
@@ -121,12 +127,28 @@ const button = tv({
      shadow: true,
      class: 'shadow-blue-500/30',
    },
+    {
+      iconOnly: true,
+      size: 'sm',
+      class: 'w-8',
+    },
+    {
+      iconOnly: true,
+      size: 'md',
+      class: 'w-9',
+    },
+    {
+      iconOnly: true,
+      size: 'lg',
+      class: 'w-10',
+    },
  ],
  defaultVariants: {
    size: 'md',
    color: 'black',
    shadow: false,
    disabled: false,
+    iconOnly: false,
  },
 })

@@ -143,6 +165,7 @@ const {
  role,
  dataAstroReload,
  disabled,
+  inlineIcon,
  ...htmlProps
 } = Astro.props

@@ -151,7 +174,7 @@ const {
  icon: iconSlot,
  label: labelSlot,
  endIcon: endIconSlot,
-} = button({ size, color, shadow, disabled })
+} = button({ size, color, shadow, disabled, iconOnly: !label && !(!!icon && !!endIcon) })

 const ActualTag = disabled && Tag === 'a' ? 'span' : Tag
 ---
@@ -164,11 +187,11 @@ const ActualTag = disabled && Tag === 'a' ? 'span' : Tag
  {...dataAstroReload && { 'data-astro-reload': dataAstroReload }}
  {...htmlProps}
 >
-  {!!icon && <Icon name={icon} class={iconSlot({ class: classNames?.icon })} />}
+  {!!icon && <Icon name={icon} class={iconSlot({ class: classNames?.icon })} is:inline={inlineIcon} />}
  {!!label && <span class={labelSlot({ class: classNames?.label })}>{label}</span>}
  {
    !!endIcon && (
-      <Icon name={endIcon} class={endIconSlot({ class: classNames?.endIcon })}>
+      <Icon name={endIcon} class={endIconSlot({ class: classNames?.endIcon })} is:inline={inlineIcon}>
        {endIcon}
      </Icon>
    )
--- a/web/src/components/ChatMessages.astro
+++ b/web/src/components/ChatMessages.astro
@@ -2,7 +2,7 @@
 import { cn } from '../lib/cn'
 import { formatDateShort } from '../lib/timeAgo'

-import MyPicture from './MyPicture.astro'
+import UserBadge from './UserBadge.astro'

 import type { Prisma } from '@prisma/client'
 import type { HTMLAttributes } from 'astro/types'
@@ -15,6 +15,7 @@ export type ChatMessage = {
    select: {
      id: true
      name: true
+      displayName: true
      picture: true
    }
  }>
@@ -71,18 +72,7 @@ const { messages, userId, class: className, ...htmlProps } = Astro.props
              )}
            >
              {!isCurrentUser && !isNextFromSameUser && (
-                <p class="text-day-500 mb-0.5 text-xs">
-                  {!!message.user.picture && (
-                    <MyPicture
-                      src={message.user.picture}
-                      height={20}
-                      width={20}
-                      class="inline-block size-5 rounded-full align-[-0.5em]"
-                      alt=""
-                    />
-                  )}
-                  {message.user.name}
-                </p>
+                <UserBadge user={message.user} size="sm" class="text-day-500 mb-0.5 text-xs" />
              )}
              <p
                class={cn(
--- a/web/src/components/CommentItem.astro
+++ b/web/src/components/CommentItem.astro
@@ -4,6 +4,7 @@ import { Markdown } from 'astro-remote'
 import { Schema } from 'astro-seo-schema'
 import { actions } from 'astro:actions'

+import { commentStatusById } from '../constants/commentStatus'
 import { karmaUnlocksById } from '../constants/karmaUnlocks'
 import { getServiceUserRoleInfo } from '../constants/serviceUserRoles'
 import { cn } from '../lib/cn'
@@ -18,9 +19,9 @@ import { formatDateShort } from '../lib/timeAgo'
 import BadgeSmall from './BadgeSmall.astro'
 import CommentModeration from './CommentModeration.astro'
 import CommentReply from './CommentReply.astro'
-import MyPicture from './MyPicture.astro'
 import TimeFormatted from './TimeFormatted.astro'
 import Tooltip from './Tooltip.astro'
+import UserBadge from './UserBadge.astro'

 import type { HTMLAttributes } from 'astro/types'

@@ -156,27 +157,11 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
    </label>

    <span class="flex items-center gap-1">
-      {
-        comment.author.picture && (
-          <MyPicture
-            src={comment.author.picture}
-            alt={`Profile for ${comment.author.displayName ?? comment.author.name}`}
-            class="size-6 rounded-full bg-zinc-700 object-cover"
-            height={24}
-            width={24}
-          />
-        )
-      }
-
-      <a
-        href={`/u/${comment.author.name}`}
-        class={cn([
-          'font-title text-day-300 font-medium hover:underline focus-visible:underline',
-          isAuthor && 'font-medium text-green-500',
-        ])}
-      >
-        {comment.author.displayName ?? comment.author.name}
-      </a>
+      <UserBadge
+        user={comment.author}
+        size="md"
+        class={cn('text-day-300', isAuthor && 'font-medium text-green-500')}
+      />

      {
        (comment.author.verified || comment.author.admin || comment.author.verifier) && (
@@ -307,20 +292,35 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:

    {
      comment.status === 'VERIFIED' && (
-        <BadgeSmall icon="ri:check-double-fill" color="green" text="Verified" inlineIcon />
+        <BadgeSmall
+          icon={commentStatusById.VERIFIED.icon}
+          color={commentStatusById.VERIFIED.color}
+          text={commentStatusById.VERIFIED.label}
+          inlineIcon
+        />
      )
    }

    {
      (comment.status === 'PENDING' || comment.status === 'HUMAN_PENDING') &&
        (showPending || isHighlightParent || isAuthorOrPrivileged) && (
-          <BadgeSmall icon="ri:time-fill" color="yellow" text="Unmoderated" inlineIcon />
+          <BadgeSmall
+            icon={commentStatusById.PENDING.icon}
+            color={commentStatusById.PENDING.color}
+            text={commentStatusById.PENDING.label}
+            inlineIcon
+          />
        )
    }

    {
      comment.status === 'REJECTED' && isAuthorOrPrivileged && (
-        <BadgeSmall icon="ri:close-circle-fill" color="red" text="Rejected" inlineIcon />
+        <BadgeSmall
+          icon={commentStatusById.REJECTED.icon}
+          color={commentStatusById.REJECTED.color}
+          text={commentStatusById.REJECTED.label}
+          inlineIcon
+        />
      )
    }

--- a/web/src/components/CommentReply.astro
+++ b/web/src/components/CommentReply.astro
@@ -11,6 +11,7 @@ import InputHoneypotTrap from './InputHoneypotTrap.astro'
 import InputRating from './InputRating.astro'
 import InputText from './InputText.astro'
 import InputWrapper from './InputWrapper.astro'
+import UserBadge from './UserBadge.astro'

 import type { Prisma } from '@prisma/client'
 import type { HTMLAttributes } from 'astro/types'
@@ -67,7 +68,7 @@ const userCommentsDisabled = user ? user.karmaUnlocks.commentsDisabled : false
            <div class="text-day-400 flex items-center gap-2 text-xs peer-checked/use-form-secret-token:hidden">
              <Icon name="ri:user-line" class="size-3.5" />
              <span>
-                Commenting as: <span class="font-title font-medium text-green-400">{user.name}</span>
+                Commenting as: <UserBadge user={user} size="sm" class="text-green-400" />
              </span>
            </div>

--- a/web/src/components/Header.astro
+++ b/web/src/components/Header.astro
@@ -12,6 +12,7 @@ import HeaderNotificationIndicator from './HeaderNotificationIndicator.astro'
 import HeaderSplashTextScript from './HeaderSplashTextScript.astro'
 import Logo from './Logo.astro'
 import Tooltip from './Tooltip.astro'
+import UserBadge from './UserBadge.astro'

 const user = Astro.locals.user
 const actualUser = Astro.locals.actualUser
@@ -118,7 +119,7 @@ const splashText = showSplashText ? sample(splashTexts) : null
        <Tooltip
          as="a"
          href="/admin"
-          class="text-red-500 transition-colors hover:text-red-400"
+          class="flex h-full items-center text-red-500 transition-colors hover:text-red-400"
          transition:name="header-admin-link"
          text="Admin Dashboard"
          position="left"
@@ -131,9 +132,12 @@ const splashText = showSplashText ? sample(splashTexts) : null
        user ? (
          <>
            {actualUser && (
-              <span class="text-sm text-white/40 hover:text-white" transition:name="header-actual-user-name">
-                ({actualUser.name})
-              </span>
+              <UserBadge
+                user={actualUser}
+                size="sm"
+                class="text-white/40 hover:text-white"
+                transition:name="header-actual-user-name"
+              />
            )}

            <HeaderNotificationIndicator
@@ -141,13 +145,17 @@ const splashText = showSplashText ? sample(splashTexts) : null
              transition:name="header-notification-indicator"
            />

-            <a
+            <UserBadge
              href="/account"
-              class="xs:px-3 2xs:px-2 last:xs:-mr-3 last:2xs:-mr-2 flex h-full items-center px-1 text-sm text-zinc-400 transition-colors last:-mr-1 hover:text-zinc-300"
+              user={user}
+              size="md"
+              class="xs:px-3 2xs:px-2 last:xs:-mr-3 last:2xs:-mr-2 h-full px-1 text-zinc-400 transition-colors last:-mr-1 hover:text-zinc-300"
+              classNames={{
+                image: 'max-2xs:hidden',
+              }}
              transition:name="header-user-link"
-            >
-              {user.name}
-            </a>
+            />
+
            {actualUser ? (
              <a
                href={makeUnimpersonateUrl(Astro.url)}
--- a/web/src/components/InputText.astro
+++ b/web/src/components/InputText.astro
@@ -10,7 +10,9 @@ import InputWrapper from './InputWrapper.astro'
 import type { ComponentProps, HTMLAttributes } from 'astro/types'

 type Props = Omit<ComponentProps<typeof InputWrapper>, 'children' | 'inputId' | 'required'> & {
-  inputProps?: Omit<HTMLAttributes<'input'>, 'name'>
+  inputProps?: Omit<HTMLAttributes<'input'>, 'name'> & {
+    'transition:persist'?: boolean
+  }
  inputIcon?: string
  inputIconClass?: string
 }
@@ -26,7 +28,7 @@ const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
    inputIcon ? (
      <div class="relative">
        <input
-          transition:persist
+          transition:persist={inputProps?.['transition:persist'] === false ? undefined : true}
          {...omit(inputProps, ['class', 'id', 'name'])}
          id={inputId}
          class={cn(
--- a/web/src/components/InputWrapper.astro
+++ b/web/src/components/InputWrapper.astro
@@ -18,6 +18,7 @@ type Props = HTMLAttributes<'div'> & {
  error?: string[] | string
  icon?: string
  inputId?: string
+  hideLabel?: boolean
 }

 const {
@@ -30,6 +31,7 @@ const {
  icon,
  class: className,
  inputId,
+  hideLabel,
  ...htmlProps
 } = Astro.props

@@ -37,17 +39,20 @@ const hasError = !!error && error.length > 0
 ---

 <fieldset class={cn('space-y-1', className)} {...htmlProps}>
-  <div class={cn('contents', !!descriptionLabel && 'flex flex-wrap items-center gap-x-4')}>
-    <legend class={cn('font-title block text-sm font-medium', hasError && 'text-red-500')}>
-      {icon && <Icon name={icon} class="inline-block size-4 align-[-0.2em]" />}
-      <label for={inputId}>{label}</label>{required && '*'}
-    </legend>
-    {
-      !!descriptionLabel && (
-        <span class="text-day-400 flex-1 basis-24 text-xs text-pretty">{descriptionLabel}</span>
-      )
-    }
-  </div>
+  {
+    !hideLabel && (
+      <div class={cn('contents', !!descriptionLabel && 'flex flex-wrap items-center gap-x-4')}>
+        <legend class={cn('font-title block text-sm font-medium', hasError && 'text-red-500')}>
+          {icon && <Icon name={icon} class="inline-block size-4 align-[-0.2em]" />}
+          <label for={inputId}>{label}</label>
+          {required && '*'}
+        </legend>
+        {!!descriptionLabel && (
+          <span class="text-day-400 flex-1 basis-24 text-xs text-pretty">{descriptionLabel}</span>
+        )}
+      </div>
+    )
+  }

  <slot />

--- a/web/src/components/PillsRadioGroup.astro
+++ b/web/src/components/PillsRadioGroup.astro
@@ -9,10 +9,11 @@ type Props = HTMLAttributes<'div'> & {
    value: HTMLAttributes<'input'>['value']
    label: string
  }[]
+  inputProps?: Omit<HTMLAttributes<'input'>, 'checked' | 'class' | 'name' | 'type' | 'value'>
  selectedValue?: string | null
 }

-const { name, options, selectedValue, class: className, ...rest } = Astro.props
+const { name, options, selectedValue, inputProps, class: className, ...rest } = Astro.props
 ---

 <div
@@ -31,6 +32,7 @@ const { name, options, selectedValue, class: className, ...rest } = Astro.props
          value={option.value}
          checked={selectedValue === option.value}
          class="peer sr-only"
+          {...inputProps}
        />
        <span class="peer-checked:bg-night-400 inline-block cursor-pointer px-1.5 py-0.5 text-white peer-checked:text-green-500">
          {option.label}
--- a/web/src/components/ServiceCard.astro
+++ b/web/src/components/ServiceCard.astro
@@ -88,12 +88,26 @@ const overallScoreInfo = makeOverallScoreInfo(overallScore)
      <h3 class="font-title text-lg leading-none font-medium tracking-wide text-white">
        {name}{
          statusIcon && (
-            <Tooltip text={statusIcon.label} position="right" class="-my-2 shrink-0">
-              <Icon
-                is:inline={inlineIcons}
-                name={statusIcon.icon}
-                class={cn('inline-block size-6 shrink-0 rounded-lg p-1', statusIcon.classNames.icon)}
-              />
+            <Tooltip
+              text={statusIcon.label}
+              position="right"
+              class="-my-2 shrink-0 whitespace-nowrap"
+              enabled={verificationStatus !== 'VERIFICATION_FAILED'}
+            >
+              {[
+                <Icon
+                  is:inline={inlineIcons}
+                  name={statusIcon.icon}
+                  class={cn(
+                    'inline-block size-6 shrink-0 rounded-lg p-1 align-[-0.37em]',
+                    verificationStatus === 'VERIFICATION_FAILED' && 'pr-0',
+                    statusIcon.classNames.icon
+                  )}
+                />,
+                verificationStatus === 'VERIFICATION_FAILED' && (
+                  <span class="text-sm font-bold text-red-500">SCAM</span>
+                ),
+              ]}
            </Tooltip>
          )
        }
--- a/web/src/components/ServicesFilters.astro
+++ b/web/src/components/ServicesFilters.astro
@@ -34,7 +34,8 @@ const {
 <form
  method="GET"
  hx-get={Astro.url.pathname}
-  hx-trigger={`input delay:500ms from:input[type='text'], keyup[key=='Enter'], change from:input:not([data-show-more-input], #${showFiltersId}), change from:select`}
+  hx-trigger={// NOTE: I need to do the [data-trigger-on-change] hack, because HTMX doesnt suport the :not() selector, and I need to exclude the Show more buttons, and not trigger for inputs outside the form
+  "input delay:500ms from:([data-services-filters-form] input[type='text']), keyup[key=='Enter'], change from:([data-services-filters-form] [data-trigger-on-change])"}
  hx-target={`#${searchResultsId}`}
  hx-select={`#${searchResultsId}`}
  hx-push-url="true"
@@ -44,7 +45,11 @@ const {
    .filter((verification) => verification.default)
    .map((verification) => verification.slug)}
  {...formProps}
-  class={cn('', className)}
+  class={cn(
+    // Check the scam filter when there is a text quey and the user has checked verified and approved
+    'has-[input[name=q]:not(:placeholder-shown)]:has-[&_input[name=verification][value=verified]:checked]:has-[&_input[name=verification][value=approved]:checked]:[&_input[name=verification][value=scam]]:checkbox-force-checked',
+    className
+  )}
 >
  <div class="mb-4 flex items-center justify-between">
    <h2 class="font-title text-xl text-green-500">FILTERS</h2>
@@ -64,6 +69,7 @@ const {
      name="sort"
      id="sort"
      class="border-night-600 bg-night-900 w-full rounded-md border p-2 text-white focus:border-green-500 focus:outline-hidden"
+      data-trigger-on-change
    >
      {
        options.sort.map((option) => (
@@ -108,6 +114,7 @@ const {
                name="categories"
                value={category.slug}
                checked={category.checked}
+                data-trigger-on-change
              />
              <span class="peer-checked:font-bold">
                {category.name}
@@ -121,13 +128,7 @@ const {
    {
      options.categories.filter((category) => category.showAlways).length < options.categories.length && (
        <>
-          <input
-            type="checkbox"
-            id="show-more-categories"
-            class="peer sr-only"
-            hx-preserve
-            data-show-more-input
-          />
+          <input type="checkbox" id="show-more-categories" class="peer sr-only" hx-preserve />
          <label
            for="show-more-categories"
            class="peer-focus-visible:ring-offset-night-700 mt-2 block cursor-pointer rounded-sm text-sm text-green-500 peer-checked:hidden peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2"
@@ -158,6 +159,7 @@ const {
              name="verification"
              value={verification.slug}
              checked={filters.verification.includes(verification.value)}
+              data-trigger-on-change
            />
            <Icon name={verification.icon} class={cn('size-4', verification.classNames.icon)} />
            <span class="peer-checked:font-bold">{verification.labelShort}</span>
@@ -176,6 +178,9 @@ const {
        options={options.modeOptions}
        selectedValue={filters['currency-mode']}
        class="-my-2"
+        inputProps={{
+          'data-trigger-on-change': true,
+        }}
      />
    </div>
    <div>
@@ -188,6 +193,7 @@ const {
              name="currencies"
              value={currency.slug}
              checked={filters.currencies?.some((id) => id === currency.id)}
+              data-trigger-on-change
            />
            <Icon name={currency.icon} class="size-4" />
            <span class="peer-checked:font-bold">{currency.name}</span>
@@ -210,6 +216,7 @@ const {
              name="networks"
              value={network.slug}
              checked={filters.networks?.some((slug) => slug === network.slug)}
+              data-trigger-on-change
            />
            <Icon name={network.icon} class="size-4" />
            <span class="peer-checked:font-bold">{network.name}</span>
@@ -233,6 +240,7 @@ const {
        id="max-kyc"
        value={filters['max-kyc'] ?? 4}
        class="w-full accent-green-500"
+        data-trigger-on-change
      />
    </div>
    <div class="text-day-400 mt-1 flex justify-between px-1 text-xs">
@@ -261,6 +269,7 @@ const {
        id="user-rating"
        value={filters['user-rating']}
        class="w-full accent-green-500"
+        data-trigger-on-change
      />
    </div>
    <div class="text-day-400 mt-1 flex justify-between px-2 text-xs">
@@ -289,12 +298,22 @@ const {
        options={options.modeOptions}
        selectedValue={filters['attribute-mode']}
        class="-my-2"
+        inputProps={{
+          'data-trigger-on-change': true,
+        }}
      />
    </div>
    {
-      options.attributesByCategory.map(({ category, attributes }) => (
+      options.attributesByCategory.map(({ categoryInfo, attributes }) => (
        <fieldset class="min-w-0">
-          <legend class="font-title mb-0.5 text-xs tracking-wide text-white">{category}</legend>
+          <legend class="font-title mb-0.5 inline-flex items-center gap-1 text-[0.8125rem] tracking-wide text-white uppercase">
+            <Icon
+              name={categoryInfo.icon}
+              class={cn('size-4 shrink-0 opacity-80', categoryInfo.classNames.icon)}
+              aria-hidden="true"
+            />
+            {categoryInfo.label}
+          </legend>

          <ul class="[:not(:has(~_.peer:checked))]:[&>li:not([data-show-always])]:hidden">
            {attributes.map((attribute) => {
@@ -318,6 +337,7 @@ const {
                      value=""
                      checked={!attribute.value}
                      aria-label="Ignore"
+                      data-trigger-on-change
                    />
                    <input
                      type="radio"
@@ -327,6 +347,7 @@ const {
                      class="peer/yes sr-only"
                      checked={attribute.value === 'yes'}
                      aria-label="Include"
+                      data-trigger-on-change
                    />
                    <input
                      type="radio"
@@ -336,6 +357,7 @@ const {
                      class="peer/no sr-only"
                      checked={attribute.value === 'no'}
                      aria-label="Exclude"
+                      data-trigger-on-change
                    />

                    <div class="pointer-events-none absolute inset-y-0 -left-[2px] hidden w-[calc(var(--spacing)*4.5*2+1px)] rounded-md border-2 border-blue-500 peer-focus-visible/empty:block peer-focus-visible/no:block peer-focus-visible/yes:block" />
@@ -356,11 +378,9 @@ const {
                    </label>

                    <span
-                      class="bg-night-400 border-night-500 pointer-events-none block h-4 w-px border-y peer-checked/no:w-[0.5px] peer-checked/yes:w-[0.5px]"
+                      class="bg-night-400 border-night-500 before:bg-night-400 before:border-night-600 pointer-events-none block h-4 w-px border-y peer-checked/no:w-[0.5px] peer-checked/yes:w-[0.5px] before:h-full before:w-px before:border-y-2"
                      aria-hidden="true"
-                    >
-                      <span class="bg-night-400 border-night-600 block h-full w-px border-y-2" />
-                    </span>
+                    />

                    <label
                      for={noId}
@@ -383,8 +403,8 @@ const {
                      aria-hidden="true"
                    >
                      <Icon
-                        name={attribute.info.icon}
-                        class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.info.classNames.icon)}
+                        name={attribute.typeInfo.icon}
+                        class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.typeInfo.classNames.icon)}
                        aria-hidden="true"
                      />
                      <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
@@ -398,8 +418,8 @@ const {
                      aria-hidden="true"
                    >
                      <Icon
-                        name={attribute.info.icon}
-                        class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.info.classNames.icon)}
+                        name={attribute.typeInfo.icon}
+                        class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.typeInfo.classNames.icon)}
                        aria-hidden="true"
                      />
                      <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
@@ -417,19 +437,18 @@ const {
            <>
              <input
                type="checkbox"
-                id={`show-more-attributes-${category}`}
+                id={`show-more-attributes-${categoryInfo.slug}`}
                class="peer sr-only"
                hx-preserve
-                data-show-more-input
              />
              <label
-                for={`show-more-attributes-${category}`}
+                for={`show-more-attributes-${categoryInfo.slug}`}
                class="peer-focus-visible:ring-offset-night-700 mt-2 block cursor-pointer rounded-sm text-sm text-green-500 peer-checked:hidden peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2"
              >
                + Show more
              </label>
              <label
-                for={`show-more-attributes-${category}`}
+                for={`show-more-attributes-${categoryInfo.slug}`}
                class="peer-focus-visible:ring-offset-night-700 mt-2 hidden cursor-pointer rounded-sm text-sm text-green-500 peer-checked:block peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2"
              >
                - Show less
@@ -455,6 +474,7 @@ const {
        id="min-score"
        value={filters['min-score']}
        class="w-full accent-green-500"
+        data-trigger-on-change
      />
    </div>
    <div class="-mx-1.5 mt-2 flex justify-between px-1">
--- a/web/src/components/ServicesSearchResults.astro
+++ b/web/src/components/ServicesSearchResults.astro
@@ -1,9 +1,11 @@
 ---
 import { Icon } from 'astro-icon/components'
+import { uniq } from 'lodash-es'

+import { verificationStatusesByValue } from '../constants/verificationStatus'
 import { cn } from '../lib/cn'
 import { pluralize } from '../lib/pluralize'
-import { createPageUrl } from '../lib/urls'
+import { createPageUrl, urlWithParams } from '../lib/urls'

 import Button from './Button.astro'
 import ServiceCard from './ServiceCard.astro'
@@ -19,7 +21,9 @@ type Props = HTMLAttributes<'div'> & {
  pageSize: number
  sortSeed?: string
  filters: ServicesFiltersObject
-  hadToIncludeCommunityContributed: boolean
+  includeScams: boolean
+  countCommunityOnly: number | null
+  inlineIcons?: boolean
 }

 const {
@@ -31,89 +35,184 @@ const {
  sortSeed,
  class: className,
  filters,
-  hadToIncludeCommunityContributed,
+  includeScams,
+  countCommunityOnly,
+  inlineIcons,
  ...divProps
 } = Astro.props

-const hasScams = filters.verification.includes('VERIFICATION_FAILED')
-const hasCommunityContributed =
+const hasScams =
  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-  filters.verification.includes('COMMUNITY_CONTRIBUTED') || hadToIncludeCommunityContributed
+  filters.verification.includes('VERIFICATION_FAILED') || includeScams
+const hasSomeScam = !!services?.some((service) => service.verificationStatus.includes('VERIFICATION_FAILED'))
+
+const hasCommunityContributed = filters.verification.includes('COMMUNITY_CONTRIBUTED')
+const hasSomeCommunityContributed = !!services?.some((service) =>
+  service.verificationStatus.includes('COMMUNITY_CONTRIBUTED')
+)

 const totalPages = Math.ceil(total / pageSize) || 1
+
+const urlIfIncludingCommunity = urlWithParams(Astro.url, {
+  verification: uniq([
+    ...filters.verification.map((v) => verificationStatusesByValue[v].slug),
+    verificationStatusesByValue.COMMUNITY_CONTRIBUTED.slug,
+  ]),
+})
 ---

 <div {...divProps} class={cn('flex-1', className)}>
-  <div class="mb-6 flex items-center justify-between">
-    <span class="text-day-500 text-sm">
+  <div class="flex items-center justify-between">
+    <span class="text-day-500 xs:gap-x-3 flex flex-wrap items-center gap-x-2 gap-y-1 text-sm sm:gap-x-6">
      {total.toLocaleString()}
      {pluralize('result', total)}

-      <span
+      <Icon
+        name="ri:loader-4-line"
        id="search-indicator"
-        class="htmx-request:opacity-100 text-white opacity-0 transition-opacity duration-500"
-      >
-        <Icon name="ri:loader-4-line" class="inline-block size-4 animate-spin" />
-        Loading...
-      </span>
+        class="htmx-request:opacity-100 xs:-mx-1.5 -mx-1 inline-block size-4 animate-spin text-white opacity-0 transition-opacity duration-500 sm:-mx-3"
+        is:inline={inlineIcons}
+      />
+
+      {
+        countCommunityOnly && (
+          <>
+            <Button
+              as="a"
+              href={urlIfIncludingCommunity}
+              label={`Include +${countCommunityOnly.toLocaleString()} community contributed`}
+              size="sm"
+              class="hidden lg:inline-flex"
+              icon="ri:search-line"
+              inlineIcon={inlineIcons}
+            />
+            <Button
+              as="a"
+              href={urlIfIncludingCommunity}
+              label={`Include +${countCommunityOnly.toLocaleString()}`}
+              size="sm"
+              class="hidden sm:inline-flex lg:hidden"
+              icon="ri:search-line"
+              endIcon="ri:question-line"
+              classNames={{
+                endIcon: 'text-yellow-200/50',
+              }}
+              inlineIcon={inlineIcons}
+            />
+
+            <a
+              href={urlIfIncludingCommunity}
+              class="border-night-500 bg-night-800 flex items-center gap-1 rounded-md border px-2 py-0.5 text-sm sm:hidden"
+            >
+              <Icon
+                name="ri:search-line"
+                class="mr-0.5 inline-block size-3.5 shrink-0 align-[-0.15em]"
+                is:inline={inlineIcons}
+              />
+              Include
+              {countCommunityOnly.toLocaleString()}
+              <Icon
+                name="ri:question-line"
+                class="inline-block size-3.5 shrink-0 align-[-0.15em] text-yellow-200/50"
+                is:inline={inlineIcons}
+              />
+            </a>
+          </>
+        )
+      }
    </span>
-    <Button as="a" href="/service-suggestion/new" label="Add service" icon="ri:add-line" />
+    <Button
+      as="a"
+      href="/service-suggestion/new"
+      label="Add service"
+      icon="ri:add-line"
+      inlineIcon={inlineIcons}
+      class="max-xs:w-9 max-xs:px-0"
+      classNames={{
+        label: 'max-xs:hidden',
+      }}
+    />
  </div>

  {
    hasScams && hasCommunityContributed && (
-      <div class="font-title mb-6 rounded-lg border border-red-500/30 bg-red-950 p-4 text-sm text-red-500">
-        <Icon name="ri:alert-fill" class="-mr-1 inline-block size-4 text-red-500" />
-        <Icon name="ri:question-line" class="mr-2 inline-block size-4 text-yellow-500" />
-        Showing SCAM and unverified community-contributed services.
-        {hadToIncludeCommunityContributed && 'Because there were no other results.'}
+      <div class="font-title mt-2 rounded-lg bg-red-900/50 px-3 py-2 text-sm text-pretty text-red-400">
+        <Icon
+          name="ri:alert-fill"
+          class="inline-block size-4 shrink-0 align-[-0.2em] text-red-500"
+          is:inline={inlineIcons}
+        />
+        <Icon
+          name="ri:question-line"
+          class="mr-1 inline-block size-4 shrink-0 align-[-0.2em] text-yellow-400"
+          is:inline={inlineIcons}
+        />
+        Results {hasSomeScam || hasSomeCommunityContributed ? 'include' : 'may include'} SCAMs or
+        community-contributed services.
      </div>
    )
  }

  {
    hasScams && !hasCommunityContributed && (
-      <div class="font-title mb-6 rounded-lg border border-red-500/30 bg-red-950 p-4 text-sm text-red-500">
-        <Icon name="ri:alert-fill" class="mr-2 inline-block size-4 text-red-500" />
-        Showing SCAM services!
+      <div class="font-title mt-2 rounded-lg bg-red-900/50 px-3 py-2 text-sm text-pretty text-red-400">
+        <Icon
+          name="ri:alert-fill"
+          class="mr-1 inline-block size-4 shrink-0 align-[-0.2em] text-red-500"
+          is:inline={inlineIcons}
+        />
+        Results {hasSomeScam ? 'include' : 'may include'} SCAM services
      </div>
    )
  }

  {
    !hasScams && hasCommunityContributed && (
-      <div class="font-title mb-6 rounded-lg border border-yellow-500/30 bg-yellow-950 p-4 text-sm text-yellow-500">
-        <Icon name="ri:question-line" class="mr-2 inline-block size-4" />
-
-        {hadToIncludeCommunityContributed
-          ? 'Showing unverified community-contributed services, because there were no other results. Some might be scams.'
-          : 'Showing unverified community-contributed services, some might be scams.'}
+      <div class="font-title mt-2 rounded-lg bg-yellow-600/30 px-3 py-2 text-sm text-pretty text-yellow-200">
+        <Icon
+          name="ri:question-line"
+          class="mr-1 inline-block size-4 shrink-0 align-[-0.2em] text-yellow-400"
+          is:inline={inlineIcons}
+        />
+        Results {hasSomeCommunityContributed ? 'include' : 'may include'} unverified community-contributed
+        services, some might be scams.
      </div>
    )
  }

  {
    !services || services.length === 0 ? (
-      <div class="sticky top-20 flex flex-col items-center justify-center rounded-lg border border-green-500/30 bg-black/40 p-12 text-center">
-        <Icon name="ri:emotion-sad-line" class="mb-4 size-16 text-green-500/50" />
+      <div class="sticky top-20 mt-6 flex flex-col items-center justify-center py-12 text-center">
+        <Icon name="ri:emotion-sad-line" class="mb-4 size-16 text-green-500/50" is:inline={inlineIcons} />
        <h3 class="font-title mb-3 text-xl text-green-500">No services found</h3>
        <p class="text-day-400">Try adjusting your filters to find more services</p>
-        <a
-          href={Astro.url.pathname}
-          class={cn(
-            'bg-night-800 font-title mt-4 rounded-md px-4 py-2 text-sm tracking-wider text-white uppercase',
-            hasDefaultFilters && 'hidden'
+        <div class="mt-4 flex justify-center gap-2">
+          {!hasDefaultFilters && (
+            <Button
+              as="a"
+              href={Astro.url.pathname}
+              label="Clear filters"
+              icon="ri:close-line"
+              inlineIcon={inlineIcons}
+            />
          )}
-        >
-          Clear filters
-        </a>
+          {countCommunityOnly && (
+            <Button
+              as="a"
+              href={urlIfIncludingCommunity}
+              label={`Show ${countCommunityOnly.toLocaleString()} community contributed`}
+              icon="ri:search-line"
+              inlineIcon={inlineIcons}
+            />
+          )}
+        </div>
      </div>
    ) : (
      <>
-        <div class="grid grid-cols-1 gap-4 sm:gap-6 md:grid-cols-[repeat(auto-fill,minmax(calc(var(--spacing)*80),1fr))]">
+        <div class="mt-6 grid grid-cols-1 gap-4 sm:gap-6 md:grid-cols-[repeat(auto-fill,minmax(calc(var(--spacing)*80),1fr))]">
          {services.map((service, i) => (
            <ServiceCard
-              inlineIcons
+              inlineIcons={inlineIcons}
              service={service}
              data-hx-search-results-card
              {...(i === services.length - 1 && currentPage < totalPages
@@ -131,11 +230,25 @@ const totalPages = Math.ceil(total / pageSize) || 1

        <div class="no-js:hidden mt-8 flex justify-center" id="infinite-scroll-indicator">
          <div class="htmx-request:opacity-100 flex items-center gap-2 opacity-0 transition-opacity duration-500">
-            <Icon name="ri:loader-4-line" class="size-8 animate-spin text-green-500" />
+            <Icon
+              name="ri:loader-4-line"
+              class="size-8 animate-spin text-green-500"
+              is:inline={inlineIcons}
+            />
            Loading more services...
          </div>
        </div>
      </>
    )
  }
+  <div class="mt-4 text-center">
+    <Button
+      as="a"
+      href="/service-suggestion/new"
+      label="Add service"
+      icon="ri:add-line"
+      inlineIcon={inlineIcons}
+      class="mx-auto"
+    />
+  </div>
 </div>
--- a/web/src/components/UserBadge.astro
+++ b/web/src/components/UserBadge.astro
@@ -0,0 +1,87 @@
+---
+import { tv, type VariantProps } from 'tailwind-variants'
+
+import { getSizePxFromTailwindClasses } from '../lib/tailwind'
+
+import MyPicture from './MyPicture.astro'
+
+import type { Prisma } from '@prisma/client'
+import type { HTMLAttributes } from 'astro/types'
+import type { O } from 'ts-toolbelt'
+
+const userBadge = tv({
+  slots: {
+    base: 'group/user-badge font-title inline-flex max-w-full items-center gap-1 overflow-hidden font-medium',
+    image: 'inline-block rounded-full object-cover',
+    text: 'truncate',
+  },
+  variants: {
+    size: {
+      sm: {
+        base: 'gap-1 text-xs',
+        image: 'size-4',
+      },
+      md: {
+        base: 'gap-2 text-sm',
+        image: 'size-5',
+      },
+      lg: {
+        base: 'gap-2 text-base',
+        image: 'size-6',
+      },
+    },
+    noLink: {
+      true: {
+        text: 'cursor-default',
+      },
+      false: {
+        base: 'cursor-pointer',
+        text: 'group-hover/user-badge:underline',
+      },
+    },
+  },
+  defaultVariants: {
+    size: 'sm',
+    noLink: false,
+  },
+})
+
+type Props = O.Optional<HTMLAttributes<'a'>, 'href'> &
+  VariantProps<typeof userBadge> & {
+    user: Prisma.UserGetPayload<{
+      select: {
+        name: true
+        displayName: true
+        picture: true
+      }
+    }>
+    classNames?: {
+      image?: string
+      text?: string
+    }
+    children?: never
+  }
+
+const { user, href, class: className, size = 'sm', classNames, noLink = false, ...htmlProps } = Astro.props
+const { base, image, text } = userBadge({ size, noLink })
+
+const imageClassName = image({ class: classNames?.image })
+const imageSizePx = getSizePxFromTailwindClasses(imageClassName, 16)
+
+const Tag = noLink ? 'span' : 'a'
+---
+
+<Tag
+  href={Tag === 'a' ? (href ?? `/u/${user.name}`) : undefined}
+  class={base({ class: className })}
+  {...htmlProps}
+>
+  {
+    !!user.picture && (
+      <MyPicture src={user.picture} height={imageSizePx} width={imageSizePx} class={imageClassName} alt="" />
+    )
+  }
+  <span class={text({ class: classNames?.text })}>
+    {user.displayName ?? user.name}
+  </span>
+</Tag>
--- a/web/src/components/VerificationWarningBanner.astro
+++ b/web/src/components/VerificationWarningBanner.astro
@@ -19,6 +19,11 @@ type Props = {
      verificationSummary: true
      listedAt: true
      createdAt: true
+      verificationSteps: {
+        select: {
+          status: true
+        }
+      }
    }
  }>
 }
@@ -67,3 +72,18 @@ const wasRecentlyAdded = isPast(listedDate) && differenceInDays(new Date(), list
    </div>
  ) : null
 }
+
+{
+  service.verificationStatus !== 'VERIFICATION_FAILED' &&
+    service.verificationSteps.some((step) => step.status === 'FAILED') && (
+      <div class="mb-3 flex items-center gap-2 rounded-md bg-red-900/50 p-2 text-sm text-red-400">
+        <Icon
+          name={verificationStatusesByValue.VERIFICATION_FAILED.icon}
+          class={cn('size-5', verificationStatusesByValue.VERIFICATION_FAILED.classNames.icon)}
+        />
+        <span>
+          This service has failed one or more verification steps. Review the verification details carefully.
+        </span>
+      </div>
+    )
+}
--- a/web/src/constants/commentStatus.ts
+++ b/web/src/constants/commentStatus.ts
@@ -1,12 +1,15 @@
 import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
 import { transformCase } from '../lib/strings'

+import type BadgeSmall from '../components/BadgeSmall.astro'
 import type { CommentStatus } from '@prisma/client'
+import type { ComponentProps } from 'astro/types'

 type CommentStatusInfo<T extends string | null | undefined = string> = {
  id: T
  icon: string
  label: string
+  color: ComponentProps<typeof BadgeSmall>['color']
  creativeWorkStatus: string | undefined
 }

@@ -20,37 +23,43 @@ export const {
    id,
    icon: 'ri:question-line',
    label: id ? transformCase(id, 'title') : String(id),
+    color: 'gray',
    creativeWorkStatus: undefined,
  }),
  [
    {
      id: 'PENDING',
      icon: 'ri:question-line',
-      label: 'Pending',
+      label: 'Unmoderated',
+      color: 'yellow',
      creativeWorkStatus: 'Deleted',
    },
    {
      id: 'HUMAN_PENDING',
      icon: 'ri:question-line',
-      label: 'Pending',
+      label: 'Unmoderated',
+      color: 'yellow',
      creativeWorkStatus: 'Deleted',
    },
    {
      id: 'VERIFIED',
-      icon: 'ri:check-line',
+      icon: 'ri:verified-badge-fill',
      label: 'Verified',
+      color: 'blue',
      creativeWorkStatus: 'Verified',
    },
    {
      id: 'REJECTED',
      icon: 'ri:close-line',
      label: 'Rejected',
+      color: 'red',
      creativeWorkStatus: 'Deleted',
    },
    {
      id: 'APPROVED',
      icon: 'ri:check-line',
      label: 'Approved',
+      color: 'green',
      creativeWorkStatus: 'Active',
    },
  ] as const satisfies CommentStatusInfo<CommentStatus>[]
--- a/web/src/constants/commentStatusFilters.ts
+++ b/web/src/constants/commentStatusFilters.ts
@@ -1,15 +1,20 @@
 import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
 import { transformCase } from '../lib/strings'

+import { commentStatusById } from './commentStatus'
+
+import type BadgeSmall from '../components/BadgeSmall.astro'
 import type { Prisma } from '@prisma/client'
+import type { ComponentProps } from 'astro/types'

 type CommentStatusFilterInfo<T extends string | null | undefined = string> = {
  value: T
  label: string
+  color: ComponentProps<typeof BadgeSmall>['color']
+  icon: string
  whereClause: Prisma.CommentWhereInput
-  styles: {
+  classNames: {
    filter: string
-    badge: string
  }
 }

@@ -24,9 +29,10 @@ export const {
    value,
    label: value ? transformCase(value, 'title') : String(value),
    whereClause: {},
-    styles: {
+    color: 'gray',
+    icon: 'ri:question-line',
+    classNames: {
      filter: 'border-zinc-700 transition-colors hover:border-green-500/50',
-      badge: '',
    },
  }),
  [
@@ -34,84 +40,92 @@ export const {
      label: 'All',
      value: 'all',
      whereClause: {},
-      styles: {
+      color: 'gray',
+      icon: 'ri:question-line',
+      classNames: {
        filter: 'border-green-500 bg-green-500/20 text-green-400',
-        badge: '',
      },
    },
    {
-      label: 'Pending',
      value: 'pending',
+      label: 'AI pending',
+      color: commentStatusById.PENDING.color,
+      icon: 'ri:robot-2-line',
      whereClause: {
        OR: [{ status: 'PENDING' }, { status: 'HUMAN_PENDING' }],
      },
-      styles: {
+      classNames: {
        filter: 'border-blue-500 bg-blue-500/20 text-blue-400',
-        badge: 'rounded-sm bg-blue-500/20 px-2 py-0.5 text-[12px] font-medium text-blue-500',
      },
    },
    {
-      label: 'Human Pending',
      value: 'human-pending',
+      label: 'Human needed',
+      color: commentStatusById.HUMAN_PENDING.color,
+      icon: 'ri:user-search-line',
      whereClause: { status: 'HUMAN_PENDING' },
-      styles: {
+      classNames: {
        filter: 'border-blue-500 bg-blue-500/20 text-blue-400',
-        badge: 'rounded-sm bg-blue-500/20 px-2 py-0.5 text-[12px] font-medium text-blue-500',
      },
    },
    {
-      label: 'Rejected',
      value: 'rejected',
+      label: commentStatusById.REJECTED.label,
+      color: commentStatusById.REJECTED.color,
+      icon: commentStatusById.REJECTED.icon,
      whereClause: {
        status: 'REJECTED',
      },
-      styles: {
+      classNames: {
        filter: 'border-red-500 bg-red-500/20 text-red-400',
-        badge: 'rounded-sm bg-red-500/20 px-2 py-0.5 text-[12px] font-medium text-red-500',
      },
    },
    {
      label: 'Suspicious',
      value: 'suspicious',
+      color: 'red',
+      icon: 'ri:close-circle-fill',
      whereClause: {
        suspicious: true,
      },
-      styles: {
+      classNames: {
        filter: 'border-red-500 bg-red-500/20 text-red-400',
-        badge: 'rounded-sm bg-red-500/20 px-2 py-0.5 text-[12px] font-medium text-red-500',
      },
    },
    {
-      label: 'Verified',
      value: 'verified',
+      label: commentStatusById.VERIFIED.label,
+      color: commentStatusById.VERIFIED.color,
+      icon: commentStatusById.VERIFIED.icon,
      whereClause: {
        status: 'VERIFIED',
      },
-      styles: {
+      classNames: {
        filter: 'border-blue-500 bg-blue-500/20 text-blue-400',
-        badge: 'rounded-sm bg-blue-500/20 px-2 py-0.5 text-[12px] font-medium text-blue-500',
      },
    },
    {
-      label: 'Approved',
      value: 'approved',
+      label: commentStatusById.APPROVED.label,
+      color: commentStatusById.APPROVED.color,
+      icon: commentStatusById.APPROVED.icon,
      whereClause: {
        status: 'APPROVED',
      },
-      styles: {
+      classNames: {
        filter: 'border-green-500 bg-green-500/20 text-green-400',
-        badge: 'rounded-sm bg-green-500/20 px-2 py-0.5 text-[12px] font-medium text-green-500',
      },
    },
    {
      label: 'Needs Review',
      value: 'needs-review',
+      color: 'yellow',
+      icon: 'ri:question-line',
      whereClause: {
        requiresAdminReview: true,
      },
-      styles: {
+      classNames: {
        filter: 'border-yellow-500 bg-yellow-500/20 text-yellow-400',
-        badge: 'rounded-sm bg-yellow-500/20 px-2 py-0.5 text-[12px] font-medium text-yellow-500',
      },
    },
  ] as const satisfies CommentStatusFilterInfo[]
--- a/web/src/constants/contactMethods.ts
+++ b/web/src/constants/contactMethods.ts
@@ -0,0 +1,122 @@
+import { parsePhoneNumberWithError } from 'libphonenumber-js'
+
+import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
+import { transformCase } from '../lib/strings'
+
+type ContactMethodInfo<T extends string | null | undefined = string> = {
+  type: T
+  label: string
+  /** Notice that the first capture group is then used to format the value */
+  matcher: RegExp
+  formatter: (value: string) => string | null
+  icon: string
+}
+
+export const {
+  dataArray: contactMethods,
+  dataObject: contactMethodsById,
+  /** Use {@link formatContactMethod} instead */
+  getFn: getContactMethodInfo,
+} = makeHelpersForOptions(
+  'type',
+  (type): ContactMethodInfo<typeof type> => ({
+    type,
+    label: type ? transformCase(type, 'title') : String(type),
+    icon: 'ri:shield-fill',
+    matcher: /(.*)/,
+    formatter: (value) => value,
+  }),
+  [
+    {
+      type: 'email',
+      label: 'Email',
+      matcher: /mailto:(.*)/,
+      formatter: (value) => value,
+      icon: 'ri:mail-line',
+    },
+    {
+      type: 'telephone',
+      label: 'Telephone',
+      matcher: /tel:(.*)/,
+      formatter: (value) => {
+        return parsePhoneNumberWithError(value).formatInternational()
+      },
+      icon: 'ri:phone-line',
+    },
+    {
+      type: 'whatsapp',
+      label: 'WhatsApp',
+      matcher: /https?:\/\/(?:www\.)?wa\.me\/(.*)\/?/,
+      formatter: (value) => {
+        return parsePhoneNumberWithError(value).formatInternational()
+      },
+      icon: 'ri:whatsapp-line',
+    },
+    {
+      type: 'telegram',
+      label: 'Telegram',
+      matcher: /https?:\/\/(?:www\.)?t\.me\/(.*)\/?/,
+      formatter: (value) => `t.me/${value}`,
+      icon: 'ri:telegram-line',
+    },
+    {
+      type: 'linkedin',
+      label: 'LinkedIn',
+      matcher: /https?:\/\/(?:www\.)?linkedin\.com\/(?:in|company)\/(.*)\/?/,
+      formatter: (value) => `in/${value}`,
+      icon: 'ri:linkedin-box-line',
+    },
+    {
+      type: 'website',
+      label: 'Website',
+      matcher: /https?:\/\/(?:www\.)?((?:[a-zA-Z0-9-]+\.)+[a-zA-Z]+)/,
+      formatter: (value) => value,
+      icon: 'ri:global-line',
+    },
+    {
+      type: 'x',
+      label: 'X',
+      matcher: /https?:\/\/(?:www\.)?x\.com\/(.*)\/?/,
+      formatter: (value) => `@${value}`,
+      icon: 'ri:twitter-x-line',
+    },
+    {
+      type: 'instagram',
+      label: 'Instagram',
+      matcher: /https?:\/\/(?:www\.)?instagram\.com\/(.*)\/?/,
+      formatter: (value) => `@${value}`,
+      icon: 'ri:instagram-line',
+    },
+    {
+      type: 'matrix',
+      label: 'Matrix',
+      matcher: /https?:\/\/(?:www\.)?matrix\.to\/#\/(.*)\/?/,
+      formatter: (value) => value,
+      icon: 'ri:hashtag',
+    },
+    {
+      type: 'bitcointalk',
+      label: 'BitcoinTalk',
+      matcher: /https?:\/\/(?:www\.)?bitcointalk\.org/,
+      formatter: () => 'BitcoinTalk',
+      icon: 'ri:btc-line',
+    },
+  ] as const satisfies ContactMethodInfo[]
+)
+
+export function formatContactMethod(url: string) {
+  for (const contactMethod of contactMethods) {
+    const captureGroup = url.match(contactMethod.matcher)?.[1]
+    if (!captureGroup) continue
+
+    const formattedValue = contactMethod.formatter(captureGroup)
+    if (!formattedValue) continue
+
+    return {
+      ...contactMethod,
+      formattedValue,
+    } as const
+  }
+
+  return { ...getContactMethodInfo('unknown'), formattedValue: url } as const
+}
--- a/web/src/constants/karmaTransactionActions.ts
+++ b/web/src/constants/karmaTransactionActions.ts
@@ -78,8 +78,8 @@ export const {
    },
    {
      value: 'MANUAL_ADJUSTMENT',
-      slug: 'manual-adjustment',
-      label: 'Manual adjustment',
+      slug: 'gift',
+      label: 'Gift',
      icon: 'ri:gift-line',
    },
  ] as const satisfies KarmaTransactionActionInfo<KarmaTransactionAction>[]
--- a/web/src/lib/contactMethods.ts
+++ b/web/src/lib/contactMethods.ts
@@ -1,60 +0,0 @@
-import { parsePhoneNumberWithError } from 'libphonenumber-js'
-
-type Formatter = {
-  id: string
-  matcher: RegExp
-  formatter: (value: string) => string | null
-}
-const formatters = [
-  {
-    id: 'email',
-    matcher: /mailto:(.*)/,
-    formatter: (value) => value,
-  },
-  {
-    id: 'telephone',
-    matcher: /tel:(.*)/,
-    formatter: (value) => {
-      return parsePhoneNumberWithError(value).formatInternational()
-    },
-  },
-  {
-    id: 'whatsapp',
-    matcher: /https?:\/\/wa\.me\/(.*)\/?/,
-    formatter: (value) => {
-      return parsePhoneNumberWithError(value).formatInternational()
-    },
-  },
-  {
-    id: 'telegram',
-    matcher: /https?:\/\/t\.me\/(.*)\/?/,
-    formatter: (value) => `t.me/${value}`,
-  },
-  {
-    id: 'linkedin',
-    matcher: /https?:\/\/(?:www\.)?linkedin\.com\/(?:in|company)\/(.*)\/?/,
-    formatter: (value) => `in/${value}`,
-  },
-  {
-    id: 'website',
-    matcher: /https?:\/\/(?:www\.)?((?:[a-zA-Z0-9-]+\.)+[a-zA-Z]+)/,
-    formatter: (value) => value,
-  },
-] as const satisfies Formatter[]
-
-export function formatContactMethod(url: string) {
-  for (const formatter of formatters) {
-    const captureGroup = url.match(formatter.matcher)?.[1]
-    if (!captureGroup) continue
-
-    const formattedValue = formatter.formatter(captureGroup)
-    if (!formattedValue) continue
-
-    return {
-      type: formatter.id,
-      formattedValue,
-    } as const
-  }
-
-  return null
-}
--- a/web/src/lib/tailwind.ts
+++ b/web/src/lib/tailwind.ts
@@ -0,0 +1,8 @@
+import { parseIntWithFallback } from './numbers'
+
+const TW_SIZING_TO_PX_RATIO = 4
+
+export function getSizePxFromTailwindClasses(className: string, fallbackPxSize: number) {
+  const twSizing = /(?: |^|\n)(?:(?:size-(\d+))|(?:w-(\d+))|(?:h-(\d+)))(?: |$|\n)/.exec(className)?.[1]
+  return parseIntWithFallback(twSizing, fallbackPxSize / TW_SIZING_TO_PX_RATIO) * TW_SIZING_TO_PX_RATIO
+}
--- a/web/src/pages/account/edit.astro
+++ b/web/src/pages/account/edit.astro
@@ -22,7 +22,7 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
 ---

 <MiniLayout
-  pageTitle={`Edit Profile - ${user.name}`}
+  pageTitle={`Edit Profile - ${user.displayName ?? user.name}`}
  description="Edit your user profile"
  ogImage={{ template: 'generic', title: 'Edit Profile', icon: 'ri:user-settings-line' }}
  layoutHeader={{
--- a/web/src/pages/account/index.astro
+++ b/web/src/pages/account/index.astro
@@ -8,6 +8,7 @@ import Button from '../../components/Button.astro'
 import MyPicture from '../../components/MyPicture.astro'
 import TimeFormatted from '../../components/TimeFormatted.astro'
 import Tooltip from '../../components/Tooltip.astro'
+import UserBadge from '../../components/UserBadge.astro'
 import { getKarmaTransactionActionInfo } from '../../constants/karmaTransactionActions'
 import { karmaUnlocks, karmaUnlocksById } from '../../constants/karmaUnlocks'
 import { SUPPORT_EMAIL } from '../../constants/project'
@@ -65,6 +66,7 @@ const user = await Astro.locals.banners.try('user', async () => {
              select: {
                name: true,
                displayName: true,
+                picture: true,
              },
            },
            comment: {
@@ -158,11 +160,11 @@ if (!user) return Astro.rewrite('/404')
 ---

 <BaseLayout
-  pageTitle={`${user.name} - Account`}
+  pageTitle={`${user.displayName ?? user.name} - Account`}
  description="Manage your user profile"
  ogImage={{
    template: 'generic',
-    title: `${user.name} | Account`,
+    title: `${user.displayName ?? user.name} | Account`,
    description: 'Manage your user profile',
    icon: 'ri:user-3-line',
  }}
@@ -199,8 +201,10 @@ if (!user) return Astro.rewrite('/404')
          )
        }
        <div class="grow">
-          <h1 class="font-title text-lg font-bold tracking-wider text-white">{user.name}</h1>
-          {user.displayName && <p class="text-day-200">{user.displayName}</p>}
+          <h1 class="font-title text-lg font-bold tracking-wider text-white">
+            {user.displayName ?? user.name}
+          </h1>
+          {user.displayName && <p class="text-day-200 font-title">{user.name}</p>}
          {
            (user.admin || user.verified || user.verifier) && (
              <div class="mt-1 flex gap-2">
@@ -429,7 +433,7 @@ if (!user) return Astro.rewrite('/404')
            <li>
              <Button
                as="a"
-                href={`mailto:${SUPPORT_EMAIL}?subject=User verification request - ${user.name}&body=I would like to be verified as related to https://www.example.com`}
+                href={`mailto:${SUPPORT_EMAIL}?subject=User verification request - ${user.displayName ?? user.name}&body=I would like to be verified as related to https://www.example.com`}
                label="Request verification"
                size="sm"
              />
@@ -448,7 +452,7 @@ if (!user) return Astro.rewrite('/404')
      </h2>
      <Button
        as="a"
-        href={`mailto:${SUPPORT_EMAIL}?subject=Service Affiliation Verification Request - ${user.name}&body=I would like to be verified as related to the services ACME as Admin and XYZ as Team Member. Here is the proof...`}
+        href={`mailto:${SUPPORT_EMAIL}?subject=Service Affiliation Verification Request - ${user.displayName ?? user.name}&body=I would like to be verified as related to the services ACME as Admin and XYZ as Team Member. Here is the proof...`}
        label="Request"
        size="md"
      />
@@ -916,13 +920,10 @@ if (!user) return Astro.rewrite('/404')
                          <Icon name={actionInfo.icon} class="size-4" />
                          {actionInfo.label}
                          {transaction.action === 'MANUAL_ADJUSTMENT' && transaction.grantedBy && (
-                            <a
-                              href={`/u/${transaction.grantedBy.name}`}
-                              class="text-day-500 ml-1 hover:underline"
-                            >
-                              {/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
-                              by {transaction.grantedBy.displayName || transaction.grantedBy.name}
-                            </a>
+                            <>
+                              <span class="text-day-500">from</span>
+                              <UserBadge user={transaction.grantedBy} size="sm" class="text-day-500" />
+                            </>
                          )}
                        </span>
                      </td>
@@ -937,7 +938,12 @@ if (!user) return Astro.rewrite('/404')
                        {transaction.points}
                      </td>
                      <td class="text-day-400 px-4 py-3 text-right text-xs whitespace-nowrap">
-                        {new Date(transaction.createdAt).toLocaleDateString()}
+                        <TimeFormatted
+                          date={transaction.createdAt}
+                          prefix={false}
+                          hourPrecision
+                          caseType="sentence"
+                        />
                      </td>
                    </tr>
                  )
--- a/web/src/pages/admin/comments.astro
+++ b/web/src/pages/admin/comments.astro
@@ -1,7 +1,12 @@
 ---
 import { z } from 'astro/zod'
+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 TimeFormatted from '../../components/TimeFormatted.astro'
+import UserBadge from '../../components/UserBadge.astro'
 import {
  commentStatusFilters,
  commentStatusFiltersZodEnum,
@@ -36,11 +41,18 @@ const [comments = [], totalComments = 0] = await Astro.locals.banners.try(
    prisma.comment.findManyAndCount({
      where: statusFilter.whereClause,
      include: {
-        author: true,
+        author: {
+          select: {
+            name: true,
+            displayName: true,
+            picture: true,
+          },
+        },
        service: {
          select: {
            name: true,
            slug: true,
+            imageUrl: true,
          },
        },
        parent: {
@@ -70,12 +82,13 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
          <a
            href={urlWithParams(Astro.url, { status: filter.value })}
            class={cn([
-              'font-title rounded-md border px-3 py-1 text-sm',
+              'font-title flex items-center gap-2 rounded-md border px-3 py-1 text-sm',
              params.status === filter.value
-                ? filter.styles.filter
+                ? filter.classNames.filter
                : 'border-zinc-700 transition-colors hover:border-green-500/50',
            ])}
          >
+            <Icon name={filter.icon} class="size-4 shrink-0" />
            {filter.label}
          </a>
        ))
@@ -98,22 +111,7 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
          >
            <div class="mb-4 flex flex-wrap items-center gap-2">
              {/* Author Info */}
-              <span class="font-title text-sm">{comment.author.name}</span>
-              {comment.author.admin && (
-                <span class="rounded-sm bg-yellow-500/20 px-2 py-0.5 text-[12px] font-medium text-yellow-500">
-                  admin
-                </span>
-              )}
-              {comment.author.verified && !comment.author.admin && (
-                <span class="rounded-sm bg-blue-500/20 px-2 py-0.5 text-[12px] font-medium text-blue-500">
-                  verified
-                </span>
-              )}
-              {comment.author.verifier && !comment.author.admin && (
-                <span class="rounded-sm bg-green-500/20 px-2 py-0.5 text-[12px] font-medium text-green-500">
-                  verifier
-                </span>
-              )}
+              <UserBadge user={comment.author} size="md" />

              {/* Service Link */}
              <span class="text-xs text-zinc-500">•</span>
@@ -121,21 +119,55 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
                href={`/service/${comment.service.slug}#comment-${comment.id.toString()}`}
                class="text-sm text-blue-400 transition-colors hover:text-blue-300"
              >
+                {!!comment.service.imageUrl && (
+                  <MyPicture
+                    src={comment.service.imageUrl}
+                    height={16}
+                    width={16}
+                    class="inline-block size-4 rounded-full align-[-0.2em]"
+                    alt=""
+                  />
+                )}
                {comment.service.name}
              </a>

              {/* Date */}
              <span class="text-xs text-zinc-500">•</span>
-              <span class="text-sm text-zinc-400">{new Date(comment.createdAt).toLocaleString()}</span>
+              <TimeFormatted
+                date={comment.createdAt}
+                hourPrecision
+                caseType="sentence"
+                class="text-sm text-zinc-400"
+              />
+
+              <span class="text-xs text-zinc-500">•</span>

              {/* Status Badges */}
-              <span class={comment.statusFilterInfo.styles.badge}>{comment.statusFilterInfo.label}</span>
+              <BadgeSmall
+                color={comment.statusFilterInfo.color}
+                text={comment.statusFilterInfo.label}
+                icon={comment.statusFilterInfo.icon}
+                inlineIcon
+              />
+
+              <span class="text-xs text-zinc-500">•</span>
+
+              {/* Link to Comment */}
+              <a
+                href={`/service/${comment.service.slug}?showPending=true#comment-${comment.id.toString()}`}
+                class="text-whit/50 flex items-center gap-1 text-sm transition-colors hover:underline"
+              >
+                <Icon name="ri:link" class="size-4" />
+                Open
+              </a>
            </div>

            {/* Parent Comment Context */}
            {comment.parent && (
              <div class="mb-4 border-l-2 border-zinc-700 pl-4">
-                <div class="mb-1 text-sm text-zinc-500">Replying to {comment.parent.author.name}:</div>
+                <div class="mb-1 text-sm opacity-50">
+                  Replying to <UserBadge user={comment.parent.author} size="md" />
+                </div>
                <div class="text-sm text-zinc-400">{comment.parent.content}</div>
              </div>
            )}
--- a/web/src/pages/admin/service-suggestions/[id].astro
+++ b/web/src/pages/admin/service-suggestions/[id].astro
@@ -4,6 +4,7 @@ import { actions } from 'astro:actions'

 import Chat from '../../../components/Chat.astro'
 import ServiceCard from '../../../components/ServiceCard.astro'
+import UserBadge from '../../../components/UserBadge.astro'
 import { getServiceSuggestionStatusInfo } from '../../../constants/serviceSuggestionStatus'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
 import { cn } from '../../../lib/cn'
@@ -37,6 +38,8 @@ const serviceSuggestion = await Astro.locals.banners.try('Error fetching service
        select: {
          id: true,
          name: true,
+          displayName: true,
+          picture: true,
        },
      },
      service: {
@@ -66,6 +69,7 @@ const serviceSuggestion = await Astro.locals.banners.try('Error fetching service
          user: {
            select: {
              id: true,
+              displayName: true,
              name: true,
              picture: true,
            },
@@ -126,11 +130,7 @@ const statusInfo = getServiceSuggestionStatusInfo(serviceSuggestion.status)
        </span>

        <span class="font-title text-gray-400">Submitted by:</span>
-        <span class="text-gray-300">
-          <a href={`/admin/users/${serviceSuggestion.user.name}`} class="hover:text-green-500">
-            {serviceSuggestion.user.name}
-          </a>
-        </span>
+        <UserBadge class="text-gray-300" user={serviceSuggestion.user} size="md" />

        <span class="font-title text-gray-400">Submitted at:</span>
        <span class="text-gray-300">{serviceSuggestion.createdAt.toLocaleString()}</span>
--- a/web/src/pages/admin/service-suggestions/index.astro
+++ b/web/src/pages/admin/service-suggestions/index.astro
@@ -2,10 +2,11 @@
 import { Icon } from 'astro-icon/components'
 import { actions } from 'astro:actions'
 import { z } from 'astro:content'
-import { orderBy as lodashOrderBy } from 'lodash-es'
+import { orderBy } from 'lodash-es'

 import SortArrowIcon from '../../../components/SortArrowIcon.astro'
 import TimeFormatted from '../../../components/TimeFormatted.astro'
+import UserBadge from '../../../components/UserBadge.astro'
 import {
  getServiceSuggestionStatusInfo,
  serviceSuggestionStatuses,
@@ -67,8 +68,9 @@ let suggestions = await prisma.serviceSuggestion.findMany({
    createdAt: true,
    user: {
      select: {
-        id: true,
+        displayName: true,
        name: true,
+        picture: true,
      },
    },
    service: {
@@ -120,21 +122,13 @@ let suggestionsWithDetails = suggestions.map((s) => ({
 }))

 if (sortBy === 'service') {
-  suggestionsWithDetails = lodashOrderBy(
-    suggestionsWithDetails,
-    [(s) => s.service.name.toLowerCase()],
-    [sortOrder]
-  )
+  suggestionsWithDetails = orderBy(suggestionsWithDetails, [(s) => s.service.name.toLowerCase()], [sortOrder])
 } else if (sortBy === 'status') {
-  suggestionsWithDetails = lodashOrderBy(suggestionsWithDetails, [(s) => s.statusInfo.label], [sortOrder])
+  suggestionsWithDetails = orderBy(suggestionsWithDetails, [(s) => s.statusInfo.label], [sortOrder])
 } else if (sortBy === 'user') {
-  suggestionsWithDetails = lodashOrderBy(
-    suggestionsWithDetails,
-    [(s) => s.user.name.toLowerCase()],
-    [sortOrder]
-  )
+  suggestionsWithDetails = orderBy(suggestionsWithDetails, [(s) => s.user.name.toLowerCase()], [sortOrder])
 } else if (sortBy === 'messageCount') {
-  suggestionsWithDetails = lodashOrderBy(suggestionsWithDetails, ['messageCount'], [sortOrder])
+  suggestionsWithDetails = orderBy(suggestionsWithDetails, ['messageCount'], [sortOrder])
 }

 const suggestionCount = suggestionsWithDetails.length
@@ -293,9 +287,7 @@ const makeSortUrl = (slug: string) => {
                    </div>
                  </td>
                  <td class="px-4 py-3">
-                    <a href={`/admin/users/${suggestion.user.name}`} class="hover:text-green-500">
-                      {suggestion.user.name}
-                    </a>
+                    <UserBadge user={suggestion.user} size="md" />
                  </td>
                  <td class="px-4 py-3">
                    <form method="POST" action={actions.admin.serviceSuggestions.update}>
--- a/web/src/pages/admin/services/[slug]/edit.astro
+++ b/web/src/pages/admin/services/[slug]/edit.astro
@@ -1,20 +1,23 @@
 ---
-import {
-  AttributeCategory,
-  Currency,
-  EventType,
-  VerificationStatus,
-  VerificationStepStatus,
-} from '@prisma/client'
+import { EventType, VerificationStepStatus } from '@prisma/client'
 import { Icon } from 'astro-icon/components'
 import { actions, isInputError } from 'astro:actions'

-import MyPicture from '../../../../components/MyPicture.astro'
+import InputCardGroup from '../../../../components/InputCardGroup.astro'
+import InputCheckboxGroup from '../../../../components/InputCheckboxGroup.astro'
+import InputImageFile from '../../../../components/InputImageFile.astro'
+import InputSubmitButton from '../../../../components/InputSubmitButton.astro'
+import InputText from '../../../../components/InputText.astro'
+import InputTextArea from '../../../../components/InputTextArea.astro'
+import UserBadge from '../../../../components/UserBadge.astro'
+import { formatContactMethod } from '../../../../constants/contactMethods'
+import { currencies } from '../../../../constants/currencies'
+import { kycLevels } from '../../../../constants/kycLevels'
 import { serviceVisibilities } from '../../../../constants/serviceVisibility'
+import { verificationStatuses } from '../../../../constants/verificationStatus'
 import BaseLayout from '../../../../layouts/BaseLayout.astro'
 import { cn } from '../../../../lib/cn'
 import { prisma } from '../../../../lib/prisma'
-import { ACCEPTED_IMAGE_TYPES } from '../../../../lib/zodUtils'

 const { slug } = Astro.params

@@ -80,9 +83,9 @@ const service = await Astro.locals.banners.try('Error fetching service', () =>
          id: true,
          user: {
            select: {
-              id: true,
              name: true,
              displayName: true,
+              picture: true,
            },
          },
          createdAt: true,
@@ -130,15 +133,7 @@ const attributes = await Astro.locals.banners.try(
  []
 )

-const inputBaseClasses =
-  'w-full rounded-md border-zinc-600 bg-zinc-700/80 p-2 text-zinc-200 placeholder-zinc-400 focus:border-sky-500 focus:ring-1 focus:ring-sky-500 text-sm'
-const labelBaseClasses = 'block text-sm font-medium text-zinc-300 mb-1'
-const errorTextClasses = 'mt-1 text-xs text-red-400'
-const checkboxLabelClasses = 'inline-flex items-center text-sm text-zinc-300'
-const checkboxInputClasses =
-  'rounded-sm border-zinc-500 bg-zinc-700 text-sky-500 focus:ring-sky-500 focus:ring-offset-zinc-800'
-
-// Button style constants
+// Button style constants for admin sections (Events, etc.)
 const buttonPrimaryClasses =
  'inline-flex items-center justify-center rounded-md border border-transparent bg-sky-600 px-3 py-1.5 text-sm font-medium text-white shadow-sm hover:bg-sky-700 focus:outline-none focus:ring-2 focus:ring-sky-500 focus:ring-offset-2 focus:ring-offset-zinc-900'

@@ -159,6 +154,12 @@ const buttonSmallWarningClasses = cn(
  buttonSmallBaseClasses,
  'text-yellow-400 hover:bg-yellow-700/30 hover:text-yellow-300'
 )
+
+// Legacy classes for existing admin forms (Events, Verification Steps, Contact Methods)
+const inputBaseClasses =
+  'w-full rounded-md border-zinc-600 bg-zinc-700/80 p-2 text-zinc-200 placeholder-zinc-400 focus:border-sky-500 focus:ring-1 focus:ring-sky-500 text-sm'
+const labelBaseClasses = 'block text-sm font-medium text-zinc-300 mb-1'
+const errorTextClasses = 'mt-1 text-xs text-red-400'
 ---

 <BaseLayout pageTitle={`Edit Service: ${service.name}`}>
@@ -189,430 +190,227 @@ const buttonSmallWarningClasses = cn(
        enctype="multipart/form-data"
      >
        <input type="hidden" name="id" value={service.id} />
+        <InputText
+          label="Name"
+          name="name"
+          inputProps={{
+            required: true,
+            value: service.name,
+          }}
+          error={serviceInputErrors.name}
+        />
+
+        <InputTextArea
+          label="Description"
+          name="description"
+          inputProps={{
+            required: true,
+            rows: 4,
+          }}
+          value={service.description}
+          error={serviceInputErrors.description}
+        />
+
+        <InputText
+          label="Slug (auto-generated if empty)"
+          name="slug"
+          inputProps={{
+            value: service.slug,
+            class: 'font-title',
+          }}
+          error={serviceInputErrors.slug}
+          class="font-title"
+        />
+
+        <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
+          <InputTextArea
+            label="Service URLs (one per line)"
+            name="serviceUrls"
+            inputProps={{
+              rows: 3,
+              placeholder: 'https://example1.com\nhttps://example2.com',
+            }}
+            value={service.serviceUrls.join('\n')}
+            error={serviceInputErrors.serviceUrls}
+          />
+          <InputTextArea
+            label="ToS URLs (one per line)"
+            name="tosUrls"
+            inputProps={{
+              rows: 3,
+              placeholder: 'https://example1.com/tos\nhttps://example2.com/tos',
+            }}
+            value={service.tosUrls.join('\n')}
+            error={serviceInputErrors.tosUrls}
+          />
+          <InputTextArea
+            label="Onion URLs (one per line)"
+            name="onionUrls"
+            inputProps={{
+              rows: 3,
+              placeholder: 'http://example1.onion\nhttp://example2.onion',
+            }}
+            value={service.onionUrls.join('\n')}
+            error={serviceInputErrors.onionUrls}
+          />
+          <InputTextArea
+            label="I2P URLs (one per line)"
+            name="i2pUrls"
+            inputProps={{
+              rows: 3,
+              placeholder: 'http://example1.b32.i2p\nhttp://example2.b32.i2p',
+            }}
+            value={service.i2pUrls.join('\n')}
+          />
+        </div>
+
        <div>
-          <label for="name" class={labelBaseClasses}>Name</label>
-          <input
-            transition:persist
-            type="text"
-            name="name"
-            id="name"
+          <InputImageFile
+            label="Service Image"
+            name="imageFile"
+            description="Square image. At least 192x192px. Transparency supported. Leave empty to keep current image."
+            error={serviceInputErrors.imageFile}
+            square
+            value={service.imageUrl}
+          />
+        </div>
+
+        <div>
+          <InputCheckboxGroup
+            name="categories"
+            label="Categories"
            required
-            value={service.name}
-            class={inputBaseClasses}
+            options={categories.map((category) => ({
+              label: category.name,
+              value: category.id.toString(),
+              icon: category.icon,
+            }))}
+            selectedValues={service.categories.map((c) => c.id.toString())}
+            error={serviceInputErrors.categories}
          />
-          {serviceInputErrors.name && <p class={errorTextClasses}>{serviceInputErrors.name.join(', ')}</p>}
        </div>

        <div>
-          <label for="description" class={labelBaseClasses}>Description</label>
-          <textarea
-            transition:persist
-            name="description"
-            id="description"
+          <InputCardGroup
+            name="kycLevel"
+            label="KYC Level"
+            options={kycLevels.map((kycLevel) => ({
+              label: `${kycLevel.name} (${kycLevel.value}/4)`,
+              value: kycLevel.id.toString(),
+              icon: kycLevel.icon,
+              description: kycLevel.description,
+            }))}
+            selectedValue={service.kycLevel.toString()}
+            iconSize="md"
+            cardSize="md"
+            error={serviceInputErrors.kycLevel}
+            class="[&>div]:grid-cols-2 [&>div]:[--card-min-size:16rem]"
+          />
+        </div>
+
+        <div>
+          <InputCheckboxGroup
+            name="attributes"
+            label="Attributes"
+            options={attributes.map((attribute) => ({
+              label: `${attribute.title} (${attribute.category})`,
+              value: attribute.id.toString(),
+            }))}
+            selectedValues={service.attributes.map((a) => a.attribute.id.toString())}
+            error={serviceInputErrors.attributes}
+          />
+        </div>
+
+        <div>
+          <InputCardGroup
+            name="verificationStatus"
+            label="Verification Status"
+            options={verificationStatuses.map((status) => ({
+              label: status.label,
+              value: status.value,
+              icon: status.icon,
+              iconClass: status.classNames.icon,
+              description: status.description,
+            }))}
+            selectedValue={service.verificationStatus}
+            error={serviceInputErrors.verificationStatus}
+            cardSize="md"
+            iconSize="md"
+            class="[&>div]:grid-cols-2 [&>div]:[--card-min-size:16rem]"
+          />
+        </div>
+
+        <div>
+          <InputCardGroup
+            name="acceptedCurrencies"
+            label="Accepted Currencies"
+            options={currencies.map((currency) => ({
+              label: currency.name,
+              value: currency.id,
+              icon: currency.icon,
+            }))}
+            selectedValue={service.acceptedCurrencies}
+            error={serviceInputErrors.acceptedCurrencies}
            required
-            rows={4}
-            class={inputBaseClasses}
-            set:text={service.description}
+            multiple
          />
-          {
-            serviceInputErrors.description && (
-              <p class={errorTextClasses}>{serviceInputErrors.description.join(', ')}</p>
-            )
-          }
        </div>

        <div>
-          <label for="slug" class={cn(labelBaseClasses, 'font-title')}>Slug (auto-generated if empty)</label>
-          <input
-            transition:persist
-            type="text"
-            name="slug"
-            id="slug"
-            value={service.slug}
-            class={cn(inputBaseClasses, 'font-title')}
-          />
-          {serviceInputErrors.slug && <p class={errorTextClasses}>{serviceInputErrors.slug.join(', ')}</p>}
-        </div>
-
-        <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
-          <div>
-            <label for="serviceUrls" class={labelBaseClasses}>Service URLs (one per line)</label>
-            <textarea
-              transition:persist
-              class={inputBaseClasses}
-              name="serviceUrls"
-              id="serviceUrls"
-              rows={3}
-              placeholder="https://example1.com\nhttps://example2.com"
-              set:text={service.serviceUrls.join('\n')}
-            />
-            {
-              serviceInputErrors.serviceUrls && (
-                <p class={errorTextClasses}>{serviceInputErrors.serviceUrls.join(', ')}</p>
-              )
-            }
-          </div>
-          <div>
-            <label for="tosUrls" class={labelBaseClasses}>ToS URLs (one per line)</label>
-            <textarea
-              transition:persist
-              class={inputBaseClasses}
-              name="tosUrls"
-              id="tosUrls"
-              rows={3}
-              placeholder="https://example1.com/tos\nhttps://example2.com/tos"
-              set:text={service.tosUrls.join('\n')}
-            />
-            {
-              serviceInputErrors.tosUrls && (
-                <p class={errorTextClasses}>{serviceInputErrors.tosUrls.join(', ')}</p>
-              )
-            }
-          </div>
-          <div>
-            <label for="onionUrls" class={labelBaseClasses}>Onion URLs (one per line)</label>
-            <textarea
-              transition:persist
-              class={inputBaseClasses}
-              name="onionUrls"
-              id="onionUrls"
-              rows={3}
-              placeholder="http://example1.onion\nhttp://example2.onion"
-              set:text={service.onionUrls.join('\n')}
-            />
-            {
-              serviceInputErrors.onionUrls && (
-                <p class={errorTextClasses}>{serviceInputErrors.onionUrls.join(', ')}</p>
-              )
-            }
-          </div>
-          <div>
-            <label for="i2pUrls" class={labelBaseClasses}>I2P URLs (one per line)</label>
-            <textarea
-              transition:persist
-              class={inputBaseClasses}
-              name="i2pUrls"
-              id="i2pUrls"
-              rows={3}
-              placeholder="http://example1.b32.i2p\nhttp://example2.b32.i2p"
-              set:text={service.i2pUrls.join('\n')}
-            />
-            {/* Assuming i2pUrls might have errors, add error display if schema supports it */}
-            {
-              /* serviceInputErrors.i2pUrls && (
-              <p class={errorTextClasses}>{serviceInputErrors.i2pUrls.join(', ')}</p>
-            ) */
-            }
-          </div>
-        </div>
-
-        <div>
-          <div class="flex items-end gap-4">
-            <div class="grow">
-              <label for="imageFile" class={labelBaseClasses}>Service Image</label>
-              <div class="space-y-1">
-                <input
-                  transition:persist
-                  type="file"
-                  name="imageFile"
-                  id="imageFile"
-                  accept={ACCEPTED_IMAGE_TYPES.join(',')}
-                  class={cn(
-                    inputBaseClasses,
-                    'p-0 file:mr-3 file:rounded-md file:border-0 file:bg-zinc-600 file:px-3 file:py-2 file:font-medium file:text-zinc-200 hover:file:bg-zinc-500'
-                  )}
-                />
-                <p class="text-xs text-zinc-400">
-                  Leave empty to keep the current image. Square images (e.g., 256x256) recommended.
-                </p>
-              </div>
-              {
-                serviceInputErrors.imageFile && (
-                  <p class={errorTextClasses}>{serviceInputErrors.imageFile.join(', ')}</p>
-                )
-              }
-            </div>
-            {
-              service.imageUrl ? (
-                <div class="mt-2 shrink-0">
-                  <MyPicture
-                    src={service.imageUrl}
-                    alt="Current service image"
-                    width={100}
-                    height={100}
-                    class="h-24 w-24 rounded-md border border-zinc-600 object-cover"
-                  />
-                </div>
-              ) : (
-                <div class="flex h-24 w-24 shrink-0 items-center justify-center rounded-lg border border-zinc-600 bg-zinc-700/50 text-3xl leading-none text-zinc-500">
-                  <Icon name="ri:image-add-line" class="size-10" />
-                </div>
-              )
-            }
-          </div>
-        </div>
-
-        <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
-          <div>
-            <label class={labelBaseClasses} for="categories">Categories</label>
-            <div
-              class="mt-1 max-h-48 space-y-1 space-x-2 overflow-y-auto rounded-md border border-zinc-600 bg-zinc-700/30 p-3"
-            >
-              {
-                categories.map((category) => (
-                  <label class={checkboxLabelClasses}>
-                    <input
-                      transition:persist
-                      type="checkbox"
-                      name="categories"
-                      value={category.id}
-                      checked={service.categories.some((c) => c.id === category.id)}
-                      class={cn(checkboxInputClasses, 'mr-1')}
-                    />
-                    <span>{category.name}</span>
-                  </label>
-                ))
-              }
-            </div>
-            {
-              serviceInputErrors.categories && (
-                <p class={errorTextClasses}>{serviceInputErrors.categories.join(', ')}</p>
-              )
-            }
-          </div>
-
-          <div>
-            <label for="kycLevel" class={labelBaseClasses}>KYC Level (0-4)</label>
-            <input
-              transition:persist
-              class={inputBaseClasses}
-              type="number"
-              name="kycLevel"
-              id="kycLevel"
-              min={0}
-              max={4}
-              value={service.kycLevel}
-            />
-            {
-              serviceInputErrors.kycLevel && (
-                <p class={errorTextClasses}>{serviceInputErrors.kycLevel.join(', ')}</p>
-              )
-            }
-          </div>
-        </div>
-
-        <div>
-          <label class={labelBaseClasses} for="attributes">Attributes</label>
-          <div class="space-y-3">
-            {
-              Object.values(AttributeCategory).map((categoryValue) => (
-                <div class="rounded-md border border-zinc-700 bg-zinc-700/30 p-4">
-                  <h4 class="font-title text-md mb-2 font-medium text-zinc-200">{categoryValue}</h4>
-                  <div class="grid grid-cols-1 gap-x-4 gap-y-1 sm:grid-cols-2">
-                    {attributes
-                      .filter((attr) => attr.category === categoryValue)
-                      .map((attr) => (
-                        <label class={checkboxLabelClasses}>
-                          <input
-                            transition:persist
-                            type="checkbox"
-                            name="attributes"
-                            value={attr.id}
-                            checked={service.attributes.some((a) => a.attribute.id === attr.id)}
-                            class={cn(checkboxInputClasses, 'mr-2')}
-                          />
-                          <span class="flex items-center gap-1.5">
-                            {attr.title}
-                            <span
-                              class={cn(
-                                'rounded-sm border px-1 py-0.5 text-xs font-medium',
-                                {
-                                  'border-green-500/50 bg-green-500/20 text-green-300': attr.type === 'GOOD',
-                                },
-                                {
-                                  'border-red-500/50 bg-red-500/20 text-red-300': attr.type === 'BAD',
-                                },
-                                {
-                                  'border-yellow-500/50 bg-yellow-500/20 text-yellow-300':
-                                    attr.type === 'WARNING',
-                                },
-                                {
-                                  'border-sky-500/50 bg-sky-500/20 text-sky-300': attr.type === 'INFO',
-                                }
-                              )}
-                            >
-                              {attr.type}
-                            </span>
-                          </span>
-                        </label>
-                      ))}
-                  </div>
-                  {serviceInputErrors.attributes && (
-                    <p class={errorTextClasses}>{serviceInputErrors.attributes.join(', ')}</p>
-                  )}
-                </div>
-              ))
-            }
-          </div>
-        </div>
-
-        <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
-          <div>
-            <label class={labelBaseClasses} for="verificationStatus">Verification Status</label>
-            <select
-              transition:persist
-              class={inputBaseClasses}
-              name="verificationStatus"
-              id="verificationStatus"
-            >
-              {
-                Object.values(VerificationStatus).map((status) => (
-                  <option value={status} selected={service.verificationStatus === status}>
-                    {status}
-                  </option>
-                ))
-              }
-            </select>
-            {
-              serviceInputErrors.verificationStatus && (
-                <p class={errorTextClasses}>{serviceInputErrors.verificationStatus.join(', ')}</p>
-              )
-            }
-          </div>
-
-          <div>
-            <label class={labelBaseClasses} for="acceptedCurrencies">Accepted Currencies</label>
-            <div
-              class="mt-1 max-h-32 space-y-1 space-x-2 overflow-y-auto rounded-md border border-zinc-600 bg-zinc-700/30 p-3"
-            >
-              {
-                Object.values(Currency).map((currency) => (
-                  <label class={checkboxLabelClasses}>
-                    <input
-                      transition:persist
-                      type="checkbox"
-                      name="acceptedCurrencies"
-                      value={currency}
-                      checked={service.acceptedCurrencies.includes(currency)}
-                      class={cn(checkboxInputClasses, 'mr-1')}
-                    />
-                    <span>{currency}</span>
-                  </label>
-                ))
-              }
-            </div>
-            {
-              serviceInputErrors.acceptedCurrencies && (
-                <p class={errorTextClasses}>{serviceInputErrors.acceptedCurrencies.join(', ')}</p>
-              )
-            }
-          </div>
-        </div>
-
-        <div>
-          <label class={labelBaseClasses} for="verificationSummary">Verification Summary (Markdown)</label>
-          <textarea
-            transition:persist
-            class={inputBaseClasses}
+          <InputTextArea
+            label="Verification Summary (Markdown)"
            name="verificationSummary"
-            id="verificationSummary"
-            rows={4}
-            set:text={service.verificationSummary}
+            inputProps={{
+              rows: 4,
+            }}
+            value={service.verificationSummary ?? undefined}
+            error={serviceInputErrors.verificationSummary}
          />
-          {
-            serviceInputErrors.verificationSummary && (
-              <p class={errorTextClasses}>{serviceInputErrors.verificationSummary.join(', ')}</p>
-            )
-          }
        </div>

        <div>
-          <label class={labelBaseClasses} for="verificationProofMd">Verification Proof (Markdown)</label>
-          <textarea
-            transition:persist
-            class={inputBaseClasses}
+          <InputTextArea
+            label="Verification Proof (Markdown)"
            name="verificationProofMd"
-            id="verificationProofMd"
-            rows={8}
-            set:text={service.verificationProofMd}
+            inputProps={{
+              rows: 8,
+            }}
+            value={service.verificationProofMd ?? undefined}
+            error={serviceInputErrors.verificationProofMd}
          />
-          {
-            serviceInputErrors.verificationProofMd && (
-              <p class={errorTextClasses}>{serviceInputErrors.verificationProofMd.join(', ')}</p>
-            )
-          }
        </div>

        <div>
-          <label class={labelBaseClasses} for="referral">Referral Code/Link (Optional)</label>
-          <input
-            transition:persist
-            type="text"
+          <InputText
+            label="Referral Code/Link (Optional)"
            name="referral"
-            id="referral"
-            value={service.referral}
-            placeholder="e.g., REFCODE123 or https://example.com?ref=123"
-            class={inputBaseClasses}
+            inputProps={{
+              value: service.referral ?? undefined,
+              placeholder: 'e.g., REFCODE123 or https://example.com?ref=123',
+            }}
+            error={serviceInputErrors.referral}
          />
-          {
-            serviceInputErrors.referral && (
-              <p class={errorTextClasses}>{serviceInputErrors.referral.join(', ')}</p>
-            )
-          }
        </div>

        <div>
-          <label class={labelBaseClasses} for="serviceVisibility">Service Visibility</label>
-          <div class="grid grid-cols-1 gap-3 sm:grid-cols-3">
-            {
-              serviceVisibilities.map((visibility) => (
-                <div class="contents">
-                  <input
-                    transition:persist
-                    type="radio"
-                    name="serviceVisibility"
-                    id={`serviceVisibility-${visibility.value}`}
-                    value={visibility.value}
-                    checked={service.serviceVisibility === visibility.value}
-                    class="peer sr-only"
-                  />
-                  <label
-                    for={`serviceVisibility-${visibility.value}`}
-                    class="group relative cursor-pointer items-start gap-3 rounded-lg border border-zinc-700 bg-zinc-700/50 p-3 transition-all peer-checked:border-sky-500 peer-checked:bg-sky-500/20 peer-checked:ring-1 peer-checked:ring-sky-500 hover:bg-zinc-700/80"
-                  >
-                    <div class="mb-1 flex items-center gap-1.5">
-                      <Icon
-                        name={visibility.icon}
-                        class={cn(
-                          'size-4 text-zinc-300 group-peer-checked:text-sky-400',
-                          visibility.iconClass
-                        )}
-                      />
-                      <span class="text-sm font-medium text-zinc-200 group-peer-checked:text-sky-300">
-                        {visibility.label}
-                      </span>
-                    </div>
-                    <p class="text-xs leading-snug text-zinc-400 group-peer-checked:text-sky-400/80">
-                      {visibility.description}
-                    </p>
-                  </label>
-                </div>
-              ))
-            }
-          </div>
-          {
-            serviceInputErrors.serviceVisibility && (
-              <p class={errorTextClasses}>{serviceInputErrors.serviceVisibility.join(', ')}</p>
-            )
-          }
+          <InputCardGroup
+            name="serviceVisibility"
+            label="Service Visibility"
+            options={serviceVisibilities.map((visibility) => ({
+              label: visibility.label,
+              value: visibility.value,
+              icon: visibility.icon,
+              iconClass: visibility.iconClass,
+              description: visibility.description,
+            }))}
+            selectedValue={service.serviceVisibility}
+            error={serviceInputErrors.serviceVisibility}
+            cardSize="md"
+            iconSize="md"
+          />
        </div>

-        <button
-          type="submit"
-          class="inline-flex justify-center rounded-md border border-transparent bg-sky-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-sky-700 focus:ring-2 focus:ring-sky-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
-        >
-          Update Service
-        </button>
+        <InputSubmitButton label="Update Service" />
      </form>
    </section>

@@ -1183,7 +981,9 @@ const buttonSmallWarningClasses = cn(
                <tbody class="divide-y divide-zinc-700/80">
                  {service.verificationRequests.map((request) => (
                    <tr class="transition-colors hover:bg-zinc-700/40">
-                      <td class="p-3 text-zinc-300">{request.user.displayName ?? request.user.name}</td>
+                      <td class="p-3 text-zinc-300">
+                        <UserBadge user={request.user} size="md" />
+                      </td>
                      <td class="p-3 text-zinc-400">{new Date(request.createdAt).toLocaleString()}</td>
                    </tr>
                  ))}
@@ -1210,114 +1010,97 @@ const buttonSmallWarningClasses = cn(
          service.contactMethods.length > 0 && (
            <div class="space-y-3">
              <h3 class="font-title mb-2 text-lg font-medium text-zinc-200">Existing Contact Methods</h3>
-              {service.contactMethods.map((method) => (
-                <div class="rounded-md border border-zinc-700 bg-zinc-700/30 p-3">
-                  <div class="flex items-start justify-between gap-3">
-                    <div class="flex-grow space-y-1">
-                      <div class="flex flex-wrap items-center gap-2">
-                        <Icon name={method.iconId} class="size-4 text-zinc-300" />
-                        <span class="text-md font-semibold text-zinc-100">{method.label}</span>
+              {service.contactMethods.map((method) => {
+                const contactMethodInfo = formatContactMethod(method.value)
+                return (
+                  <div class="rounded-md border border-zinc-700 bg-zinc-700/30 p-3">
+                    <div class="flex items-start justify-between gap-3">
+                      <div class="flex-grow space-y-1">
+                        <div class="flex flex-wrap items-center gap-2">
+                          <Icon name={contactMethodInfo.icon} class="size-4 text-zinc-300" />
+                          <span class="text-md font-semibold text-zinc-100">
+                            {method.label ?? contactMethodInfo.label}
+                          </span>
+                        </div>
+                        <p class="text-sm text-pretty text-zinc-400">
+                          {contactMethodInfo.formattedValue}{' '}
+                          <span class="text-zinc-500">({method.value})</span>
+                        </p>
                      </div>
-                      <p class="text-sm text-pretty text-zinc-400">{method.value}</p>
-                      {method.info && <p class="text-xs text-zinc-500">{method.info}</p>}
-                    </div>
-                    <div class="flex shrink-0 gap-1.5">
-                      <button
-                        type="button"
-                        class={buttonSmallPrimaryClasses}
-                        title="Edit Contact Method"
-                        onclick={`document.getElementById('edit-contact-method-${method.id}')?.classList.toggle('hidden')`}
-                      >
-                        <Icon name="ri:pencil-line" class="size-4" />
-                      </button>
-                      <form method="POST" action={actions.admin.service.deleteContactMethod} class="inline">
-                        <input type="hidden" name="id" value={method.id} />
+                      <div class="flex shrink-0 gap-1.5">
                        <button
-                          type="submit"
-                          class={buttonSmallDestructiveClasses}
-                          title="Delete Contact Method"
+                          type="button"
+                          class={buttonSmallPrimaryClasses}
+                          title="Edit Contact Method"
+                          onclick={`document.getElementById('edit-contact-method-${method.id}')?.classList.toggle('hidden')`}
                        >
-                          <Icon name="ri:delete-bin-line" class="size-4" />
+                          <Icon name="ri:pencil-line" class="size-4" />
                        </button>
-                      </form>
+                        <form method="POST" action={actions.admin.service.deleteContactMethod} class="inline">
+                          <input type="hidden" name="id" value={method.id} />
+                          <button
+                            type="submit"
+                            class={buttonSmallDestructiveClasses}
+                            title="Delete Contact Method"
+                          >
+                            <Icon name="ri:delete-bin-line" class="size-4" />
+                          </button>
+                        </form>
+                      </div>
                    </div>
-                  </div>

-                  {/* Edit Contact Method Form - Hidden by default */}
-                  <form
-                    id={`edit-contact-method-${method.id}`}
-                    method="POST"
-                    action={actions.admin.service.updateContactMethod}
-                    class="mt-3 hidden space-y-3 rounded-md border border-zinc-600 bg-zinc-700/40 p-3"
-                  >
-                    <input type="hidden" name="id" value={method.id} />
-                    <input type="hidden" name="serviceId" value={service.id} />
-                    <div>
-                      <label for={`contactLabel-${method.id}`} class={labelBaseClasses}>
-                        Label
-                      </label>
-                      <input
-                        type="text"
-                        name="label"
-                        id={`contactLabel-${method.id}`}
-                        value={method.label}
-                        class={inputBaseClasses}
-                      />
-                    </div>
-                    <div>
-                      <label for={`contactValue-${method.id}`} class={labelBaseClasses}>
-                        Value (with protocol)
-                      </label>
-                      <input
-                        type="text"
-                        name="value"
-                        id={`contactValue-${method.id}`}
-                        value={method.value}
-                        placeholder="e.g., mailto:contact@example.com or https://t.me/example"
-                        class={inputBaseClasses}
-                      />
-                    </div>
-                    <div>
-                      <label for={`contactIcon-${method.id}`} class={labelBaseClasses}>
-                        Icon ID
-                      </label>
-                      <input
-                        type="text"
-                        name="iconId"
-                        id={`contactIcon-${method.id}`}
-                        value={method.iconId}
-                        placeholder="e.g., ri:mail-line or ri:telegram-line"
-                        class={inputBaseClasses}
-                      />
-                    </div>
-                    <div>
-                      <label for={`contactInfo-${method.id}`} class={labelBaseClasses}>
-                        Additional Info (Optional)
-                      </label>
-                      <input
-                        type="text"
-                        name="info"
-                        id={`contactInfo-${method.id}`}
-                        value={method.info}
-                        placeholder="e.g., Available 24/7 or Response within 24h"
-                        class={inputBaseClasses}
-                      />
-                    </div>
-                    <div class="mt-2 flex justify-end gap-2">
-                      <button
-                        type="button"
-                        class={buttonSmallSecondaryClasses}
-                        onclick={`document.getElementById('edit-contact-method-${method.id}')?.classList.add('hidden')`}
-                      >
-                        Cancel
-                      </button>
-                      <button type="submit" class={buttonSmallPrimaryClasses}>
-                        Update Contact Method
-                      </button>
-                    </div>
-                  </form>
-                </div>
-              ))}
+                    {/* Edit Contact Method Form - Hidden by default */}
+                    <form
+                      id={`edit-contact-method-${method.id}`}
+                      method="POST"
+                      action={actions.admin.service.updateContactMethod}
+                      class="mt-3 hidden space-y-3 rounded-md border border-zinc-600 bg-zinc-700/40 p-3"
+                    >
+                      <input type="hidden" name="id" value={method.id} />
+                      <input type="hidden" name="serviceId" value={service.id} />
+                      <div>
+                        <label for={`contactLabel-${method.id}`} class={labelBaseClasses}>
+                          Override Label (Optional)
+                        </label>
+                        <input
+                          type="text"
+                          name="label"
+                          id={`contactLabel-${method.id}`}
+                          value={method.label}
+                          class={inputBaseClasses}
+                          placeholder={contactMethodInfo.label}
+                        />
+                      </div>
+                      <div>
+                        <label for={`contactValue-${method.id}`} class={labelBaseClasses}>
+                          Value (with protocol)
+                        </label>
+                        <input
+                          type="text"
+                          name="value"
+                          id={`contactValue-${method.id}`}
+                          value={method.value}
+                          placeholder="e.g., mailto:contact@example.com or https://t.me/example"
+                          class={inputBaseClasses}
+                        />
+                      </div>
+
+                      <div class="mt-2 flex justify-end gap-2">
+                        <button
+                          type="button"
+                          class={buttonSmallSecondaryClasses}
+                          onclick={`document.getElementById('edit-contact-method-${method.id}')?.classList.add('hidden')`}
+                        >
+                          Cancel
+                        </button>
+                        <button type="submit" class={buttonSmallPrimaryClasses}>
+                          Update Contact Method
+                        </button>
+                      </div>
+                    </form>
+                  </div>
+                )
+              })}
            </div>
          )
        }
@@ -1341,8 +1124,8 @@ const buttonSmallWarningClasses = cn(
          >
            <input type="hidden" name="serviceId" value={service.id} />
            <div>
-              <label for="newContactLabel" class={labelBaseClasses}>Label</label>
-              <input type="text" name="label" id="newContactLabel" required class={inputBaseClasses} />
+              <label for="newContactLabel" class={labelBaseClasses}>Override Label (Optional)</label>
+              <input type="text" name="label" id="newContactLabel" class={inputBaseClasses} />
            </div>
            <div>
              <label for="newContactValue" class={labelBaseClasses}>Value (with protocol)</label>
@@ -1355,27 +1138,7 @@ const buttonSmallWarningClasses = cn(
                class={inputBaseClasses}
              />
            </div>
-            <div>
-              <label for="newContactIcon" class={labelBaseClasses}>Icon ID</label>
-              <input
-                type="text"
-                name="iconId"
-                id="newContactIcon"
-                required
-                placeholder="e.g., ri:mail-line or ri:telegram-line"
-                class={inputBaseClasses}
-              />
-            </div>
-            <div>
-              <label for="newContactInfo" class={labelBaseClasses}>Additional Info (Optional)</label>
-              <input
-                type="text"
-                name="info"
-                id="newContactInfo"
-                placeholder="e.g., Available 24/7 or Response within 24h"
-                class={inputBaseClasses}
-              />
-            </div>
+
            <button type="submit" class={buttonPrimaryClasses}>Add Contact Method</button>
          </form>
        </details>
--- a/web/src/pages/admin/users/[username].astro
+++ b/web/src/pages/admin/users/[username].astro
@@ -116,7 +116,7 @@ if (!user) return Astro.rewrite('/404')
 ---

 <BaseLayout
-  pageTitle={`User: ${user.name}`}
+  pageTitle={`${user.displayName ?? user.name} - User`}
  widthClassName="max-w-screen-lg"
  className={{ main: 'space-y-24' }}
 >
--- a/web/src/pages/admin/users/index.astro
+++ b/web/src/pages/admin/users/index.astro
@@ -6,11 +6,13 @@ import { orderBy as lodashOrderBy } from 'lodash-es'
 import SortArrowIcon from '../../../components/SortArrowIcon.astro'
 import TimeFormatted from '../../../components/TimeFormatted.astro'
 import Tooltip from '../../../components/Tooltip.astro'
+import UserBadge from '../../../components/UserBadge.astro'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
 import { zodParseQueryParamsStoringErrors } from '../../../lib/parseUrlFilters'
 import { pluralize } from '../../../lib/pluralize'
 import { prisma } from '../../../lib/prisma'
 import { formatDateShort } from '../../../lib/timeAgo'
+import { urlWithParams } from '../../../lib/urls'

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

@@ -74,6 +76,8 @@ const dbUsers = await prisma.user.findMany({
  select: {
    id: true,
    name: true,
+    displayName: true,
+    picture: true,
    verified: true,
    admin: true,
    verifier: true,
@@ -103,14 +107,11 @@ const users =
    ? lodashOrderBy(dbUsers, [(u) => (u.admin ? 'admin' : 'user')], [filters['sort-order']])
    : dbUsers

-const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
-  const currentSortBy = filters['sort-by']
-  const currentSortOrder = filters['sort-order']
-  const newSortOrder = currentSortBy === slug && currentSortOrder === 'asc' ? 'desc' : 'asc'
-  const searchParams = new URLSearchParams(Astro.url.search)
-  searchParams.set('sort-by', slug)
-  searchParams.set('sort-order', newSortOrder)
-  return `/admin/users?${searchParams.toString()}`
+const makeSortUrl = (sortBy: NonNullable<(typeof filters)['sort-by']>) => {
+  return urlWithParams(Astro.url, {
+    'sort-by': sortBy,
+    'sort-order': filters['sort-by'] === sortBy && filters['sort-order'] === 'asc' ? 'desc' : 'asc',
+  })
 }
 ---

@@ -241,10 +242,10 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
                  class={`group hover:bg-zinc-700/30 ${user.spammer ? 'bg-red-900/10' : ''}`}
                >
                  <td class="px-4 py-3 text-sm font-medium text-zinc-200">
-                    <div>{user.name}</div>
+                    <UserBadge user={user} size="md" class="flex text-white" />
                    {user.internalNotes.length > 0 && (
                      <Tooltip
-                        class="text-2xs mt-1 text-yellow-400"
+                        class="text-2xs font-light text-yellow-200/40"
                        position="right"
                        text={user.internalNotes
                          .map(
@@ -257,7 +258,7 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
                          )
                          .join('\n\n')}
                      >
-                        <Icon name="ri:sticky-note-line" class="mr-1 inline-block size-3" />
+                        <Icon name="ri:sticky-note-line" class="mr-0.5 inline-block size-3" />
                        {user.internalNotes.length} internal {pluralize('note', user.internalNotes.length)}
                      </Tooltip>
                    )}
--- a/web/src/pages/events.astro
+++ b/web/src/pages/events.astro
@@ -169,7 +169,7 @@ const createUrlWithoutFilter = (paramName: keyof typeof params) => {
      '[&:has(~[data-has-default-filters="true"])_[data-clear-filters-button]]:hidden'
    )}
    hx-get={Astro.url.pathname}
-    hx-trigger="input from:input, keyup[key=='Enter'], change from:select"
+    hx-trigger="input from:find input, keyup[key=='Enter'], change from:find select"
    hx-target="#events-list-container"
    hx-select="#events-list-container"
    hx-swap="outerHTML"
--- a/web/src/pages/health.ts
+++ b/web/src/pages/health.ts
@@ -0,0 +1,16 @@
+import type { APIRoute } from 'astro'
+
+export const GET: APIRoute = () => {
+  return new Response(
+    JSON.stringify({
+      message: 'OK',
+      timestamp: new Date().toISOString(),
+    }),
+    {
+      status: 200,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    }
+  )
+}
--- a/web/src/pages/index.astro
+++ b/web/src/pages/index.astro
@@ -1,14 +1,16 @@
 ---
 import { ServiceVisibility } from '@prisma/client'
 import { z } from 'astro:schema'
-import { groupBy, orderBy } from 'lodash-es'
+import { groupBy, omit, orderBy, uniq } from 'lodash-es'
 import seedrandom from 'seedrandom'

 import Button from '../components/Button.astro'
+import InputText from '../components/InputText.astro'
 import Pagination from '../components/Pagination.astro'
 import ServiceFiltersPill from '../components/ServiceFiltersPill.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,
@@ -26,6 +28,7 @@ import {
 import BaseLayout from '../layouts/BaseLayout.astro'
 import { areEqualArraysWithoutOrder, zodEnumFromConstant } from '../lib/arrays'
 import { parseIntWithFallback } from '../lib/numbers'
+import { areEqualObjectsWithoutOrder } from '../lib/objects'
 import { zodParseQueryParamsStoringErrors } from '../lib/parseUrlFilters'
 import { prisma } from '../lib/prisma'
 import { makeSortSeed } from '../lib/sortSeed'
@@ -130,9 +133,12 @@ const attributeOptions = [
  prefix: string
 }[]

+const ignoredKeysForDefaultData = ['sort-seed']
+
 const {
  data: filters,
  hasDefaultData: hasDefaultFilters,
+  defaultData: defaultFilters,
  redirectUrl,
 } = zodParseQueryParamsStoringErrors(
  {
@@ -164,7 +170,7 @@ const {
  },
  Astro,
  {
-    ignoredKeysForDefaultData: ['sort-seed'],
+    ignoredKeysForDefaultData,
    cleanUrl: {
      removeUneededObjectParams: true,
      removeParams: {
@@ -181,11 +187,130 @@ const {
  }
 )

+const hasDefaultFiltersIgnoringQ = areEqualObjectsWithoutOrder(
+  omit(filters, [...ignoredKeysForDefaultData, 'q']),
+  omit(defaultFilters, [...ignoredKeysForDefaultData, 'q'])
+)
+
 if (redirectUrl) return Astro.redirect(redirectUrl.toString())

+const includeScams =
+  !!filters.q &&
+  (areEqualArraysWithoutOrder(filters.verification, ['VERIFICATION_SUCCESS', 'APPROVED']) ||
+    areEqualArraysWithoutOrder(filters.verification, [
+      'VERIFICATION_SUCCESS',
+      'APPROVED',
+      'COMMUNITY_CONTRIBUTED',
+    ]))
+
 export type ServicesFiltersObject = typeof filters

-const [categories, [services, totalServices, hadToIncludeCommunityContributed]] =
+const groupedAttributes = groupBy(
+  Object.entries(filters.attr ?? {}).flatMap(([key, value]) => {
+    const id = parseIntWithFallback(key)
+    if (id === null) return []
+    return [{ id, value }]
+  }),
+  'value'
+)
+
+const where = {
+  listedAt: {
+    lte: new Date(),
+  },
+  categories: filters.categories.length ? { some: { slug: { in: filters.categories } } } : undefined,
+  verificationStatus: {
+    in: includeScams ? uniq([...filters.verification, 'VERIFICATION_FAILED'] as const) : filters.verification,
+  },
+  serviceVisibility: ServiceVisibility.PUBLIC,
+  overallScore: { gte: filters['min-score'] },
+  acceptedCurrencies: filters.currencies.length
+    ? filters['currency-mode'] === 'and'
+      ? { hasEvery: filters.currencies }
+      : { hasSome: filters.currencies }
+    : undefined,
+  kycLevel: {
+    lte: filters['max-kyc'],
+  },
+  AND: [
+    ...(filters['user-rating'] > 0
+      ? [
+          {
+            averageUserRating: {
+              gte: filters['user-rating'],
+            },
+          } satisfies Prisma.ServiceWhereInput,
+        ]
+      : []),
+    ...(filters.q
+      ? [
+          {
+            OR: [
+              { name: { contains: filters.q, mode: 'insensitive' as const } },
+              { description: { contains: filters.q, mode: 'insensitive' as const } },
+            ],
+          } satisfies Prisma.ServiceWhereInput,
+        ]
+      : []),
+    ...(filters.networks.length
+      ? [
+          {
+            OR: [
+              ...(filters.networks.includes('onion') ? [{ onionUrls: { isEmpty: false } }] : []),
+              ...(filters.networks.includes('i2p') ? [{ i2pUrls: { isEmpty: false } }] : []),
+              ...(filters.networks.includes('clearnet') ? [{ serviceUrls: { isEmpty: false } }] : []),
+            ],
+          } satisfies Prisma.ServiceWhereInput,
+        ]
+      : []),
+    ...(filters.attr && (groupedAttributes.yes?.length ?? 0) + (groupedAttributes.no?.length ?? 0) > 0
+      ? [
+          {
+            AND: [
+              ...(groupedAttributes.yes && groupedAttributes.yes.length > 0
+                ? [
+                    {
+                      [filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.yes.map(
+                        ({ id }) =>
+                          ({
+                            attributes: {
+                              some: {
+                                attribute: {
+                                  id,
+                                },
+                              },
+                            },
+                          }) satisfies Prisma.ServiceWhereInput
+                      ),
+                    },
+                  ]
+                : []),
+              ...(groupedAttributes.no && groupedAttributes.no.length > 0
+                ? [
+                    {
+                      [filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.no.map(
+                        ({ id }) =>
+                          ({
+                            attributes: {
+                              none: {
+                                attribute: {
+                                  id,
+                                },
+                              },
+                            },
+                          }) satisfies Prisma.ServiceWhereInput
+                      ),
+                    },
+                  ]
+                : []),
+            ],
+          },
+        ]
+      : []),
+  ],
+} as const satisfies Prisma.ServiceWhereInput
+
+const [categories, [services, totalServices], countCommunityOnly, attributes] =
  await Astro.locals.banners.tryMany([
    [
      'Unable to load category filters.',
@@ -206,146 +331,16 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
    [
      'Unable to load services.',
      async () => {
-        const groupedAttributes = groupBy(
-          Object.entries(filters.attr ?? {}).flatMap(([key, value]) => {
-            const id = parseIntWithFallback(key)
-            if (id === null) return []
-            return [{ id, value }]
-          }),
-          'value'
-        )
-        const where = {
-          listedAt: {
-            lte: new Date(),
-          },
-          categories: filters.categories.length ? { some: { slug: { in: filters.categories } } } : undefined,
-          verificationStatus: {
-            in: filters.verification,
-          },
-          serviceVisibility: ServiceVisibility.PUBLIC,
-          overallScore: { gte: filters['min-score'] },
-          acceptedCurrencies: filters.currencies.length
-            ? filters['currency-mode'] === 'and'
-              ? { hasEvery: filters.currencies }
-              : { hasSome: filters.currencies }
-            : undefined,
-          kycLevel: {
-            lte: filters['max-kyc'],
-          },
-          AND: [
-            ...(filters['user-rating'] > 0
-              ? [
-                  {
-                    averageUserRating: {
-                      gte: filters['user-rating'],
-                    },
-                  } satisfies Prisma.ServiceWhereInput,
-                ]
-              : []),
-            ...(filters.q
-              ? [
-                  {
-                    OR: [
-                      { name: { contains: filters.q, mode: 'insensitive' as const } },
-                      { description: { contains: filters.q, mode: 'insensitive' as const } },
-                    ],
-                  } satisfies Prisma.ServiceWhereInput,
-                ]
-              : []),
-            ...(filters.networks.length
-              ? [
-                  {
-                    OR: [
-                      ...(filters.networks.includes('onion') ? [{ onionUrls: { isEmpty: false } }] : []),
-                      ...(filters.networks.includes('i2p') ? [{ i2pUrls: { isEmpty: false } }] : []),
-                      ...(filters.networks.includes('clearnet') ? [{ serviceUrls: { isEmpty: false } }] : []),
-                    ],
-                  } satisfies Prisma.ServiceWhereInput,
-                ]
-              : []),
-            ...(filters.attr && (groupedAttributes.yes?.length ?? 0) + (groupedAttributes.no?.length ?? 0) > 0
-              ? [
-                  {
-                    AND: [
-                      ...(groupedAttributes.yes && groupedAttributes.yes.length > 0
-                        ? [
-                            {
-                              [filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.yes.map(
-                                ({ id }) =>
-                                  ({
-                                    attributes: {
-                                      some: {
-                                        attribute: {
-                                          id,
-                                        },
-                                      },
-                                    },
-                                  }) satisfies Prisma.ServiceWhereInput
-                              ),
-                            },
-                          ]
-                        : []),
-                      ...(groupedAttributes.no && groupedAttributes.no.length > 0
-                        ? [
-                            {
-                              [filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.no.map(
-                                ({ id }) =>
-                                  ({
-                                    attributes: {
-                                      none: {
-                                        attribute: {
-                                          id,
-                                        },
-                                      },
-                                    },
-                                  }) satisfies Prisma.ServiceWhereInput
-                              ),
-                            },
-                          ]
-                        : []),
-                    ],
-                  },
-                ]
-              : []),
-          ],
-        } as const satisfies Prisma.ServiceWhereInput
-
-        const select = {
-          id: true,
-          ...(Object.fromEntries(sortOptions.map((option) => [option.orderBy.key, true])) as Record<
-            (typeof sortOptions)[number]['orderBy']['key'],
-            true
-          >),
-        } as const satisfies Prisma.ServiceSelect
-
-        let [unsortedServices, totalServices] = await prisma.service.findManyAndCount({
+        const [unsortedServices, totalServices] = await prisma.service.findManyAndCount({
          where,
-          select,
+          select: {
+            id: true,
+            ...(Object.fromEntries(sortOptions.map((option) => [option.orderBy.key, true])) as Record<
+              (typeof sortOptions)[number]['orderBy']['key'],
+              true
+            >),
+          },
        })
-        let hadToIncludeCommunityContributed = false
-
-        if (
-          totalServices === 0 &&
-          areEqualArraysWithoutOrder(where.verificationStatus.in, ['VERIFICATION_FAILED', 'APPROVED'])
-        ) {
-          const [unsortedServiceCommunityServices, totalCommunityServices] =
-            await prisma.service.findManyAndCount({
-              where: {
-                ...where,
-                verificationStatus: {
-                  ...where.verificationStatus,
-                  in: [...where.verificationStatus.in, 'COMMUNITY_CONTRIBUTED'],
-                },
-              },
-              select,
-            })
-
-          if (totalCommunityServices !== 0) {
-            hadToIncludeCommunityContributed = true
-            unsortedServices = unsortedServiceCommunityServices
-            totalServices = totalCommunityServices
-          }
-        }

        const rng = seedrandom(filters['sort-seed'])
        const selectedSort = sortOptions.find((sort) => sort.value === filters.sort) ?? defaultSortOption
@@ -405,39 +400,56 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
          [selectedSort.orderBy.direction, 'asc']
        )

-        return [sortedServicesWithInfo, totalServices, hadToIncludeCommunityContributed] as const
+        return [sortedServicesWithInfo, totalServices] as const
      },
      [[] as [], 0, false] as const,
    ],
-  ])
-
-const attributes = await Astro.locals.banners.try(
-  'Unable to load attribute filters.',
-  () =>
-    prisma.attribute.findMany({
-      select: {
-        id: true,
-        slug: true,
-        title: true,
-        category: true,
-        type: true,
-        _count: {
+    [
+      'Unable to load count if including community.',
+      () =>
+        areEqualArraysWithoutOrder(filters.verification, ['VERIFICATION_SUCCESS', 'APPROVED']) ||
+        areEqualArraysWithoutOrder(filters.verification, [
+          'VERIFICATION_SUCCESS',
+          'APPROVED',
+          'VERIFICATION_FAILED',
+        ])
+          ? prisma.service.count({
+              where: {
+                ...where,
+                verificationStatus: 'COMMUNITY_CONTRIBUTED',
+              },
+            })
+          : null,
+      null,
+    ],
+    [
+      'Unable to load attribute filters.',
+      () =>
+        prisma.attribute.findMany({
          select: {
-            services: true,
+            id: true,
+            slug: true,
+            title: true,
+            category: true,
+            type: true,
+            _count: {
+              select: {
+                services: true,
+              },
+            },
          },
-        },
-      },
-      orderBy: [{ category: 'asc' }, { type: 'asc' }, { title: 'asc' }],
-    }),
-  []
-)
+          orderBy: [{ category: 'asc' }, { type: 'asc' }, { title: 'asc' }],
+        }),
+      [],
+    ],
+  ])

 const attributesByCategory = orderBy(
  Object.entries(
    groupBy(
      attributes.map((attr) => {
        return {
-          info: getAttributeTypeInfo(attr.type),
+          typeInfo: getAttributeTypeInfo(attr.type),
          ...attr,
          // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
          value: filters.attr?.[attr.id] || undefined,
@@ -447,6 +459,7 @@ const attributesByCategory = orderBy(
    )
  ).map(([category, attributes]) => ({
    category,
+    categoryInfo: getAttributeCategoryInfo(category),
    attributes: orderBy(
      attributes,
      ['value', 'type', '_count.services', 'title'],
@@ -488,7 +501,8 @@ const filtersOptions = {

 export type ServicesFiltersOptions = typeof filtersOptions

-//
+const searchResultsId = 'search-results'
+const showFiltersId = 'show-filters'
 ---

 <BaseLayout
@@ -509,7 +523,33 @@ export type ServicesFiltersOptions = typeof filtersOptions
      class='[&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-night-700 flex items-stretch sm:hidden [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-2 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-green-500 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-2'
    >
      {
-        !hasDefaultFilters ? (
+        hasDefaultFilters || hasDefaultFiltersIgnoringQ ? (
+          <form
+            method="GET"
+            hx-get={Astro.url.pathname}
+            hx-trigger="input delay:500ms, keyup[key=='Enter']"
+            hx-target={`#${searchResultsId}`}
+            hx-select={`#${searchResultsId}`}
+            hx-push-url="true"
+            hx-indicator="#search-indicator"
+            class="contents"
+          >
+            <InputText
+              name="q"
+              label="Search..."
+              hideLabel
+              inputIcon="ri:search-line"
+              inputIconClass="text-day-500 size-4.5"
+              inputProps={{
+                placeholder: 'Search',
+                value: filters.q,
+                class: 'bg-night-800 border-night-500',
+                'transition:persist': false,
+              }}
+              class="mr-4 flex-1"
+            />
+          </form>
+        ) : (
          <div class="-ml-4 flex flex-1 items-center gap-2 overflow-x-auto mask-r-from-[calc(100%-var(--spacing)*16)] pr-12 pl-4">
            {filters.q && (
              <ServiceFiltersPill text={`"${filters.q}"`} searchParamName="q" searchParamValue={filters.q} />
@@ -618,12 +658,19 @@ export type ServicesFiltersOptions = typeof filtersOptions
                  )
                })}
          </div>
-        ) : (
-          <div class="text-day-500 flex flex-1 items-center">No filters</div>
        )
      }

-      <Button as="label" for="show-filters" label="Filters" icon="ri:filter-3-line" />
+      <Button
+        as="label"
+        for="show-filters"
+        label="Filters"
+        icon="ri:filter-3-line"
+        class="max-2xs:w-9 max-2xs:px-0"
+        classNames={{
+          label: 'max-2xs:hidden',
+        }}
+      />
    </div>

    <input
@@ -637,8 +684,8 @@ export type ServicesFiltersOptions = typeof filtersOptions
      class="bg-night-700 fixed top-0 left-0 z-50 hidden h-dvh w-dvw shrink-0 translate-y-full overflow-y-auto overscroll-contain border-t border-green-500/30 px-8 pt-4 transition-transform peer-checked:translate-y-0 max-sm:peer-checked:block sm:relative sm:z-auto sm:block sm:h-auto sm:w-64 sm:translate-y-0 sm:overflow-visible sm:border-none sm:bg-none sm:p-0"
    >
      <ServicesFilters
-        searchResultsId="search-results"
-        showFiltersId="show-filters"
+        searchResultsId={searchResultsId}
+        showFiltersId={showFiltersId}
        filters={{
          ...filters,
          'sort-seed': makeSortSeed(),
@@ -656,7 +703,9 @@ export type ServicesFiltersOptions = typeof filtersOptions
      pageSize={PAGE_SIZE}
      sortSeed={filters['sort-seed']}
      filters={filters}
-      hadToIncludeCommunityContributed={hadToIncludeCommunityContributed}
+      includeScams={includeScams}
+      countCommunityOnly={countCommunityOnly}
+      inlineIcons
    />
  </div>
  {
--- a/web/src/pages/service/[slug].astro
+++ b/web/src/pages/service/[slug].astro
@@ -26,6 +26,7 @@ import Tooltip from '../../components/Tooltip.astro'
 import VerificationWarningBanner from '../../components/VerificationWarningBanner.astro'
 import { getAttributeCategoryInfo } from '../../constants/attributeCategories'
 import { getAttributeTypeInfo } from '../../constants/attributeTypes'
+import { formatContactMethod } from '../../constants/contactMethods'
 import { currencies, getCurrencyInfo } from '../../constants/currencies'
 import { getEventTypeInfo } from '../../constants/eventTypes'
 import { getKycLevelInfo, kycLevels } from '../../constants/kycLevels'
@@ -37,7 +38,6 @@ import BaseLayout from '../../layouts/BaseLayout.astro'
 import { someButNotAll, undefinedIfEmpty } from '../../lib/arrays'
 import { makeNonDbAttributes, sortAttributes } from '../../lib/attributes'
 import { cn } from '../../lib/cn'
-import { formatContactMethod } from '../../lib/contactMethods'
 import { getOrCreateNotificationPreferences } from '../../lib/notificationPreferences'
 import { formatNumber, type FormatNumberOptions } from '../../lib/numbers'
 import { pluralize } from '../../lib/pluralize'
@@ -95,8 +95,8 @@ const [service, dbNotificationPreferences] = await Astro.locals.banners.tryMany(
          isRecentlyListed: true,
          contactMethods: {
            select: {
-              iconId: true,
              value: true,
+              label: true,
            },
          },
          attributes: {
@@ -379,20 +379,22 @@ const ogImageTemplateData = {
        service.contactMethods
          .map((method) => ({
            ...method,
-            ...(formatContactMethod(method.value) ?? { type: 'unknown', formattedValue: method.value }),
+            info: formatContactMethod(method.value),
          }))
-          .map<ContactPoint | null>(({ type, formattedValue }) => {
-            switch (type) {
+          .map<ContactPoint | null>(({ info, label }) => {
+            switch (info.type) {
              case 'telephone': {
                return {
                  '@type': 'ContactPoint',
-                  telephone: formattedValue,
+                  telephone: info.formattedValue,
+                  name: label ?? info.label,
                }
              }
              case 'email': {
                return {
                  '@type': 'ContactPoint',
-                  email: formattedValue,
+                  email: info.formattedValue,
+                  name: label ?? info.label,
                }
              }
              default: {
@@ -467,17 +469,6 @@ const ogImageTemplateData = {
  }
  <VerificationWarningBanner service={service} />

-  {
-    service.verificationSteps.some((step) => step.status === VerificationStepStatus.FAILED) && (
-      <div class="mb-4 flex items-center gap-2 rounded-md bg-red-900/50 p-2 text-sm text-red-300">
-        <Icon name="ri:error-warning-line" class="inline-block size-4 shrink-0" />
-        <span>
-          This service has failed one or more verification steps. Review the verification details carefully.
-        </span>
-      </div>
-    )
-  }
-
  <div class="flex items-center gap-4">
    {
      !!service.imageUrl && (
@@ -741,8 +732,8 @@ const ogImageTemplateData = {
                rel="noopener noreferrer"
                class="text-day-300 hover:text-day-200 flex items-center gap-1 px-2 py-1 hover:underline"
              >
-                <Icon name={method.iconId} class="text-day-200 h-5 w-5" />
-                <span>{methodInfo?.formattedValue ?? method.value}</span>
+                <Icon name={methodInfo.icon} class="text-day-200 h-5 w-5" />
+                <span>{method.label ?? methodInfo.formattedValue}</span>
              </a>
            </li>
          )
--- a/web/src/pages/u/[username].astro
+++ b/web/src/pages/u/[username].astro
@@ -10,6 +10,7 @@ import InputTextArea from '../../components/InputTextArea.astro'
 import MyPicture from '../../components/MyPicture.astro'
 import TimeFormatted from '../../components/TimeFormatted.astro'
 import Tooltip from '../../components/Tooltip.astro'
+import UserBadge from '../../components/UserBadge.astro'
 import { getKarmaTransactionActionInfo } from '../../constants/karmaTransactionActions'
 import { karmaUnlocks } from '../../constants/karmaUnlocks'
 import { SUPPORT_EMAIL } from '../../constants/project'
@@ -64,6 +65,7 @@ const user = await Astro.locals.banners.try('user', async () => {
              select: {
                name: true,
                displayName: true,
+                picture: true,
              },
            },
            comment: {
@@ -175,8 +177,8 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
 ---

 <BaseLayout
-  pageTitle={`${user.name} - Account`}
-  description="Manage your user profile"
+  pageTitle={`${user.displayName ?? user.name} - User Profile`}
+  description={`User profile page of ${user.displayName ?? user.name} in KYCnot.me`}
  ogImage={{
    template: 'generic',
    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -204,7 +206,7 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
        image: user.picture ?? undefined,
        url: new URL(`/u/${user.name}`, Astro.url).href,
        sameAs: user.link ? [user.link] : undefined,
-        description: `User account for ${user.displayName ?? user.name} on KYCnot.me`,
+        description: `User profile page for ${user.displayName ?? user.name} on KYCnot.me`,
        identifier: [user.name, user.id.toString()],
        jobTitle: user.admin ? 'Administrator' : user.verifier ? 'Moderator' : undefined,
        memberOf: KYCNOTME_SCHEMA_MINI,
@@ -259,10 +261,10 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
        }
        <div class="grow">
          <h1 class="font-title text-lg font-bold tracking-wider text-white">
-            {user.name}
+            {user.displayName ?? user.name}
            {isCurrentUser && <span class="text-day-500 font-normal">(You)</span>}
          </h1>
-          {user.displayName && <p class="text-day-200">{user.displayName}</p>}
+          {user.displayName && <p class="text-day-200 font-title">{user.name}</p>}
          <div class="mt-1 flex gap-2">
            {
              user.admin && (
@@ -323,7 +325,7 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
          )
        }
        <a
-          href={`mailto:${SUPPORT_EMAIL}`}
+          href={`mailto:${SUPPORT_EMAIL}?subject=User report - ${user.displayName ?? user.name}&body=${Astro.locals.user ? `I'm ${Astro.locals.user.displayName ? `${Astro.locals.user.displayName} (${Astro.locals.user.name})` : user.name}. ` : ''}I'm reporting the user ${user.displayName ? `"${user.displayName}" (${user.name})` : `"${user.name}"`} because...`}
          class="inline-flex items-center gap-1 rounded-md border border-red-500/30 bg-red-500/10 px-3 py-1.5 text-sm text-red-400 shadow-xs transition-colors duration-200 hover:bg-red-500/20 focus:ring-2 focus:ring-red-500 focus:ring-offset-2 focus:ring-offset-black focus:outline-hidden"
        >
          <Icon name="ri:alert-line" class="size-4" /> Report
@@ -1002,13 +1004,10 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
                          <Icon name={actionInfo.icon} class="size-4" />
                          {actionInfo.label}
                          {transaction.action === 'MANUAL_ADJUSTMENT' && transaction.grantedBy && (
-                            <a
-                              href={`/u/${transaction.grantedBy.name}`}
-                              class="text-day-500 ml-1 hover:underline"
-                            >
-                              {/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
-                              by {transaction.grantedBy.displayName || transaction.grantedBy.name}
-                            </a>
+                            <>
+                              <span class="text-day-500">from</span>
+                              <UserBadge user={transaction.grantedBy} size="sm" class="text-day-500" />
+                            </>
                          )}
                        </span>
                      </td>
--- a/web/src/styles/global.css
+++ b/web/src/styles/global.css
@@ -93,15 +93,20 @@
  --color-night-950: oklch(11.97% 0.004 145.32);
 }

-@layer utilities {
-  .text-shadow-glow {
-    text-shadow:
-      0 0 16px color-mix(in oklab, currentColor 30%, transparent),
-      0 0 4px color-mix(in oklab, currentColor 60%, transparent);
-  }
-  .drop-shadow-glow {
-    filter: drop-shadow(0 0 16px color-mix(in oklab, currentColor 30%, transparent))
-      drop-shadow(0 0 4px color-mix(in oklab, currentColor 60%, transparent));
+@utility text-shadow-glow {
+  text-shadow:
+    0 0 16px color-mix(in oklab, currentColor 30%, transparent),
+    0 0 4px color-mix(in oklab, currentColor 60%, transparent);
+}
+@utility drop-shadow-glow {
+  filter: drop-shadow(0 0 16px color-mix(in oklab, currentColor 30%, transparent))
+    drop-shadow(0 0 4px color-mix(in oklab, currentColor 60%, transparent));
+}
+
+@utility checkbox-force-checked {
+  &:not(:checked) {
+    @apply border-transparent! bg-current/50!;
+    background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e") !important;
  }
 }
Author	SHA1	Message	Date
pluja	cdfdcfc122	Release 2025-05-23-R3WZ	2025-05-23 11:52:16 +00:00
pluja	f4525e3d32	Release 2025-05-22-SwZ1	2025-05-22 23:07:55 +00:00
pluja	ecc8f67fc4	Release 2025-05-22-XDxe	2025-05-22 22:58:18 +00:00
pluja	72c238a4dc	Release 2025-05-22-16vM	2025-05-22 22:38:41 +00:00
pluja	d79bedf219	Release 2025-05-22-5X5Q	2025-05-22 19:43:20 +00:00
pluja	2362d2cc73	Release 2025-05-22-Uvv4	2025-05-22 19:19:07 +00:00
pluja	a69c0aeed4	Release 2025-05-22-GmO6	2025-05-22 11:10:18 +00:00