Release 2025-05-23-S6tT

web/scripts/faker.ts

@@ -859,6 +859,22 @@ const generateFakeServiceContactMethod = (serviceId: number) => {
     {
       value: `https://x.com/${faker.internet.username()}`,
     },
+    {
+      value: `https://matrix.to/#/@${faker.internet.username()}:${faker.internet.domainName()}`,
+    },
+    {
+      value: `https://instagram.com/${faker.internet.username()}`,
+    },
+    {
+      value: `https://linkedin.com/in/${faker.helpers.slugify(faker.person.fullName())}`,
+    },
+    {
+      label: faker.lorem.word({ length: 2 }),
+      value: `https://bitcointalk.org/index.php?topic=${faker.number.int({ min: 1, max: 1000000 }).toString()}.0`,
+    },
+    {
+      value: `https://bitcointalk.org/index.php?topic=${faker.number.int({ min: 1, max: 1000000 }).toString()}.0`,
+    },
     {
       value: faker.internet.url(),
     },
@@ -867,7 +883,7 @@ const generateFakeServiceContactMethod = (serviceId: number) => {
       value: faker.internet.url(),
     },
     {
-      value: `https://www.linkedin.com/company/${faker.helpers.slugify(faker.company.name())}`,
+      value: `https://linkedin.com/company/${faker.helpers.slugify(faker.company.name())}`,
     },
   ] as const satisfies Partial<Prisma.ServiceContactMethodCreateInput>[]
 

web/src/actions/admin/service.ts

@@ -187,13 +187,17 @@ export const adminServiceActions = {
     accept: 'form',
     permissions: 'admin',
     input: z.object({
-      label: z.string().min(1).max(50).optional(),
+      label: z.string().min(1).max(50).nullable(),
       value: z.string().url(),
       serviceId: z.number().int().positive(),
     }),
     handler: async (input) => {
       const contactMethod = await prisma.serviceContactMethod.create({
-        data: input,
+        data: {
+          label: input.label,
+          value: input.value,
+          serviceId: input.serviceId,
+        },
       })
       return { contactMethod }
     },
@@ -203,16 +207,19 @@ export const adminServiceActions = {
     accept: 'form',
     permissions: 'admin',
     input: z.object({
-      id: z.number().int().positive().optional(),
-      label: z.string().min(1).max(50).optional(),
+      id: z.number().int().positive(),
+      label: z.string().min(1).max(50).nullable(),
       value: z.string().url(),
       serviceId: z.number().int().positive(),
     }),
     handler: async (input) => {
-      const { id, ...data } = input
       const contactMethod = await prisma.serviceContactMethod.update({
-        where: { id },
-        data,
+        where: { id: input.id },
+        data: {
+          label: input.label,
+          value: input.value,
+          serviceId: input.serviceId,
+        },
       })
       return { contactMethod }
     },

web/src/constants/contactMethods.ts

@@ -30,14 +30,14 @@ export const {
     {
       type: 'email',
       label: 'Email',
-      matcher: /mailto:(.*)/,
+      matcher: /mailto:(.+)/,
       formatter: (value) => value,
       icon: 'ri:mail-line',
     },
     {
       type: 'telephone',
       label: 'Telephone',
-      matcher: /tel:(.*)/,
+      matcher: /tel:(.+)/,
       formatter: (value) => {
         return parsePhoneNumberWithError(value).formatInternational()
       },
@@ -46,7 +46,7 @@ export const {
     {
       type: 'whatsapp',
       label: 'WhatsApp',
-      matcher: /https?:\/\/(?:www\.)?wa\.me\/(.*)\/?/,
+      matcher: /https?:\/\/(?:www\.)?wa\.me\/(.+)/,
       formatter: (value) => {
         return parsePhoneNumberWithError(value).formatInternational()
       },
@@ -55,42 +55,35 @@ export const {
     {
       type: 'telegram',
       label: 'Telegram',
-      matcher: /https?:\/\/(?:www\.)?t\.me\/(.*)\/?/,
+      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)\/(.*)\/?/,
+      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\/(.*)\/?/,
+      matcher: /https?:\/\/(?:www\.)?x\.com\/(.+)/,
       formatter: (value) => `@${value}`,
       icon: 'ri:twitter-x-line',
     },
     {
       type: 'instagram',
       label: 'Instagram',
-      matcher: /https?:\/\/(?:www\.)?instagram\.com\/(.*)\/?/,
+      matcher: /https?:\/\/(?:www\.)?instagram\.com\/(.+)/,
       formatter: (value) => `@${value}`,
       icon: 'ri:instagram-line',
     },
     {
       type: 'matrix',
       label: 'Matrix',
-      matcher: /https?:\/\/(?:www\.)?matrix\.to\/#\/(.*)\/?/,
+      matcher: /https?:\/\/(?:www\.)?matrix\.to\/#\/(.+)/,
       formatter: (value) => value,
       icon: 'ri:hashtag',
     },
@@ -101,6 +94,14 @@ export const {
       formatter: () => 'BitcoinTalk',
       icon: 'ri:btc-line',
     },
+    // Website must go last because it's a catch-all
+    {
+      type: 'website',
+      label: 'Website',
+      matcher: /https?:\/\/(?:www\.)?((?:[a-zA-Z0-9-]+\.)+[a-zA-Z]+)/,
+      formatter: (value) => value,
+      icon: 'ri:global-line',
+    },
   ] as const satisfies ContactMethodInfo[]
 )
 

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

@@ -170,8 +170,6 @@ const errorTextClasses = 'mt-1 text-xs text-red-400'
       </h1>
       <a
         href={`/service/${service.slug}`}
-        target="_blank"
-        rel="noopener noreferrer"
         class="inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-sm text-sky-400 hover:text-sky-300 hover:underline focus:ring-2 focus:ring-sky-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
       >
         <Icon name="ri:external-link-line" class="size-4" />
@@ -405,8 +403,7 @@ const errorTextClasses = 'mt-1 text-xs text-red-400'
             }))}
             selectedValue={service.serviceVisibility}
             error={serviceInputErrors.serviceVisibility}
-            cardSize="md"
-            iconSize="md"
+            cardSize="sm"
           />
         </div>
 
@@ -1018,12 +1015,10 @@ const errorTextClasses = 'mt-1 text-xs text-red-400'
                       <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>
+                          <span class="text-md font-semibold text-zinc-100">{contactMethodInfo.label}</span>
                         </div>
                         <p class="text-sm text-pretty text-zinc-400">
-                          {contactMethodInfo.formattedValue}{' '}
+                          {method.label ?? contactMethodInfo.formattedValue}{' '}
                           <span class="text-zinc-500">({method.value})</span>
                         </p>
                       </div>
@@ -1068,7 +1063,7 @@ const errorTextClasses = 'mt-1 text-xs text-red-400'
                           id={`contactLabel-${method.id}`}
                           value={method.label}
                           class={inputBaseClasses}
-                          placeholder={contactMethodInfo.label}
+                          placeholder={contactMethodInfo.formattedValue}
                         />
                       </div>
                       <div>