Release 202505311848

web/src/actions/api/service.ts

@@ -24,7 +24,7 @@ export const apiServiceActions = {
         .optional(),
       url: zodUrlOptionalProtocol.optional(),
     }),
-    handler: async (input) => {
+    handler: async (input, context) => {
       if (!input.id && !input.slug && !input.url) {
         throw new ActionError({
           code: 'BAD_REQUEST',
@@ -122,7 +122,7 @@ export const apiServiceActions = {
           (url) => url + (service.referral ?? '')
         ),
         tosUrls: service.tosUrls,
-        kycnotmeUrl: `https://kycnot.me/service/${service.slug}`,
+        kycnotmeUrl: new URL(`/service/${service.slug}`, context.url).href,
       }
     },
   }),

web/src/components/CommentItem.astro

@@ -102,7 +102,7 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
   {...htmlProps}
   id={`comment-${comment.id.toString()}`}
   class={cn([
-    'group',
+    'group bg-night-700',
     depth > 0 && 'ml-3 border-b-0 border-l border-zinc-800 pt-2 pl-2 sm:ml-4',
     comment.author.serviceAffiliations.some((affiliation) => affiliation.service.slug === serviceSlug) &&
       'bg-[#182a1f]',
@@ -270,12 +270,6 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
 
     {comment.suspicious && <BadgeSmall icon="ri:spam-2-fill" color="red" text="Potential SPAM" inlineIcon />}
 
-    {
-      comment.requiresAdminReview && isAuthorOrPrivileged && (
-        <BadgeSmall icon="ri:alert-fill" color="yellow" text="Reported" inlineIcon />
-      )
-    }
-
     {
       comment.rating !== null && !comment.parentId && (
         <Tooltip
@@ -320,6 +314,19 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
           color={commentStatusById.REJECTED.color}
           text={commentStatusById.REJECTED.label}
           inlineIcon
+          endIcon="ri:lock-line"
+        />
+      )
+    }
+
+    {
+      comment.requiresAdminReview && isAuthorOrPrivileged && (
+        <BadgeSmall
+          icon="ri:alert-fill"
+          color="yellow"
+          text="Needs admin review"
+          inlineIcon
+          endIcon="ri:lock-line"
         />
       )
     }

web/src/components/CommentModeration.astro

@@ -89,7 +89,7 @@ if (!user || !user.admin || !user.moderator) return null
         data-comment-id={comment.id}
         data-user-id={user.id}
       >
-        {comment.requiresAdminReview ? 'No Admin Review' : 'Admin Review'}
+        {comment.requiresAdminReview ? 'No Admin Review' : 'Needs Admin Review'}
       </button>
 
       <button

web/src/components/CommentReply.astro

@@ -92,7 +92,7 @@ const userCommentsDisabled = user ? user.karmaUnlocks.commentsDisabled : false
                 <div class="flex flex-wrap gap-4">
                   <InputRating name="rating" label="Rating" />
 
-                  <InputWrapper label="Tags" name="tags">
+                  <InputWrapper label="I experienced..." name="tags">
                     <label class="flex cursor-pointer items-center gap-2">
                       <input type="checkbox" name="issueKycRequested" class="text-red-400" />
                       <span class="flex items-center gap-1 text-xs text-red-400">

web/src/components/ServiceLinkButton.astro

@@ -87,6 +87,25 @@ function makeLink(url: string, referral: string | null) {
     }
   }
 
+  const bitcointalkMatch = /^(?:https?:\/\/)?(?:www\.)?bitcointalk\.org$/.exec(hostname)
+  if (bitcointalkMatch) {
+    return {
+      type: 'clearnet' as const,
+      url: urlWithReferral,
+      textBits: [
+        {
+          style: 'normal',
+          text: 'BitcoinTalk ',
+        },
+        {
+          style: 'irrelevant',
+          text: 'thread',
+        },
+      ],
+      icon: networksBySlug.clearnet.icon,
+    }
+  }
+
   return {
     type: 'clearnet' as const,
     url: urlWithReferral,

web/src/lib/makeAdminApiCallInfo.ts

@@ -13,15 +13,38 @@ export async function makeAdminApiCallInfo<T extends Misc.JSON.Object>({
 }) {
   const fullPath = new URL(`/api/v1${path}`, baseUrl).href
 
+  const fetchProsmise = fetch(fullPath, {
+    method,
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(input),
+  }).then((res) => {
+    try {
+      return res.json() as Promise<Misc.JSON.Value>
+    } catch (errJson: unknown) {
+      console.error(errJson)
+
+      try {
+        return res.text()
+      } catch (errText: unknown) {
+        console.error(errText)
+        return ''
+      }
+    }
+  })
+
+  let output: Misc.JSON.Value = ''
+  try {
+    output = await fetchProsmise
+  } catch (err: unknown) {
+    console.error(err)
+    output = err instanceof Error ? err.message : String(err)
+  }
+
   return {
     method,
     path,
     fullPath,
     input,
-    output: await fetch(fullPath, {
+    output,
-      method,
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(input),
-    }).then((res) => res.json() as Promise<Misc.JSON.Value>),
   }
 }

web/src/pages/admin/services/[slug]/edit.astro

@@ -2,6 +2,7 @@
 import { Icon } from 'astro-icon/components'
 import { Markdown } from 'astro-remote'
 import { actions, isInputError } from 'astro:actions'
+import { Code } from 'astro:components'
 import { orderBy } from 'lodash-es'
 
 import BadgeSmall from '../../../../components/BadgeSmall.astro'
@@ -33,6 +34,7 @@ import {
   verificationStepStatuses,
 } from '../../../../constants/verificationStepStatus'
 import BaseLayout from '../../../../layouts/BaseLayout.astro'
+import { DEPLOYMENT_MODE } from '../../../../lib/envVariables'
 import { makeAdminApiCallInfo } from '../../../../lib/makeAdminApiCallInfo'
 import { pluralize } from '../../../../lib/pluralize'
 import { prisma } from '../../../../lib/prisma'
@@ -1117,20 +1119,22 @@ const apiCalls = await Astro.locals.banners.try(
     </FormSection>
 
     <FormSection title="API">
+      {
+        DEPLOYMENT_MODE === 'staging' && (
+          <p class="rounded-lg bg-red-900/30 p-4 text-sm text-red-200">
+            <Icon name="ri:alert-line" class="inline-block size-4 align-[-0.2em] text-red-400" />
+            This endpoints section doesn't work in PRE. Use curl commands instead.
+          </p>
+        )
+      }
       {
         apiCalls.map((call) => (
           <FormSubSection title={`${call.method} ${call.path}`}>
             <p class="text-day-400 text-sm">Input:</p>
-            <pre
+            <Code code={JSON.stringify(call.input, null, 2)} lang="json" class="rounded-lg p-4 text-xs" />
-              class="bg-night-800 border-night-500 text-day-300 overflow-x-auto rounded-md border p-3"
-              set:text={JSON.stringify(call.input, null, 2)}
-            />
 
             <p class="text-day-400 text-sm">Output:</p>
-            <pre
+            <Code code={JSON.stringify(call.output, null, 2)} lang="json" class="rounded-lg p-4 text-xs" />
-              class="bg-night-800 border-night-500 text-day-300 overflow-x-auto rounded-md border p-3"
-              set:text={JSON.stringify(call.output, null, 2)}
-            />
           </FormSubSection>
         ))
       }