feat: poll image create/delete events

src/Api/Controllers/DeletePollImageController.php

@@ -12,7 +12,9 @@
 namespace FoF\Polls\Api\Controllers;
 
 use Flarum\Http\RequestUtil;
+use FoF\Polls\Events\PollImageDeleting;
 use FoF\Polls\Poll;
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Filesystem\Cloud;
 use Illuminate\Contracts\Filesystem\Factory;
 use Illuminate\Support\Arr;
@@ -28,9 +30,15 @@ class DeletePollImageController implements RequestHandlerInterface
      */
     protected $uploadDir;
 
-    public function __construct(Factory $filesystemFactory)
+    /**
+     * @var Dispatcher
+     */
+    protected $events;
+
+    public function __construct(Factory $filesystemFactory, Dispatcher $events)
     {
         $this->uploadDir = $filesystemFactory->disk('fof-polls');
+        $this->events = $events;
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
@@ -41,6 +49,10 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         /** @var Poll $poll */
         $poll = Poll::find($pollId);
 
+        $this->events->dispatch(
+            new PollImageDeleting($poll->image, $actor)
+        );
+
         $this->uploadDir->delete($poll->image);
 
         $poll->image = null;

src/Api/Controllers/DeletePollOptionImageController.php

@@ -12,7 +12,9 @@
 namespace FoF\Polls\Api\Controllers;
 
 use Flarum\Http\RequestUtil;
+use FoF\Polls\Events\PollImageDeleting;
 use FoF\Polls\PollOption;
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Filesystem\Cloud;
 use Illuminate\Contracts\Filesystem\Factory;
 use Illuminate\Support\Arr;
@@ -28,9 +30,15 @@ class DeletePollOptionImageController implements RequestHandlerInterface
      */
     protected $uploadDir;
 
-    public function __construct(Factory $filesystemFactory)
+    /**
+     * @var Dispatcher
+     */
+    protected $events;
+
+    public function __construct(Factory $filesystemFactory, Dispatcher $events)
     {
         $this->uploadDir = $filesystemFactory->disk('fof-polls');
+        $this->events = $events;
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
@@ -44,6 +52,10 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         // if the image_url is a fully qualified URL, we just set it to null
         if (filter_var($option->image_url, FILTER_VALIDATE_URL)) {
         } else {
+            $this->events->dispatch(
+                new PollImageDeleting($option->image, $actor)
+            );
+
             // otherwise we check and delete it from the filesystem
             $this->uploadDir->delete($option->image_url);
         }

src/Api/Controllers/UploadPollImageController.php

@@ -77,10 +77,10 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         $file = Arr::get($request->getUploadedFiles(), $this->filenamePrefix);
 
-        $encodedImage = $this->makeImage($file);
-
         $uploadName = $this->uploadName();
 
+        $encodedImage = $this->makeImage($file, $uploadName);
+
         $this->uploadDir->put($uploadName, $encodedImage);
 
         if ($pollId && $poll = Poll::find($pollId)) {
@@ -91,14 +91,14 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         return $this->jsonResponse($uploadName);
     }
 
-    protected function makeImage(UploadedFileInterface $file): Image
+    protected function makeImage(UploadedFileInterface $file, string $uploadName): Image
     {
         $image = $this->imageManager->make($file->getStream()->getMetadata('uri'));
 
         $height = $this->settings->get('fof-polls.image_height');
         $width = $this->settings->get('fof-polls.image_width');
 
-        $this->events->dispatch(new PollImageWillBeResized($image, $height, $width));
+        $this->events->dispatch(new PollImageWillBeResized($image, $uploadName, $height, $width));
 
         $encodedImage = $this->resizeImage($image, $height, $width);
 

src/Api/Controllers/UploadPollOptionImageController.php

@@ -32,11 +32,11 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         $file = Arr::get($request->getUploadedFiles(), $this->filenamePrefix);
-
-        $encodedImage = $this->makeImage($file);
-
+
         $uploadName = $uploadName = $this->uploadName();
 
+        $encodedImage = $this->makeImage($file, $uploadName);
+
         $this->uploadDir->put($uploadName, $encodedImage);
 
         if ($optionId && $option = PollOption::find($optionId)) {

src/Events/PollImageDeleting.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace FoF\Polls\Events;
+
+use Flarum\User\User;
+
+class PollImageDeleting
+{
+    /**
+     * @var string
+     */
+    public $fileName;
+
+    /**
+     * @var User
+     */
+    public $actor;
+
+    public function __construct(string $fileName, User $actor)
+    {
+        $this->fileName = $fileName;
+        $this->actor = $actor;
+    }
+}

src/Events/PollImageWillBeResized.php

@@ -20,6 +20,11 @@ class PollImageWillBeResized
      */
     public $image;
 
+    /**
+     * @var string
+     */
+    public $fileName;
+
     /**
      * @var int
      */
@@ -30,9 +35,10 @@ class PollImageWillBeResized
      */
     public $width;
 
-    public function __construct(Image $image, int $height, int $width)
+    public function __construct(Image $image, string $fileName, int $height, int $width)
     {
         $this->image = $image;
+        $this->fileName = $fileName;
         $this->height = $height;
         $this->width = $width;
     }