Allow organizers to email themselves (#651)

Author: daveearley

backend/app/Http/Actions/Organizers/Public/SendOrganizerContactMessagePublicAction.php

@@ -30,6 +30,7 @@ public function __invoke(Request $request, int $organizerId): JsonResponse
 
         $this->handler->handle(SendOrganizerContactMessageDTO::from([
             'organizer_id' => $organizerId,
+            'account_id' => $this->getAuthenticatedAccountId(),
             'name' => $data['name'],
             'email' => $data['email'],
             'message' => $data['message'],

backend/app/Services/Application/Handlers/Organizer/DTO/SendOrganizerContactMessageDTO.php

@@ -8,6 +8,7 @@ class SendOrganizerContactMessageDTO extends BaseDataObject
 {
     public function __construct(
         public int $organizer_id,
+        public int $account_id,
         public string $name,
         public string $email,
         public string $message,

backend/app/Services/Application/Handlers/Organizer/SendOrganizerContactMessageHandler.php

@@ -6,7 +6,7 @@
 use HiEvents\Mail\Organizer\OrganizerContactEmail;
 use HiEvents\Repository\Interfaces\OrganizerRepositoryInterface;
 use HiEvents\Services\Application\Handlers\Organizer\DTO\SendOrganizerContactMessageDTO;
-use HTMLPurifier;
+use HiEvents\Services\Infrastructure\HtmlPurifier\HtmlPurifierService;
 use Illuminate\Mail\Mailer;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
@@ -15,7 +15,7 @@ class SendOrganizerContactMessageHandler
     public function __construct(
         private readonly Mailer                       $mailer,
         private readonly OrganizerRepositoryInterface $organizerRepository,
-        private readonly HTMLPurifier                 $purifier,
+        private readonly HtmlPurifierService          $purifier,
     )
     {
     }
@@ -24,7 +24,8 @@ public function handle(SendOrganizerContactMessageDTO $dto): void
     {
         $organizer = $this->organizerRepository->findById($dto->organizer_id);
 
-        if ($organizer->getStatus() !== OrganizerStatus::LIVE->value) {
+        // Don't allow people to contact organizers that are not live, except for the organizer's own account
+        if ($organizer->getStatus() !== OrganizerStatus::LIVE->value && $dto->account_id !== $organizer->getAccountId()) {
             throw new ResourceNotFoundException(__('Organizer not found'));
         }
 

frontend/src/components/common/ContactOrganizerModal/index.tsx

@@ -6,6 +6,7 @@ import {Organizer} from '../../../types';
 import {useContactOrganizer} from '../../../mutations/useContactOrganizer';
 import {showSuccess, showError} from '../../../utilites/notifications';
 import classes from './ContactOrganizerModal.module.scss';
+import {InputGroup} from "../InputGroup";
 
 interface ContactOrganizerModalProps {
     opened: boolean;
@@ -26,14 +27,19 @@ export const ContactOrganizerModal: React.FC<ContactOrganizerModalProps> = ({
             email: '',
             message: '',
         },
+        validateInputOnBlur: true,
         validate: {
             name: (value) => !value ? t`Name is required` : null,
             email: (value) => {
                 if (!value) return t`Email is required`;
                 if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) return t`Invalid email`;
                 return null;
             },
-            message: (value) => !value ? t`Message is required` : null,
+            message: (value) => {
+                if (value.length > 5000) return t`Message cannot exceed 5000 characters`;
+
+                return !value ? t`Message is required` : null;
+            },
         },
     });
 
@@ -62,7 +68,7 @@ export const ContactOrganizerModal: React.FC<ContactOrganizerModalProps> = ({
             className={classes.contactModal}
         >
             <form onSubmit={contactForm.onSubmit(handleContactSubmit)}>
-                <Group grow mb="md">
+                <InputGroup>
                     <TextInput
                         label={t`Your Name`}
                         placeholder={t`Enter your name`}
@@ -76,13 +82,15 @@ export const ContactOrganizerModal: React.FC<ContactOrganizerModalProps> = ({
                         type="email"
                         {...contactForm.getInputProps('email')}
                     />
-                </Group>
+                </InputGroup>
 
                 <Textarea
                     label={t`Message`}
                     placeholder={t`Write your message here...`}
                     required
                     minRows={4}
+                    autosize
+                    maxLength={5001}
                     mb="md"
                     {...contactForm.getInputProps('message')}
                 />
@@ -107,4 +115,4 @@ export const ContactOrganizerModal: React.FC<ContactOrganizerModalProps> = ({
             </form>
         </Modal>
     );
-};
+};