feat/url validation

packages/cms/src/collections/groupchats.ts

@@ -1,10 +1,21 @@
-import payload, {type Payload} from 'payload';
+import payload, {type GeneratedTypes, type Payload} from 'payload';
 import {type CollectionConfig} from 'payload/types';
 import {allowUpdateDeleteOwner} from '../access/allow-update-delete-owner';
 import {requireOneOf} from '../access/require-one-of';
 import {typesenseClient} from '../lib/typesense';
 import {type GroupchatKeyword} from '../payload-types';
 
+type GroupchatPlatform =
+  GeneratedTypes['collections']['groupchats']['platform'];
+const platformUrlMatchers: Record<GroupchatPlatform, RegExp> = {
+  discord: /^https?:\/\/(?:www\.)?discord\.(com|gg)\//i,
+  instagram: /^https?:\/\/(?:www\.)?instagram\.com\//i,
+  facebook: /^https?:\/\/(?:www\.)?facebook\.com\//i,
+  signal: /^https?:\/\/(?:www\.)?signal\.group\//i,
+  telegram: /^https?:\/\/(?:www\.)?t\.me\//i,
+  whatsapp: /^https?:\/\/chat\.whatsapp\.com\//i,
+};
+
 export const Groupchats: CollectionConfig = {
   slug: 'groupchats',
   access: {
@@ -23,6 +34,8 @@ export const Groupchats: CollectionConfig = {
       type: 'text',
       required: true,
       validate: async (nameValue, {data, payload}) => {
+        if (!nameValue) return 'This field is required.';
+
         // We need to run local operations with certain auth, so we skip if payload is not available
         if (!payload) return true;
 
@@ -70,10 +83,26 @@ export const Groupchats: CollectionConfig = {
               return `https://${value}`;
             }
 
+            if (value?.startsWith('http:')) {
+              return 'https' + value.substring(4);
+            }
+
             return value;
           },
         ],
       },
+      validate: (url, {data}) => {
+        if (!url) return 'This field is required.';
+
+        const urlMatcher = platformUrlMatchers[data.platform];
+        const match = (url as string).match(urlMatcher);
+
+        if (!match) {
+          return 'The URL must be a valid invite link for the selected platform!';
+        }
+
+        return true;
+      },
     },
     {
       name: 'keywords',
@@ -135,11 +164,21 @@ export const Groupchats: CollectionConfig = {
         }
 
         for (const chat of req.body) {
-          await req.payload.create({
-            collection: 'groupchats',
-            data: chat,
-            user: req.user,
-          });
+          try {
+            await req.payload.create({
+              collection: 'groupchats',
+              data: chat,
+              user: req.user,
+            });
+          } catch (e) {
+            req.payload.logger.error(
+              `Failed creating groupchat ${JSON.stringify(
+                chat,
+                null,
+                2,
+              )} in batch-endpoint: `,
+            );
+          }
         }
 
         res.status(200).send('Ok');

packages/cms/src/dataseeder/seed-groupchats.ts

@@ -28,7 +28,7 @@ export const seedGroupchats = async () => {
       name: 'Yes Famburg',
       description: 'Hamburgs YesFam group on WhatsApp',
       platform: 'whatsapp',
-      url: 'https://example.com',
+      url: 'https://chat.whatsapp.com/example',
       keywords: [keywords['Hamburg'], keywords['Germany'], keywords['Europe']],
       promoted: 0,
     },

packages/cms/src/payload-types.ts

@@ -28,10 +28,16 @@ export interface User {
 export interface Groupchat {
   id: number;
   name: string;
-  platform: 'discord' | 'facebook' | 'signal' | 'telegram' | 'whatsapp';
+  platform:
+    | 'discord'
+    | 'facebook'
+    | 'instagram'
+    | 'signal'
+    | 'telegram'
+    | 'whatsapp';
   description?: string | null;
   url: string;
-  keywords: (number | GroupchatKeyword)[];
+  keywords?: (number | GroupchatKeyword)[] | null;
   promoted: number;
   owners?: (string | User)[] | null;
   updatedAt: string;