Apply code style

Bump eslint-plugin-jsdoc from 39.9.1 to 44.2.5

.env.example

@@ -38,11 +38,24 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
-AWS_ACCESS_KEY_ID=
+AWS_PUBLIC_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
+AWS_PUBLIC_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
+AWS_PUBLIC_DEFAULT_REGION="us-west-002"
-AWS_BUCKET=
+AWS_PUBLIC_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
+AWS_PUBLIC_USE_PATH_STYLE_ENDPOINT=false
+AWS_PUBLIC_ENDPOINT=
+AWS_PUBLIC_URL=
+
+AWS_PRIVATE_ACCESS_KEY_ID=
+AWS_PRIVATE_SECRET_ACCESS_KEY=
+AWS_PRIVATE_DEFAULT_REGION="us-west-002"
+AWS_PRIVATE_BUCKET=
+AWS_PRIVATE_USE_PATH_STYLE_ENDPOINT=false
+AWS_PRIVATE_ENDPOINT=
+AWS_PRIVATE_URL=
+
+CLOUDFLARE_ZONE_ID=
+CLOUDFLARE_API_KEY=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"

.gitignore

@@ -237,7 +237,7 @@ dist/
 ### This Project ###
 /public/uploads
 /public/build
-/public/tinymce
+# /public/tinymce
 *.key
 
 ### Synk ###

.vscode/settings.json

@@ -15,5 +15,6 @@
     "[php]": {
         // "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
         "editor.defaultFormatter": "wongjn.php-sniffer"
-    }
+    },
+    "cSpell.words": ["TIMESTAMPDIFF"]
 }

app/Conductors/AnalyticsConductor.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Conductors;
+
+use App\Models\Media;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\InvalidCastException;
+use Illuminate\Database\Eloquent\MissingAttributeException;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use LogicException;
+
+class AnalyticsConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = '\App\Models\Analytics';
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = 'created_at';
+
+    /**
+     * The default includes to include in a request.
+     *
+     * @var array
+     */
+    protected $includes = ['duration'];
+
+
+    /**
+     * Return if the current model is visible.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow model to be visible.
+     */
+    public static function viewable(Model $model)
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/analytics') === true);
+    }
+
+    /**
+     * Return if the current model is creatable.
+     *
+     * @return boolean Allow creating model.
+     */
+    public static function creatable()
+    {
+        return true;
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model)
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/analytics') === true);
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model)
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/analytics') === true);
+    }
+}

app/Conductors/ArticleConductor.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Conductors;
+
+use App\Models\Media;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\InvalidCastException;
+use Illuminate\Database\Eloquent\MissingAttributeException;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use LogicException;
+
+class ArticleConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = '\App\Models\Article';
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = '-publish_at';
+
+    /**
+     * The included fields
+     *
+     * @var string[]
+     */
+    protected $includes = ['attachments', 'user'];
+
+
+    /**
+     * Run a scope query on the collection before anything else.
+     *
+     * @param Builder $builder The builder in use.
+     * @return void
+     */
+    public function scope(Builder $builder)
+    {
+        $user = auth()->user();
+        if ($user === null || $user->hasPermission('admin/articles') === false) {
+            $builder
+                ->where('publish_at', '<=', now());
+        }
+    }
+
+    /**
+     * Return if the current model is visible.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow model to be visible.
+     */
+    public static function viewable(Model $model)
+    {
+        if (Carbon::parse($model->publish_at)->isFuture() === true) {
+            $user = auth()->user();
+            if ($user === null || $user->hasPermission('admin/articles') === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Return if the current model is creatable.
+     *
+     * @return boolean Allow creating model.
+     */
+    public static function creatable()
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/articles') === true);
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model)
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/articles') === true);
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model)
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/articles') === true);
+    }
+
+    /**
+     * Transform the final model data
+     *
+     * @param array $data The model data to transform.
+     * @return array The transformed model.
+     */
+    public function transformFinal(array $data)
+    {
+        unset($data['user_id']);
+        return $data;
+    }
+
+    /**
+     * Include Attachments Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeAttachments(Model $model)
+    {
+        return $model->attachments()->get()->map(function ($attachment) {
+            return MediaConductor::includeModel(request(), 'attachments', $attachment->media);
+        });
+    }
+
+    /**
+     * Include User Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeUser(Model $model)
+    {
+        return UserConductor::includeModel(request(), 'user', User::find($model['user_id']));
+    }
+
+    /**
+     * Transform the Hero field.
+     *
+     * @param mixed $value The current value.
+     * @return array The new value.
+     */
+    public function transformHero(mixed $value)
+    {
+        return MediaConductor::includeModel(request(), 'hero', Media::find($value));
+    }
+}

app/Conductors/EventConductor.php

@@ -2,6 +2,7 @@
 
 namespace App\Conductors;
 
+use App\Models\Media;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\InvalidCastException;
@@ -19,7 +20,13 @@ class EventConductor extends Conductor
      * The default sorting field
      * @var string
      */
-    protected $sort = 'start_at';
+    protected $sort = '-start_at';
+
+    /**
+     * The included fields
+     * @var string[]
+     */
+    protected $includes = ['attachments'];
 
 
     /**
@@ -92,19 +99,30 @@ class EventConductor extends Conductor
     }
 
     /**
-     * Transform the model
+     * Include Attachments Field.
      *
-     * @param Model $model The model to transform.
+     * @param Model $model Them model.
-     * @return array The transformed model.
+     * @return mixed The model result.
-     * @throws InvalidCastException Cannot cast item to model.
      */
-    public function transform(Model $model)
+    public function includeAttachments(Model $model)
     {
-        $result = $model->toArray();
+        $user = auth()->user();
-        $result['attachments'] = $model->attachments()->get()->map(function ($attachment) {
-            return MediaConductor::model(request(), $attachment->media);
-        });
 
-        return $result;
+        return $model->attachments()->get()->map(function ($attachment) use ($user) {
+            if ($attachment->private === false || ($user !== null && ($user->hasPermission('admin/events') === true || $attachment->users->contains($user) === true))) {
+                return MediaConductor::includeModel(request(), 'attachments', $attachment->media);
+            }
+        });
+    }
+
+    /**
+     * Transform the Hero field.
+     *
+     * @param mixed $value The current value.
+     * @return array The new value.
+     */
+    public function transformHero(mixed $value)
+    {
+        return MediaConductor::includeModel(request(), 'hero', Media::find($value));
     }
 }

app/Conductors/MediaConductor.php

@@ -4,6 +4,7 @@ namespace App\Conductors;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Auth\User;
 
 class MediaConductor extends Conductor
 {
@@ -19,6 +20,22 @@ class MediaConductor extends Conductor
      */
     protected $sort = 'created_at';
 
+    /**
+     * The included fields
+     *
+     * @var string[]
+     */
+    protected $includes = ['user'];
+
+    /**
+     * The default filters to use in a request.
+     *
+     * @var array
+     */
+    protected $defaultFilters = [
+        'status' => 'OK'
+    ];
+
 
     /**
      * Return an array of model fields visible to the current user.
@@ -32,7 +49,7 @@ class MediaConductor extends Conductor
 
         $user = auth()->user();
         if ($user === null || $user->hasPermission('admin/media') === false) {
-            $fields = arrayRemoveItem($fields, 'permission');
+            $fields = arrayRemoveItem($fields, ['permission', 'storage']);
         }
 
         return $fields;
@@ -48,9 +65,9 @@ class MediaConductor extends Conductor
     {
         $user = auth()->user();
         if ($user === null) {
-            $builder->whereNull('permission');
+            $builder->where('permission', '');
         } else {
-            $builder->whereNull('permission')->orWhereIn('permission', $user->permissions);
+            $builder->where('permission', '')->orWhereIn('permission', $user->permissions);
         }
     }
 
@@ -62,7 +79,7 @@ class MediaConductor extends Conductor
      */
     public static function viewable(Model $model)
     {
-        if ($model->permission !== null) {
+        if ($model->permission !== '') {
             $user = auth()->user();
             if ($user === null || $user->hasPermission($model->permission) === false) {
                 return false;
@@ -106,4 +123,27 @@ class MediaConductor extends Conductor
         $user = auth()->user();
         return ($user !== null && ($model->user_id === $user->id || $user->hasPermission('admin/media') === true));
     }
+
+    /**
+     * Transform the final model data
+     *
+     * @param array $data The model data to transform.
+     * @return array The transformed model.
+     */
+    public function transformFinal(array $data)
+    {
+        unset($data['user_id']);
+        return $data;
+    }
+
+    /**
+     * Include User Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeUser(Model $model)
+    {
+        return UserConductor::includeModel(request(), 'user', User::find($model['user_id']));
+    }
 }

app/Conductors/PostConductor.php

@@ -1,109 +0,0 @@
-<?php
-
-namespace App\Conductors;
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
-
-class PostConductor extends Conductor
-{
-    /**
-     * The Model Class
-     * @var string
-     */
-    protected $class = '\App\Models\Post';
-
-    /**
-     * The default sorting field
-     * @var string
-     */
-    protected $sort = '-publish_at';
-
-
-    /**
-     * Run a scope query on the collection before anything else.
-     *
-     * @param Builder $builder The builder in use.
-     * @return void
-     */
-    public function scope(Builder $builder)
-    {
-        $user = auth()->user();
-        if ($user === null || $user->hasPermission('admin/posts') === false) {
-            $builder
-                ->where('publish_at', '<=', now());
-        }
-    }
-
-    /**
-     * Return if the current model is visible.
-     *
-     * @param Model $model The model.
-     * @return boolean Allow model to be visible.
-     */
-    public static function viewable(Model $model)
-    {
-        if (Carbon::parse($model->publish_at)->isFuture() === true) {
-            $user = auth()->user();
-            if ($user === null || $user->hasPermission('admin/posts') === false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Return if the current model is creatable.
-     *
-     * @return boolean Allow creating model.
-     */
-    public static function creatable()
-    {
-        $user = auth()->user();
-        return ($user !== null && $user->hasPermission('admin/posts') === true);
-    }
-
-    /**
-     * Return if the current model is updatable.
-     *
-     * @param Model $model The model.
-     * @return boolean Allow updating model.
-     */
-    public static function updatable(Model $model)
-    {
-        $user = auth()->user();
-        return ($user !== null && $user->hasPermission('admin/posts') === true);
-    }
-
-    /**
-     * Return if the current model is destroyable.
-     *
-     * @param Model $model The model.
-     * @return boolean Allow deleting model.
-     */
-    public static function destroyable(Model $model)
-    {
-        $user = auth()->user();
-        return ($user !== null && $user->hasPermission('admin/posts') === true);
-    }
-
-    /**
-     * Transform the model
-     *
-     * @param Model $model The model to transform.
-     * @return array The transformed model.
-     * @throws InvalidCastException Cannot cast item to model.
-     */
-    public function transform(Model $model)
-    {
-        $result = $model->toArray();
-        $result['attachments'] = $model->attachments()->get()->map(function ($attachment) {
-            return MediaConductor::model(request(), $attachment->media);
-        });
-
-        return $result;
-    }
-}

app/Conductors/ShortlinkConductor.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Conductors;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Auth\User;
+
+class ShortlinkConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = '\App\Models\Shortlink';
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = 'created_at';
+
+
+    /**
+     * Return if the current model is creatable.
+     *
+     * @return boolean Allow creating model.
+     */
+    public static function creatable()
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/shortlinks') === true);
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model)
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/shortlinks') === true);
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model)
+    {
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/shortlinks') === true);
+    }
+}

app/Conductors/UserConductor.php

@@ -23,7 +23,7 @@ class UserConductor extends Conductor
     {
         $user = auth()->user();
         if ($user === null || $user->hasPermission('admin/users') === false) {
-            return ['id', 'username'];
+            return ['id', 'display_name'];
         }
 
         return parent::fields($model);
@@ -41,8 +41,10 @@ class UserConductor extends Conductor
         $data = $model->toArray();
 
         if ($user === null || ($user->hasPermission('admin/users') === false && strcasecmp($user->id, $model->id) !== 0)) {
-            $fields = ['id', 'username'];
+            $fields = ['id', 'display_name'];
             $data = arrayLimitKeys($data, $fields);
+        } else {
+            $data['permissions'] = $user->permissions;
         }
 
         return $data;

app/Console/Commands/MediaMigrate.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\StoreUploadedFileJob;
+use Illuminate\Console\Command;
+use App\Models\Media;
+use File;
+use Symfony\Component\Console\Input\InputOption;
+
+class MediaMigrate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'media:migrate';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Migrate the uploads folder to the CDN';
+
+
+    /**
+     * Configure the command options.
+     *
+     * @return void
+     */
+    protected function configure()
+    {
+        $this->addOption(
+            'replace',
+            null,
+            InputOption::VALUE_NONE,
+            'Replace existing files'
+        );
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $replace = $this->option('replace');
+
+        $files = File::allFiles(public_path('uploads'));
+
+        foreach ($files as $file) {
+            $filename = pathinfo($file, PATHINFO_BASENAME);
+
+            $medium = Media::where('name', $filename)->first();
+
+            if ($medium !== null) {
+                $medium->update(['status' => 'Processing media']);
+                StoreUploadedFileJob::dispatch($medium, $file, $replace)->onQueue('media');
+            } else {
+                unlink($file);
+            }
+        }
+    }
+}

app/Console/Commands/MediaRebuild.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\StoreUploadedFileJob;
+use Illuminate\Console\Command;
+use App\Models\Media;
+use Symfony\Component\Console\Input\InputOption;
+
+class MediaRebuild extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'media:rebuild';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Rebuild the media table';
+
+
+    /**
+     * Configure the command options.
+     *
+     * @return void
+     */
+    protected function configure()
+    {
+        $this->addOption(
+            'replace',
+            null,
+            InputOption::VALUE_NONE,
+            'Replace existing files'
+        );
+
+        $this->addOption(
+            'all',
+            null,
+            InputOption::VALUE_NONE,
+            'Rebuild all variants'
+        );
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $replace = $this->option('replace');
+        $all = $this->option('replace');
+
+        $media = [];
+        if ($all === true) {
+            $media = Media::all();
+        } else {
+            $media = Media::where(['variants' => ''])->orWhere(['variants' => '[]'])->orWhere(['variants' => '{}'])->get();
+        }
+
+        foreach ($media as $medium) {
+            StoreUploadedFileJob::dispatch($medium, '', $replace)->onQueue('media');
+        }
+    }
+}

app/Enum/Enum.php

@@ -62,7 +62,7 @@ class Enum
      */
     public static function getMessage(int $messageIndex, string $defaultMessage = 'Unknown'): string
     {
-        if(array_key_exists($messageIndex, self::$messages) === true) {
+        if (array_key_exists($messageIndex, self::$messages) === true) {
             return self::$messages[$messageIndex];
         }
 

app/Helpers/Temp.php

@@ -0,0 +1,19 @@
+<?php
+
+/* Temp File Helper Functions */
+
+
+/**
+ * Generate a temporary file path.
+ *
+ * @return str The filtered array.
+ */
+function generateTempFilePath(): string
+{
+    $temporaryDir = storage_path('app/tmp');
+    if (is_dir($temporaryDir) === false) {
+        mkdir($temporaryDir, 0777, true);
+    }
+
+    return $temporaryDir . DIRECTORY_SEPARATOR . uniqid('upload_', true);
+}

app/Http/Controllers/Api/AnalyticsController.php

@@ -0,0 +1,163 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\AnalyticsConductor;
+use App\Conductors\Conductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\AnalyticsRequest;
+use App\Models\Media;
+use App\Models\Analytics;
+use Illuminate\Http\JsonResponse;
+use Carbon\Exceptions\InvalidFormatException;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Database\Eloquent\InvalidCastException;
+use Illuminate\Database\Eloquent\MassAssignmentException;
+use Illuminate\Http\Request;
+
+class AnalyticsController extends ApiController
+{
+    /**
+     * AnalyticsController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')
+            ->only([
+                'index',
+                'update',
+                'delete'
+            ]);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        if ($request->user() !== null && $request->user()?->hasPermission('admin/analytics') === true) {
+            $searchFields = ['attribute', 'type', 'useragent', 'ip'];
+
+            $queryRequest = new Request();
+            $queryRequest->merge($request->only($searchFields));
+            foreach ($searchFields as $field) {
+                unset($request[$field]);
+            }
+
+            $query = Analytics::query()
+                ->selectRaw('session,
+                MIN(created_at) as created_at,
+                TIMESTAMPDIFF(MINUTE, MIN(created_at), MAX(created_at)) as duration');
+            $query = Conductor::filterQuery($query, $queryRequest);
+
+            list($collection, $total) = AnalyticsConductor::collection($request, $query
+            ->groupBy('session')
+            ->get());
+
+            return $this->respondAsResource(
+                $collection,
+                ['isCollection' => true,
+                    'appendData' => ['total' => $total]
+                ]
+            );
+        }//end if
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request   The endpoint request.
+     * @param  \App\Models\Analytics    $analytics The analyics model.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, int $session)
+    {
+        if ($request->user() !== null && $request->user()?->hasPermission('admin/analytics') === true) {
+            list($collection, $total) = AnalyticsConductor::collection($request, Analytics::query()
+            ->where('session', $session)
+            ->get());
+
+            return $this->respondAsResource(
+                $collection,
+                ['isCollection' => true,
+                    'appendData' => ['total' => $total]
+                ]
+            );
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param \App\Http\Requests\AnalyticsRequest $request The user request.
+     * @return \Illuminate\Http\Response
+     */
+    public function store(AnalyticsRequest $request)
+    {
+        if (AnalyticsConductor::creatable() === true) {
+            $analytics = null;
+            $user = $request->user();
+
+            $data = [
+                'type' => $request->input('type'),
+                'attribute' => $request->input('attribute', ''),
+                'useragent' => $request->userAgent(),
+                'ip' => $request->ip()
+            ];
+
+            if ($user !== null && $user->hasPermission('admin/analytics') === true && $request->has('session') === true) {
+                $data['session'] = $request->input('session');
+                $analytics = Analytics::create($data);
+            } else {
+                $analytics = Analytics::createWithSession($data);
+            }
+
+            return $this->respondAsResource(
+                AnalyticsConductor::model($request, $analytics),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
+        } else {
+            return $this->respondForbidden();
+        }//end if
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \App\Http\Requests\AnalyticsRequest $request   The analytics update request.
+     * @param  \App\Models\Analytics               $analytics The specified analytics.
+     * @return \Illuminate\Http\Response
+     */
+    public function update(AnalyticsRequest $request, Analytics $analytics)
+    {
+        if (AnalyticsConductor::updatable($analytics) === true) {
+            $analytics->update($request->all());
+            return $this->respondAsResource(AnalyticsConductor::model($request, $analytics));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\Analytics $analytics The specified analytics.
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Analytics $analytics)
+    {
+        if (AnalyticsConductor::destroyable($analytics) === true) {
+            $analytics->delete();
+            return $this->respondNoContent();
+        } else {
+            return $this->respondForbidden();
+        }
+    }
+}

app/Http/Controllers/Api/ApiController.php

@@ -81,6 +81,15 @@ class ApiController extends Controller
         return response()->json([], HttpResponseCodes::HTTP_CREATED);
     }
 
+    /**
+     * Return accepted
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function respondAccepted()
+    {
+        return response()->json([], HttpResponseCodes::HTTP_ACCEPTED);
+    }
+
     /**
      * Return single error message
      *
@@ -121,28 +130,36 @@ class ApiController extends Controller
     /**
      * Return resource data
      *
-     * @param array|Model|Collection $data         Resource data.
+     * @param array|Model|Collection $data    Resource data.
-     * @param array                  $options      Respond options.
+     * @param array                  $options Respond options.
      * @return \Illuminate\Http\JsonResponse
      */
     protected function respondAsResource(
         mixed $data,
         array $options = [],
+        $validationFn = null
     ) {
         $isCollection = $options['isCollection'] ?? false;
         $appendData = $options['appendData'] ?? null;
         $resourceName = $options['resourceName'] ?? null;
-        $respondCode = $options['respondCode'] ?? HttpResponseCodes::HTTP_OK;
+        $respondCode = ($options['respondCode'] ?? HttpResponseCodes::HTTP_OK);
 
         if ($data === null || ($data instanceof Collection && $data->count() === 0)) {
-            return $this->respondNotFound();
+            $validationData = [];
+            if (array_key_exists('appendData', $options) === true) {
+                $validationData = $options['appendData'];
+            }
+
+            if ($validationFn === null || $validationFn($validationData) === true) {
+                return $this->respondNotFound();
+            }
         }
 
-        if(is_null($resourceName) === true || empty($resourceName) === true) {
+        if (is_null($resourceName) === true || empty($resourceName) === true) {
             $resourceName = $this->resourceName;
         }
 
-        if(is_null($resourceName) === true || empty($resourceName) === true) {
+        if (is_null($resourceName) === true || empty($resourceName) === true) {
             $resourceName = get_class($this);
             $resourceName = substr($resourceName, (strrpos($resourceName, '\\') + 1));
             $resourceName = substr($resourceName, 0, strpos($resourceName, 'Controller'));

app/Http/Controllers/Api/ArticleController.php

@@ -3,11 +3,11 @@
 namespace App\Http\Controllers\Api;
 
 use App\Conductors\MediaConductor;
-use App\Conductors\PostConductor;
+use App\Conductors\ArticleConductor;
 use App\Enum\HttpResponseCodes;
-use App\Http\Requests\PostRequest;
+use App\Http\Requests\ArticleRequest;
 use App\Models\Media;
-use App\Models\Post;
+use App\Models\Article;
 use Illuminate\Http\JsonResponse;
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Contracts\Container\BindingResolutionException;
@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\InvalidCastException;
 use Illuminate\Database\Eloquent\MassAssignmentException;
 use Illuminate\Http\Request;
 
-class PostController extends ApiController
+class ArticleController extends ApiController
 {
     /**
      * ApplicationController constructor.
@@ -38,12 +38,13 @@ class PostController extends ApiController
      */
     public function index(Request $request)
     {
-        list($collection, $total) = PostConductor::request($request);
+        list($collection, $total) = ArticleConductor::request($request);
 
         return $this->respondAsResource(
             $collection,
             ['isCollection' => true,
-            'appendData' => ['total' => $total]]
+                'appendData' => ['total' => $total]
+            ]
         );
     }
 
@@ -51,13 +52,13 @@ class PostController extends ApiController
      * Display the specified resource.
      *
      * @param \Illuminate\Http\Request $request The endpoint request.
-     * @param  \App\Models\Post         $post    The post model.
+     * @param  \App\Models\Article      $article The article model.
      * @return \Illuminate\Http\Response
      */
-    public function show(Request $request, Post $post)
+    public function show(Request $request, Article $article)
     {
-        if (PostConductor::viewable($post) === true) {
+        if (ArticleConductor::viewable($article) === true) {
-            return $this->respondAsResource(PostConductor::model($request, $post));
+            return $this->respondAsResource(ArticleConductor::model($request, $article));
         }
 
         return $this->respondForbidden();
@@ -66,15 +67,15 @@ class PostController extends ApiController
     /**
      * Store a newly created resource in storage.
      *
-     * @param \App\Http\Requests\PostRequest $request The user request.
+     * @param \App\Http\Requests\ArticleRequest $request The user request.
      * @return \Illuminate\Http\Response
      */
-    public function store(PostRequest $request)
+    public function store(ArticleRequest $request)
     {
-        if (PostConductor::creatable() === true) {
+        if (ArticleConductor::creatable() === true) {
-            $post = Post::create($request->all());
+            $article = Article::create($request->all());
             return $this->respondAsResource(
-                PostConductor::model($request, $post),
+                ArticleConductor::model($request, $article),
                 ['respondCode' => HttpResponseCodes::HTTP_CREATED]
             );
         } else {
@@ -85,15 +86,15 @@ class PostController extends ApiController
     /**
      * Update the specified resource in storage.
      *
-     * @param  \App\Http\Requests\PostRequest $request The post update request.
+     * @param  \App\Http\Requests\ArticleRequest $request The article update request.
-     * @param  \App\Models\Post               $post    The specified post.
+     * @param  \App\Models\Article               $article The specified article.
      * @return \Illuminate\Http\Response
      */
-    public function update(PostRequest $request, Post $post)
+    public function update(ArticleRequest $request, Article $article)
     {
-        if (PostConductor::updatable($post) === true) {
+        if (ArticleConductor::updatable($article) === true) {
-            $post->update($request->all());
+            $article->update($request->all());
-            return $this->respondAsResource(PostConductor::model($request, $post));
+            return $this->respondAsResource(ArticleConductor::model($request, $article));
         }
 
         return $this->respondForbidden();
@@ -102,13 +103,13 @@ class PostController extends ApiController
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Models\Post $post The specified post.
+     * @param  \App\Models\Article $article The specified article.
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Post $post)
+    public function destroy(Article $article)
     {
-        if (PostConductor::destroyable($post) === true) {
+        if (ArticleConductor::destroyable($article) === true) {
-            $post->delete();
+            $article->delete();
             return $this->respondNoContent();
         } else {
             return $this->respondForbidden();
@@ -119,16 +120,16 @@ class PostController extends ApiController
      * Get a list of attachments related to this model.
      *
      * @param Request $request The user request.
-     * @param Post    $post    The post model.
+     * @param Article $article The article model.
-     * @return JsonResponse Returns the post attachments.
+     * @return JsonResponse Returns the article attachments.
      * @throws InvalidFormatException
      * @throws BindingResolutionException
      * @throws InvalidCastException
      */
-    public function getAttachments(Request $request, Post $post)
+    public function getAttachments(Request $request, Article $article)
     {
-        if (PostConductor::viewable($post) === true) {
+        if (ArticleConductor::viewable($article) === true) {
-            $medium = $post->attachments->map(function ($attachment) {
+            $medium = $article->attachments->map(function ($attachment) {
                 return $attachment->media;
             });
 
@@ -142,16 +143,16 @@ class PostController extends ApiController
      * Store an attachment related to this model.
      *
      * @param Request $request The user request.
-     * @param Post    $post    The post model.
+     * @param Article $article The article model.
      * @return JsonResponse The response.
      * @throws BindingResolutionException
      * @throws MassAssignmentException
      */
-    public function storeAttachment(Request $request, Post $post)
+    public function storeAttachment(Request $request, Article $article)
     {
-        if (PostConductor::updatable($post) === true) {
+        if (ArticleConductor::updatable($article) === true) {
-            if($request->has("medium") && Media::find($request->medium)) {
+            if ($request->has("medium") && Media::find($request->medium)) {
-                $post->attachments()->create(['media_id' => $request->medium]);
+                $article->attachments()->create(['media_id' => $request->medium]);
                 return $this->respondCreated();
             }
 
@@ -165,21 +166,21 @@ class PostController extends ApiController
      * Update/replace attachments related to this model.
      *
      * @param Request $request The user request.
-     * @param Post    $post    The related model.
+     * @param Article $article The related model.
      * @return JsonResponse
      * @throws BindingResolutionException
      * @throws MassAssignmentException
      */
-    public function updateAttachments(Request $request, Post $post)
+    public function updateAttachments(Request $request, Article $article)
     {
-        if (PostConductor::updatable($post) === true) {
+        if (ArticleConductor::updatable($article) === true) {
             $mediaIds = $request->attachments;
-            if(is_array($mediaIds) === false) {
+            if (is_array($mediaIds) === false) {
                 $mediaIds = explode(',', $request->attachments);
             }
 
             $mediaIds = array_map('trim', $mediaIds); // trim each media ID
-            $attachments = $post->attachments;
+            $attachments = $article->attachments;
 
             // Delete attachments that are not in $mediaIds
             foreach ($attachments as $attachment) {
@@ -188,7 +189,7 @@ class PostController extends ApiController
                 }
             }
 
-            // Create new attachments for media IDs that are not already in $post->attachments()
+            // Create new attachments for media IDs that are not already in $article->attachments()
             foreach ($mediaIds as $mediaId) {
                 $found = false;
 
@@ -200,12 +201,12 @@ class PostController extends ApiController
                 }
 
                 if (!$found) {
-                    $post->attachments()->create(['media_id' => $mediaId]);
+                    $article->attachments()->create(['media_id' => $mediaId]);
                 }
             }
 
             return $this->respondNoContent();
-        }
+        }//end if
 
         return $this->respondForbidden();
     }
@@ -213,15 +214,15 @@ class PostController extends ApiController
     /**
      * Delete a specific related attachment.
      * @param Request $request The user request.
-     * @param Post $post The model.
+     * @param Article $article The model.
-     * @param Media $medium The attachment medium.
+     * @param Media   $medium  The attachment medium.
      * @return JsonResponse
      * @throws BindingResolutionException
      */
-    public function deleteAttachment(Request $request, Post $post, Media $medium)
+    public function deleteAttachment(Request $request, Article $article, Media $medium)
     {
-        if (PostConductor::updatable($post) === true) {
+        if (ArticleConductor::updatable($article) === true) {
-            $attachments = $post->attachments;
+            $attachments = $article->attachments;
             $deleted = false;
 
             foreach ($attachments as $attachment) {

app/Http/Controllers/Api/AttachmentController.php

@@ -29,7 +29,7 @@ class AttachmentController extends ApiController
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function store(Request $request)
@@ -40,7 +40,7 @@ class AttachmentController extends ApiController
     /**
      * Display the specified resource.
      *
-     * @param  \App\Models\Attachment  $attachment
+     * @param  \App\Models\Attachment $attachment
      * @return \Illuminate\Http\Response
      */
     public function show(Attachment $attachment)
@@ -51,7 +51,7 @@ class AttachmentController extends ApiController
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\Models\Attachment  $attachment
+     * @param  \App\Models\Attachment $attachment
      * @return \Illuminate\Http\Response
      */
     public function edit(Attachment $attachment)
@@ -62,11 +62,11 @@ class AttachmentController extends ApiController
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
-     * @param  \App\Models\Attachment  $attachment
+     * @param  \App\Models\Attachment   $attachment
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, Attachment  $attachment)
+    public function update(Request $request, Attachment $attachment)
     {
         //
     }
@@ -74,10 +74,10 @@ class AttachmentController extends ApiController
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Models\Attachment  $attachment
+     * @param  \App\Models\Attachment $attachment
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Attachment  $attachment)
+    public function destroy(Attachment $attachment)
     {
         //
     }

app/Http/Controllers/Api/AuthController.php

@@ -47,18 +47,18 @@ class AuthController extends ApiController
      */
     public function login(AuthLoginRequest $request)
     {
-        $user = User::where('username', '=', $request->input('username'))->first();
+        $user = User::where('email', '=', $request->input('email'))->first();
 
-        if ($user !== null && Hash::check($request->input('password'), $user->password) === true) {
+        if ($user !== null && strlen($user->password) > 0 && Hash::check($request->input('password'), $user->password) === true) {
             if ($user->email_verified_at === null) {
                 return $this->respondWithErrors([
-                    'username' => 'Email address has not been verified.'
+                    'email' => 'Email address has not been verified.'
                 ]);
             }
 
             if ($user->disabled === true) {
                 return $this->respondWithErrors([
-                    'username' => 'Account has been disabled.'
+                    'email' => 'Account has been disabled.'
                 ]);
             }
 
@@ -78,8 +78,8 @@ class AuthController extends ApiController
         }//end if
 
         return $this->respondWithErrors([
-            'username' => 'Invalid username or password',
+            'email' => 'Invalid email or password',
-            'password' => 'Invalid username or password',
+            'password' => 'Invalid email or password',
         ]);
     }
 

app/Http/Controllers/Api/EventController.php

@@ -6,8 +6,10 @@ use App\Enum\HttpResponseCodes;
 use App\Models\Event;
 use App\Conductors\EventConductor;
 use App\Conductors\MediaConductor;
+use App\Conductors\UserConductor;
 use App\Http\Requests\EventRequest;
 use App\Models\Media;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class EventController extends ApiController
@@ -18,7 +20,7 @@ class EventController extends ApiController
     public function __construct()
     {
         $this->middleware('auth:sanctum')
-        ->only(['store','update','destroy']);
+        ->only(['store','update','destroy', 'userAdd', 'userUpdate', 'userDelete']);
     }
 
     /**
@@ -111,11 +113,8 @@ class EventController extends ApiController
      * Get a list of attachments related to this model.
      *
      * @param Request $request The user request.
-     * @param Post    $post    The post model.
+     * @param Event   $event   The event model.
-     * @return JsonResponse Returns the post attachments.
+     * @return JsonResponse Returns the event attachments.
-     * @throws InvalidFormatException
-     * @throws BindingResolutionException
-     * @throws InvalidCastException
      */
     public function getAttachments(Request $request, Event $event)
     {
@@ -134,15 +133,13 @@ class EventController extends ApiController
      * Store an attachment related to this model.
      *
      * @param Request $request The user request.
-     * @param Post    $post    The post model.
+     * @param Event   $event   The event model.
      * @return JsonResponse The response.
-     * @throws BindingResolutionException
-     * @throws MassAssignmentException
      */
     public function storeAttachment(Request $request, Event $event)
     {
         if (EventConductor::updatable($event) === true) {
-            if ($request->has("medium") && Media::find($request->medium)) {
+            if ($request->has("medium") === true && Media::find($request->medium) !== null) {
                 $event->attachments()->create(['media_id' => $request->medium]);
                 return $this->respondCreated();
             }
@@ -157,10 +154,8 @@ class EventController extends ApiController
      * Update/replace attachments related to this model.
      *
      * @param Request $request The user request.
-     * @param Post    $post    The related model.
+     * @param Event   $event   The related model.
      * @return JsonResponse
-     * @throws BindingResolutionException
-     * @throws MassAssignmentException
      */
     public function updateAttachments(Request $request, Event $event)
     {
@@ -175,23 +170,23 @@ class EventController extends ApiController
 
             // Delete attachments that are not in $mediaIds
             foreach ($attachments as $attachment) {
-                if (!in_array($attachment->media_id, $mediaIds)) {
+                if (in_array($attachment->media_id, $mediaIds) === false) {
                     $attachment->delete();
                 }
             }
 
-            // Create new attachments for media IDs that are not already in $post->attachments()
+            // Create new attachments for media IDs that are not already in $article->attachments()
             foreach ($mediaIds as $mediaId) {
                 $found = false;
 
                 foreach ($attachments as $attachment) {
-                    if ($attachment->media_id == $mediaId) {
+                    if ($attachment->media_id === $mediaId) {
                         $found = true;
                         break;
                     }
                 }
 
-                if (!$found) {
+                if ($found === false) {
                     $event->attachments()->create(['media_id' => $mediaId]);
                 }
             }
@@ -204,11 +199,11 @@ class EventController extends ApiController
 
     /**
      * Delete a specific related attachment.
+     *
      * @param Request $request The user request.
-     * @param Post    $post    The model.
+     * @param Event   $event   The model.
      * @param Media   $medium  The attachment medium.
      * @return JsonResponse
-     * @throws BindingResolutionException
      */
     public function deleteAttachment(Request $request, Event $event, Media $medium)
     {
@@ -224,7 +219,7 @@ class EventController extends ApiController
                 }
             }
 
-            if ($deleted) {
+            if ($deleted === true) {
                 // Attachment was deleted successfully
                 return $this->respondNoContent();
             } else {
@@ -235,4 +230,82 @@ class EventController extends ApiController
 
         return $this->respondForbidden();
     }
+
+    public function userList(Request $request, Event $event)
+    {
+        $authUser = $request->user();
+        $eventUsers = $event->users;
+
+        if ($authUser !== null) {
+            $isAdmin = $authUser->hasPermission('admin/events');
+            $isEventUser = $eventUsers->contains($authUser->id);
+
+            if ($isAdmin === true || $isEventUser === true) {
+                if ($isAdmin === false) {
+                    $eventUsers = $eventUsers->filter(function ($user) use ($authUser) {
+                        return $user->id === $authUser->id;
+                    });
+                }
+
+                return $this->respondAsResource(UserConductor::collection($request, $eventUsers), ['isCollection' => true, 'resourceName' => 'users']);
+            }
+
+            return $this->respondNotFound();
+        }
+
+        return $this->respondForbidden();
+    }
+
+    public function userAdd(Request $request, Event $event)
+    {
+        $authUser = $request->user();
+        if ($authUser !== null && $authUser->hasPermission('admin/events') === true) {
+            if ($request->has("users") === true) {
+                $eventUsers = $event->users()->pluck('user_id')->toArray(); // Get the current users in the event
+                $requestedUsers = $request->input("users"); // Get the requested users
+
+                $usersToAdd = array_diff($requestedUsers, $eventUsers); // Users to add
+                $usersToRemove = array_diff($eventUsers, $requestedUsers); // Users to remove
+
+                // Add missing users
+                foreach ($usersToAdd as $userToAdd) {
+                    if (User::find($userToAdd) !== null) {
+                        $event->users()->attach($userToAdd);
+                    }
+                }
+
+                // Remove extra users
+                foreach ($usersToRemove as $userToRemove) {
+                    $event->users()->detach($userToRemove);
+                }
+
+                return $this->respondNoContent();
+            }//end if
+
+            return $this->respondWithErrors(['users' => 'The user list was not found']);
+        }//end if
+
+        return $this->respondForbidden();
+    }
+
+    public function userUpdate(Request $request, Event $event)
+    {
+        // only admin/events permitted
+    }
+
+    public function userDelete(Request $request, Event $event, User $user)
+    {
+        $authUser = $request->user();
+        if ($authUser !== null && $authUser->hasPermission('admin/events') === true) {
+            $eventUsers = $event->users;
+            if ($eventUsers->find($user->id) !== null) {
+                $eventUsers->detach($user->id);
+                return $this->respondNoContent();
+            } else {
+                return $this->respondNotFound();
+            }
+        }
+
+        return $this->respondForbidden();
+    }
 }

app/Http/Controllers/Api/MediaController.php

@@ -8,6 +8,7 @@ use App\Http\Requests\MediaRequest;
 use App\Models\Media;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
 use Laravel\Sanctum\PersonalAccessToken;
 
 class MediaController extends ApiController
@@ -34,7 +35,11 @@ class MediaController extends ApiController
         return $this->respondAsResource(
             $collection,
             ['isCollection' => true,
-            'appendData' => ['total' => $total]]
+                'appendData' => ['total' => $total]
+            ],
+            function ($options) {
+                return $options['total'] === 0;
+            }
         );
     }
 
@@ -80,31 +85,23 @@ class MediaController extends ApiController
                 }
             }
 
-            if ($file->getSize() > Media::maxUploadSize()) {
+            if ($file->getSize() > Media::getMaxUploadSize()) {
                 return $this->respondTooLarge();
             }
 
-            $title = $file->getClientOriginalName();
+            try {
-            $mime = $file->getMimeType();
+                $media = Media::createFromUploadedFile($request, $file);
-            $fileInfo = Media::store($file, empty($request->input('permission')));
+            } catch (\Exception $e) {
-            if ($fileInfo === null) {
+                if ($e->getCode() === Media::FILE_SIZE_EXCEEDED_ERROR) {
-                return $this->respondWithErrors(
+                    return $this->respondTooLarge();
-                    ['file' => 'The file could not be stored on the server'],
+                } else {
-                    HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR
+                    return $this->respondWithErrors(['file' => $e->getMessage()]);
-                );
+                }
             }
 
-            $request->merge([
-                'title' => $title,
-                'mime' => $mime,
-                'name' => $fileInfo['name'],
-                'size' => filesize($fileInfo['path'])
-            ]);
-
-            $media = $request->user()->media()->create($request->all());
             return $this->respondAsResource(
                 MediaConductor::model($request, $media),
-                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+                ['respondCode' => HttpResponseCodes::HTTP_ACCEPTED]
             );
         }//end if
 
@@ -123,32 +120,36 @@ class MediaController extends ApiController
         if (MediaConductor::updatable($medium) === true) {
             $file = $request->file('file');
             if ($file !== null) {
-                if ($file->getSize() > Media::maxUploadSize()) {
+                if ($file->isValid() !== true) {
-                    return $this->respondTooLarge();
+                    switch ($file->getError()) {
+                        case UPLOAD_ERR_INI_SIZE:
+                        case UPLOAD_ERR_FORM_SIZE:
+                            return $this->respondTooLarge();
+                        case UPLOAD_ERR_PARTIAL:
+                            return $this->respondWithErrors(['file' => 'The file upload was interrupted.']);
+                        default:
+                            return $this->respondWithErrors(['file' => 'An error occurred uploading the file to the server.']);
+                    }
                 }
 
-                $oldPath = $medium->path();
+                if ($file->getSize() > Media::getMaxUploadSize()) {
-                $fileInfo = Media::store($file, empty($request->input('permission')));
+                    return $this->respondTooLarge();
-                if ($fileInfo === null) {
+                }
+            }
+
+            $medium->update($request->all());
+
+            if ($file !== null) {
+                try {
+                    $medium->updateWithUploadedFile($file);
+                } catch (\Exception $e) {
                     return $this->respondWithErrors(
-                        ['file' => 'The file could not be stored on the server'],
+                        ['file' => $e->getMessage()],
                         HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR
                     );
                 }
+            }
 
-                if (file_exists($oldPath) === true) {
-                    unlink($oldPath);
-                }
-
-                $request->merge([
-                    'title' => $file->getClientOriginalName(),
-                    'mime' => $file->getMimeType(),
-                    'name' => $fileInfo['name'],
-                    'size' => filesize($fileInfo['path'])
-                ]);
-            }//end if
-
-            $medium->update($request->all());
             return $this->respondAsResource(MediaConductor::model($request, $medium));
         }//end if
 
@@ -164,10 +165,6 @@ class MediaController extends ApiController
     public function destroy(Media $medium)
     {
         if (MediaConductor::destroyable($medium) === true) {
-            if (file_exists($medium->path()) === true) {
-                unlink($medium->path());
-            }
-
             $medium->delete();
             return $this->respondNoContent();
         }

app/Http/Controllers/Api/OCRController.php

@@ -32,7 +32,7 @@ class OCRController extends ApiController
             $data = ['ocr' => []];
 
             $filters = $request->get('filters', ['tesseract']);
-            if(is_array($filters) === false) {
+            if (is_array($filters) === false) {
                 $filters = explode(',', $filters);
             }
 
@@ -52,9 +52,12 @@ class OCRController extends ApiController
             // We need progress updates to break the connection mid-way
             curl_setopt($ch, CURLOPT_BUFFERSIZE, 128); // more progress info
             curl_setopt($ch, CURLOPT_NOPROGRESS, false);
-            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function(
+            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function (
-                $downloadSize, $downloaded, $uploadSize, $uploaded
+                $downloadSize,
-            ) use($maxDownloadSize) {
+                $downloaded,
+                $uploadSize,
+                $uploaded
+            ) use ($maxDownloadSize) {
                 return ($downloaded > $maxDownloadSize) ? 1 : 0;
             });
 
@@ -62,9 +65,9 @@ class OCRController extends ApiController
             $curlError = curl_errno($ch);
             $curlSize = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD);
             curl_close($ch);
-            if($curlError !== 0) {
+            if ($curlError !== 0) {
                 $error = 'File size is larger then allowed';
-                if($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) {
+                if ($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) {
                     $error = CurlErrorCodes::getMessage($curlError);
                 }
 
@@ -77,8 +80,8 @@ class OCRController extends ApiController
 
             // tesseract (overall)
             $ocr = null;
-            foreach($filters as $filterItem) {
+            foreach ($filters as $filterItem) {
-                if(str_starts_with($filterItem, 'tesseract') === true) {
+                if (str_starts_with($filterItem, 'tesseract') === true) {
                     $ocr = new TesseractOCR();
                     $ocr->image($urlDownloadFilePath);
                     if ($tesseractOEM !== null) {
@@ -95,11 +98,10 @@ class OCRController extends ApiController
             }
 
             // Image Filter Function
-            $tesseractImageFilterFunc = function($filter, $options = null) use($curlResult, $curlSize, $ocr) {
+            $tesseractImageFilterFunc = function ($filter, $options = null) use ($curlResult, $curlSize, $ocr) {
                 $result = '';
                 $img = imagecreatefromstring($curlResult);
                 if ($img !== false && (($options !== null && imagefilter($img, $filter, $options) === true) || ($options === null && imagefilter($img, $filter) === true))) {
-
                     ob_start();
                     imagepng($img);
                     $imgData = ob_get_contents();
@@ -116,7 +118,7 @@ class OCRController extends ApiController
             };
 
             // Image Scale Function
-            $tesseractImageScaleFunc = function($scaleFunc) use ($curlResult, $ocr) {
+            $tesseractImageScaleFunc = function ($scaleFunc) use ($curlResult, $ocr) {
                 $result = '';
                 $srcImage = imagecreatefromstring($curlResult);
                 $srcWidth = imagesx($srcImage);
@@ -143,7 +145,7 @@ class OCRController extends ApiController
             };
 
             // filter: tesseract
-            if(in_array('tesseract', $filters) === true) {
+            if (in_array('tesseract', $filters) === true) {
                 $data['ocr']['tesseract'] = $ocr->run(500);
             }
 
@@ -154,14 +156,14 @@ class OCRController extends ApiController
 
             // filter: tesseract.double_scale
             if (in_array('tesseract.double_scale', $filters) === true) {
-                $data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function($size) {
+                $data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function ($size) {
                     return $size * 2;
                 });
             }
 
             // filter: tesseract.half_scale
             if (in_array('tesseract.half_scale', $filters) === true) {
-                $data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function($size) {
+                $data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function ($size) {
                     return $size / 2;
                 });
             }
@@ -187,12 +189,12 @@ class OCRController extends ApiController
             }
 
             // filter: keras
-            if(in_array('keras', $filters) === true) {
+            if (in_array('keras', $filters) === true) {
                 $cmd = '/usr/bin/python3 ' . base_path() . '/scripts/keras_oc.py ' . urlencode($url);
                 $command = escapeshellcmd($cmd);
                 $output = shell_exec($cmd);
                 if ($output !== null && strlen($output) > 0) {
-                    $output = substr($output, strpos($output, '----------START----------') + 25);
+                    $output = substr($output, (strpos($output, '----------START----------') + 25));
                 } else {
                     $output = '';
                 }

app/Http/Controllers/Api/ShortlinkController.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\MediaConductor;
+use App\Conductors\ShortlinkConductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\MediaRequest;
+use App\Http\Requests\ShortlinkRequest;
+use App\Models\Media;
+use App\Models\Shortlink;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
+use Laravel\Sanctum\PersonalAccessToken;
+
+class ShortlinkController extends ApiController
+{
+    /**
+     * ApplicationController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')
+        ->only(['store','update','destroy']);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        list($collection, $total) = ShortlinkConductor::request($request);
+
+        return $this->respondAsResource(
+            $collection,
+            ['isCollection' => true,
+                'appendData' => ['total' => $total]
+            ],
+            function ($options) {
+                return $options['total'] === 0;
+            }
+        );
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request   The endpoint request.
+     * @param  \App\Models\Shortlink    $shortlink The request shortlink.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, Shortlink $shortlink)
+    {
+        if (ShortlinkConductor::viewable($shortlink) === true) {
+            return $this->respondAsResource(ShortlinkConductor::model($request, $shortlink));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Store a new media resource
+     *
+     * @param  \App\Http\Requests\ShortlinkRequest $request The shortlink.
+     * @return \Illuminate\Http\Response
+     */
+    public function store(ShortlinkRequest $request)
+    {
+        if (ShortlinkConductor::creatable() === true) {
+            $shortlink = Shortlink::create($request->all());
+
+            return $this->respondAsResource(
+                ShortlinkConductor::model($request, $shortlink),
+                ['respondCode' => HttpResponseCodes::HTTP_ACCEPTED]
+            );
+        }//end if
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Update the media resource in storage.
+     *
+     * @param  \App\Http\Requests\ShortlinkRequest $request The update request.
+     * @param  \App\Models\Shortlink               $medium  The specified shortlink.
+     * @return \Illuminate\Http\Response
+     */
+    public function update(ShortlinkRequest $request, Shortlink $shortlink)
+    {
+        if (ShortlinkConductor::updatable($shortlink) === true) {
+            $shortlink->update($request->all());
+            return $this->respondAsResource(ShortlinkConductor::model($request, $shortlink));
+        }//end if
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\Shortlink $medium Specified shortlink.
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Shortlink $shortlink)
+    {
+        if (ShortlinkConductor::destroyable($shortlink) === true) {
+            $shortlink->delete();
+            return $this->respondNoContent();
+        }
+
+        return $this->respondForbidden();
+    }
+}

app/Http/Controllers/Api/SubscriptionController.php

@@ -35,7 +35,8 @@ class SubscriptionController extends ApiController
         return $this->respondAsResource(
             $collection,
             ['isCollection' => true,
-            'appendData' => ['total' => $total]]
+                'appendData' => ['total' => $total]
+            ]
         );
     }
 

app/Http/Controllers/Api/UserController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Conductors\EventConductor;
 use App\Enum\HttpResponseCodes;
 use App\Http\Requests\UserRequest;
 use App\Http\Requests\UserForgotPasswordRequest;
-use App\Http\Requests\UserForgotUsernameRequest;
 use App\Http\Requests\UserRegisterRequest;
 use App\Http\Requests\UserResendVerifyEmailRequest;
 use App\Http\Requests\UserResetPasswordRequest;
@@ -14,7 +14,6 @@ use App\Jobs\SendEmailJob;
 use App\Mail\ChangedEmail;
 use App\Mail\ChangedPassword;
 use App\Mail\ChangeEmailVerify;
-use App\Mail\ForgotUsername;
 use App\Mail\ForgotPassword;
 use App\Mail\EmailVerify;
 use App\Models\User;
@@ -22,6 +21,8 @@ use App\Models\UserCode;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use App\Conductors\UserConductor;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 class UserController extends ApiController
 {
@@ -37,10 +38,10 @@ class UserController extends ApiController
             'register',
             'exists',
             'forgotPassword',
-            'forgotUsername',
             'resetPassword',
             'verifyEmail',
-            'resendVerifyEmailCode'
+            'resendVerifyEmailCode',
+            'eventList',
         ]);
     }
 
@@ -57,7 +58,8 @@ class UserController extends ApiController
         return $this->respondAsResource(
             $collection,
             ['isCollection' => true,
-            'appendData' => ['total' => $total]]
+                'appendData' => ['total' => $total]
+            ]
         );
     }
 
@@ -97,14 +99,14 @@ class UserController extends ApiController
      * Update the specified resource in storage.
      *
      * @param  \App\Http\Requests\UserRequest $request The user update request.
-     * @param  \App\Models\User                     $user    The specified user.
+     * @param  \App\Models\User               $user    The specified user.
      * @return \Illuminate\Http\Response
      */
     public function update(UserRequest $request, User $user)
     {
         if (UserConductor::updatable($user) === true) {
             $input = [];
-            $updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password'];
+            $updatable = ['first_name', 'last_name', 'email', 'phone', 'password', 'display_name'];
 
             if ($request->user()->hasPermission('admin/user') === true) {
                 $updatable = array_merge($updatable, ['email_verified_at']);
@@ -148,15 +150,28 @@ class UserController extends ApiController
     public function register(UserRegisterRequest $request)
     {
         try {
-            $user = User::create([
+            $userData = $request->only([
-                'first_name' => $request->input('first_name'),
+                'first_name',
-                'last_name' => $request->input('last_name'),
+                'last_name',
-                'username' => $request->input('username'),
+                'email',
-                'email' => $request->input('email'),
+                'phone',
-                'phone' => $request->input('phone'),
+                'password',
-                'password' => Hash::make($request->input('password'))
+                'display_name',
             ]);
 
+            $userData['password'] = Hash::make($userData['password']);
+
+            $user = User::where('email', $request->input('email'))
+                ->whereNull('password')
+                ->first();
+
+            if ($user === null) {
+                $user = User::create($userData);
+            } else {
+                unset($userData['email']);
+                $user->update($userData);
+            }//end if
+
             $code = $user->codes()->create([
                 'action' => 'verify-email',
             ]);
@@ -173,26 +188,6 @@ class UserController extends ApiController
         }//end try
     }
 
-    /**
-     * Sends an email with all the usernames registered at that address
-     *
-     * @param \App\Http\Requests\UserForgotUsernameRequest $request The forgot username request.
-     * @return \Illuminate\Http\Response
-     */
-    public function forgotUsername(UserForgotUsernameRequest $request)
-    {
-        $users = User::where('email', $request->input('email'))->whereNotNull('email_verified_at')->get();
-        if ($users->count() > 0) {
-            dispatch((new SendEmailJob(
-                $users->first()->email,
-                new ForgotUsername($users->pluck('username')->toArray())
-            )))->onQueue('mail');
-            return $this->respondNoContent();
-        }
-
-        return $this->respondJson(['message' => 'Username send to the email address if registered']);
-    }
-
     /**
      * Generates a new reset password code
      *
@@ -201,7 +196,7 @@ class UserController extends ApiController
      */
     public function forgotPassword(UserForgotPasswordRequest $request)
     {
-        $user = User::where('username', $request->input('username'))->first();
+        $user = User::where('email', $request->input('email'))->first();
         if ($user !== null) {
             $user->codes()->where('action', 'reset-password')->delete();
             $code = $user->codes()->create([
@@ -297,7 +292,7 @@ class UserController extends ApiController
     {
         UserCode::clearExpired();
 
-        $user = User::where('username', $request->input('username'))->first();
+        $user = User::where('email', $request->input('email'))->first();
         if ($user !== null) {
             $code = $user->codes()->where('action', 'verify-email')->first();
             $code->regenerate();
@@ -322,7 +317,7 @@ class UserController extends ApiController
      */
     public function resendVerifyEmailCode(UserResendVerifyEmailRequest $request)
     {
-        $user = User::where('username', $request->input('username'))->first();
+        $user = User::where('email', $request->input('email'))->first();
         if ($user !== null) {
             $user->codes()->where('action', 'verify-email')->delete();
 
@@ -339,4 +334,29 @@ class UserController extends ApiController
 
         return $this->respondNotFound();
     }
+
+    /**
+     * Return a JSON event list of a user.
+     *
+     * @param Request $request The http request.
+     * @param User    $user    The specified user.
+     * @return JsonResponse
+     */
+    public function eventList(Request $request, User $user)
+    {
+        if ($request->user() !== null && ($request->user() === $user || $request->user()->hasPermission('admin/events') === true)) {
+            $collection = $user->events;
+            $total = $collection->count();
+
+            $collection = EventConductor::collection($request, $collection);
+            return $this->respondAsResource(
+                $collection,
+                ['isCollection' => true,
+                    'appendData' => ['total' => $total]
+                ]
+            );
+        } else {
+            return $this->respondForbidden();
+        }
+    }
 }

app/Http/Middleware/LogRequest.php

@@ -21,8 +21,8 @@ class LogRequest
         $response = $next($request);
 
         try {
-            Analytics::create([
+            Analytics::createWithSession([
-                'type' => 'pageview',
+                'type' => 'apirequest',
                 'attribute' => $request->path(),
                 'useragent' => $request->userAgent(),
                 'ip' => $request->ip(),

app/Http/Requests/AnalyticsRequest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Validation\Rule;
+
+class AnalyticsRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to POST requests.
+     *
+     * @return array<string, mixed>
+     */
+    public function postRules()
+    {
+        return [
+            'type' => 'required|string',
+        ];
+    }
+
+    /**
+     * Get the validation rules that apply to PUT request.
+     *
+     * @return array<string, mixed>
+     */
+    public function putRules()
+    {
+        return [
+            'type' => 'string',
+            'useragent' => 'string',
+            'ip' => 'ipv4|ipv6',
+            'session' => 'number',
+        ];
+    }
+}

app/Http/Requests/ArticleRequest.php

@@ -4,7 +4,7 @@ namespace App\Http\Requests;
 
 use Illuminate\Validation\Rule;
 
-class PostRequest extends BaseRequest
+class ArticleRequest extends BaseRequest
 {
     /**
      * Get the validation rules that apply to POST requests.
@@ -14,7 +14,7 @@ class PostRequest extends BaseRequest
     public function postRules()
     {
         return [
-            'slug' => 'required|string|min:6|unique:posts',
+            'slug' => 'required|string|min:6|unique:articles',
             'title' => 'required|string|min:6|max:255',
             'publish_at' => 'required|date',
             'user_id' => 'required|uuid|exists:users,id',
@@ -34,7 +34,7 @@ class PostRequest extends BaseRequest
             'slug' => [
                 'string',
                 'min:6',
-                Rule::unique('posts')->ignoreModel($this->post),
+                Rule::unique('articles')->ignoreModel($this->article),
             ],
             'title' => 'string|min:6|max:255',
             'publish_at' => 'date',

app/Http/Requests/AuthLoginRequest.php

@@ -14,7 +14,7 @@ class AuthLoginRequest extends FormRequest
     public function rules()
     {
         return [
-            'username' => 'required|string|min:6|max:255',
+            'email' => 'required|string|min:6|max:255',
             'password' => 'required|string|min:6',
         ];
     }

app/Http/Requests/ContactSendRequest.php

@@ -18,7 +18,7 @@ class ContactSendRequest extends FormRequest
             'name' => 'required|max:255',
             'email' => 'required|email|max:255',
             'content' => 'required|max:2000',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Http/Requests/ShortlinkRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Validation\Rule;
+
+class ShortlinkRequest extends BaseRequest
+{
+    /**
+     * Apply the additional POST base rules to this request
+     *
+     * @return array<string, mixed>
+     */
+    public function postRules()
+    {
+        return [
+            'code' => 'required|string|max:255|min:2|unique:shortlinks',
+            'url' => 'required|string|max:255|min:2',
+        ];
+    }
+
+    /**
+     * Get the validation rules that apply to PUT request.
+     *
+     * @return array<string, mixed>
+     */
+    public function putRules()
+    {
+        $shortlink = $this->route('shortlink');
+
+        return [
+            'code' => ['required', 'string', 'max:255', 'min:2', Rule::unique('shortlinks')->ignore($shortlink->id)],
+            'url' => 'required|string|max:255|min:2',
+        ];
+    }
+}

app/Http/Requests/SubscriptionRequest.php

@@ -15,7 +15,7 @@ class SubscriptionRequest extends BaseRequest
     {
         return [
             'email' => 'required|email|unique:subscriptions',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 
@@ -28,7 +28,7 @@ class SubscriptionRequest extends BaseRequest
     {
         return [
             'email' => 'required|email',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 

app/Http/Requests/UserForgotPasswordRequest.php

@@ -15,8 +15,8 @@ class UserForgotPasswordRequest extends FormRequest
     public function rules()
     {
         return [
-            'username' => 'required|exists:users,username',
+            'email' => 'required|exists:users,email',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Http/Requests/UserForgotUsernameRequest.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserForgotUsernameRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'email' => 'required|email|max:255',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Http/Requests/UserRegisterRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests;
 
+use App\Rules\Uniqueish;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UserRegisterRequest extends FormRequest
@@ -14,10 +15,8 @@ class UserRegisterRequest extends FormRequest
     public function rules()
     {
         return [
-            'first_name' => 'required|string|max:255',
+            'display_name' => ['required','string','max:255', new Uniqueish('users')],
-            'last_name' => 'required|string|max:255',
+            'email' => 'required|string|email|max:255|unique:users',
-            'email' => 'required|string|email|max:255',
-            'username' => 'required|string|min:4|max:255|unique:users',
             'password' => 'required|string|min:8',
         ];
     }

app/Http/Requests/UserRequest.php

@@ -2,7 +2,11 @@
 
 namespace App\Http\Requests;
 
+use App\Rules\RequiredIfAny;
 use Illuminate\Validation\Rule;
+use Illuminate\Validation\Rules\RequiredIf;
+use App\Rules\Uniqueish;
+use Illuminate\Support\Arr;
 
 class UserRequest extends BaseRequest
 {
@@ -13,11 +17,19 @@ class UserRequest extends BaseRequest
      */
     public function postRules()
     {
+        $user = auth()->user();
+        $isAdminUser = $user->hasPermission('admin/users');
+
         return [
-            'username' => 'required|string|max:255|min:4|unique:users',
+            'first_name' => ($isAdminUser === true ? 'required_with:last_name,display_name,phone' : 'required') . '|string|max:255|min:2',
-            'first_name' => 'required|string|max:255|min:2',
+            'last_name' => ($isAdminUser === true ? 'required_with:first_name,display_name,phone' : 'required') . '|string|max:255|min:2',
-            'last_name' => 'required|string|max:255|min:2',
+            'display_name' => [
-            'email' => 'required|string|email|max:255',
+                $isAdminUser === true ? 'required_with:first_name,last_name,phone' : 'required',
+                'string',
+                'max:255',
+                new Uniqueish('users')
+            ],
+            'email' => 'required|string|email|max:255|unique:users',
             'phone' => ['string', 'regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
             'email_verified_at' => 'date'
         ];
@@ -30,25 +42,66 @@ class UserRequest extends BaseRequest
      */
     public function putRules()
     {
-        $user = $this->route('user');
+        $user = auth()->user();
+        $ruleUser = $this->route('user');
+        $isAdminUser = $user->hasPermission('admin/users');
+
+        $requiredIfFieldsPresent = function (array $fields) use ($ruleUser): RequiredIf {
+            return new RequiredIf(function () use ($fields, $ruleUser) {
+                $input = $this->all();
+                $values = Arr::only($input, $fields);
+
+                foreach ($values as $key => $value) {
+                    if ($value !== null && $value !== '') {
+                        return true;
+                    }
+                }
+
+                $fields = array_diff($fields, array_keys($values));
+
+                foreach ($fields as $field) {
+                    if ($ruleUser->$field !== '') {
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+        };
 
         return [
-            'username' => [
+            'first_name' => [
+                'sometimes',
+                $isAdminUser === true ? $requiredIfFieldsPresent(['last_name', 'display_name', 'phone']) : 'required',
                 'string',
+                'between:2,255',
+            ],
+            'last_name' => [
+                'sometimes',
+                $isAdminUser === true ? $requiredIfFieldsPresent(['first_name', 'last_name', 'phone']) : 'required',
+                'string',
+                'between:2,255',
+            ],
+            'display_name' => [
+                'sometimes',
+                $isAdminUser === true ? $requiredIfFieldsPresent(['first_name', 'display_name', 'phone']) : 'required',
+                'string',
+                'between:2,255',
+                (new Uniqueish('users', 'display_name'))->ignore($ruleUser->id)
+            ],
+            'email' => [
+                'string',
+                'email',
                 'max:255',
-                'min:4',
+                Rule::unique('users')->ignore($ruleUser->id)->when(
-                Rule::unique('users')->ignore($user->id)->when(
+                    $this->email !== $ruleUser->email,
-                    $this->username !== $user->username,
                     function ($query) {
-                        return $query->where('username', $this->username);
+                        return $query->where('email', $this->email);
                     }
                 ),
             ],
-            'first_name' => 'string|max:255|min:2',
+            'phone' => ['nullable', 'regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
-            'last_name' => 'string|max:255|min:2',
+            'password' => "nullable|string|min:8"
-            'email' => 'string|email|max:255',
-            'phone' => ['nullable','regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
-            'password' => 'string|min:8'
         ];
     }
 }

app/Http/Requests/UserResendVerifyEmailRequest.php

@@ -15,8 +15,8 @@ class UserResendVerifyEmailRequest extends FormRequest
     public function rules()
     {
         return [
-            'username' => 'required|exists:users,username',
+            'email' => 'required|exists:users,email',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Http/Requests/UserResetPasswordRequest.php

@@ -17,7 +17,7 @@ class UserResetPasswordRequest extends FormRequest
         return [
             'code' => 'required|digits:6',
             'password' => 'required|string|min:8',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Http/Requests/UserVerifyEmailRequest.php

@@ -16,7 +16,7 @@ class UserVerifyEmailRequest extends FormRequest
     {
         return [
             'code' => 'required|digits:6',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Jobs/MoveMediaJob.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Media;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
+
+class MoveMediaJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    /**
+     * Media item
+     *
+     * @var Media
+     */
+    public $media;
+
+    /**
+     * New storage ID
+     *
+     * @var string
+     */
+    protected $newStorage;
+
+
+    /**
+     * Create a new job instance.
+     *
+     * @param Media  $media      The media model.
+     * @param string $newStorage The new storage ID.
+     * @return void
+     */
+    public function __construct(Media $media, string $newStorage)
+    {
+        $this->media = $media;
+        $this->newStorage = $newStorage;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        // Don't continue if the media is already on the new storage disk
+        if ($this->media->storage === $this->newStorage) {
+            return;
+        }
+
+        $this->media->status = 'Moving file';
+        $this->media->save();
+
+        $files = ["/{$this->media->name}"];
+        if (empty($this->media->variants) === false) {
+            foreach ($this->media->variants as $variant => $name) {
+                $files[] = "/{$name}";
+            }
+        }
+
+        $this->media->invalidateCFCache();
+
+        // Move the files from the old storage disk to the new storage disk
+        foreach ($files as $file) {
+            Storage::disk($this->newStorage)->put($file, Storage::disk($this->media->storage)->get($file));
+            Storage::disk($this->media->storage)->delete($file);
+        }
+
+        // Update the media model with the new storage and save it to the database
+        $this->media->storage = $this->newStorage;
+        $this->media->status = 'OK';
+        $this->media->save();
+    }
+}

app/Jobs/StoreUploadedFileJob.php

@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Media;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use SplFileInfo;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Intervention\Image\Facades\Image;
+use Spatie\ImageOptimizer\OptimizerChainFactory;
+
+class StoreUploadedFileJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    /**
+     * Media item
+     *
+     * @var Media
+     */
+    protected $media;
+
+    /**
+     * Uploaded file item
+     *
+     * @var string
+     */
+    protected $uploadedFilePath;
+
+    /**
+     * Replace existing files
+     *
+     * @var string
+     */
+    protected $replaceExisting;
+
+
+    /**
+     * Create a new job instance.
+     *
+     * @param Media   $media           The media model.
+     * @param string  $filePath        The uploaded file.
+     * @param boolean $replaceExisting Replace existing files.
+     * @return void
+     */
+    public function __construct(Media $media, string $filePath, bool $replaceExisting = true)
+    {
+        $this->media = $media;
+        $this->uploadedFilePath = $filePath;
+        $this->replaceExisting = $replaceExisting;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $storageDisk = $this->media->storage;
+        $fileName = $this->media->name;
+
+        try {
+            $this->media->status = "Uploading to CDN";
+            $this->media->save();
+
+            if (strlen($this->uploadedFilePath) > 0) {
+                if (Storage::disk($storageDisk)->exists($fileName) === false || $this->replaceExisting === true) {
+                    Storage::disk($storageDisk)->putFileAs('/', new SplFileInfo($this->uploadedFilePath), $fileName);
+                    Log::info("uploading file {$storageDisk} / {$fileName} / {$this->uploadedFilePath}");
+                } else {
+                    Log::info("file {$fileName} already exists in {$storageDisk} / {$this->uploadedFilePath}. Not replacing file and using local {$fileName} for variants.");
+                }
+            } else {
+                if (Storage::disk($storageDisk)->exists($fileName) === true) {
+                    Log::info("file {$fileName} already exists in {$storageDisk} / {$this->uploadedFilePath}. No local {$fileName} for variants, downloading from CDN.");
+                    $readStream = Storage::disk($storageDisk)->readStream($fileName);
+                    $tempFilePath = tempnam(sys_get_temp_dir(), 'download-');
+                    $writeStream = fopen($tempFilePath, 'w');
+                    while (feof($readStream) !== true) {
+                        fwrite($writeStream, fread($readStream, 8192));
+                    }
+                    fclose($readStream);
+                    fclose($writeStream);
+                    $this->uploadedFilePath = $tempFilePath;
+                } else {
+                    $errorStr = "cannot upload file {$storageDisk} / {$fileName} / {$this->uploadedFilePath} as temp file is empty";
+                    Log::info($errorStr);
+                    throw new \Exception($errorStr);
+                }
+            }//end if
+
+            if (strpos($this->media->mime_type, 'image/') === 0) {
+                $this->media->status = "Optimizing image";
+                $this->media->save();
+
+                // Generate additional image sizes
+                $sizes = Media::getTypeVariants('image');
+
+                $originalImage = Image::make($this->uploadedFilePath);
+
+                $dimensions = [$originalImage->getWidth(), $originalImage->getHeight()];
+                $this->media->dimensions = implode('x', $dimensions);
+
+                foreach ($sizes as $variantName => $size) {
+                    $postfix = "{$size['width']}x{$size['height']}";
+                    if ($variantName === 'scaled') {
+                        $postfix = 'scaled';
+                    }
+
+                    if (is_array($this->media->variants) === true && array_key_exists($postfix, $this->media->variants) === true && Storage::disk($storageDisk)->exists($this->media->variants[$postfix]) === true && $this->replaceExisting === true) {
+                        Storage::disk($storageDisk)->delete($this->media->variants[$postfix]);
+                    }
+
+                    $newFilename = pathinfo($this->media->name, PATHINFO_FILENAME) . "-$postfix.webp";
+
+                    if (Storage::disk($storageDisk)->exists($newFilename) === false || $this->replaceExisting === true) {
+                        // Get the largest available variant
+                        if ($dimensions[0] >= $size['width'] && $dimensions[1] >= $size['height']) {
+                            // Store the variant in the variants array
+                            $variants[$variantName] = $newFilename;
+
+                            // Resize the image to the variant size if its dimensions are greater than the specified size
+                            $image = clone $originalImage;
+
+                            $imageSize = $image->getSize();
+                            if ($imageSize->getWidth() > $size['width'] || $imageSize->getHeight() > $size['height']) {
+                                $image->resize($size['width'], $size['height'], function ($constraint) {
+                                    $constraint->aspectRatio();
+                                    $constraint->upsize();
+                                });
+                                $image->resizeCanvas($size['width'], $size['height'], 'center', false, '#FFFFFF');
+                            }
+
+                            // Optimize and store image
+                            $tempImagePath = tempnam(sys_get_temp_dir(), 'optimize');
+                            $image->encode('webp', 75)->save($tempImagePath);
+                            Storage::disk($storageDisk)->putFileAs('/', new SplFileInfo($tempImagePath), $newFilename);
+                            unlink($tempImagePath);
+                        }//end if
+                    } else {
+                        Log::info("variant {$variantName} already exists for file {$fileName}");
+                    }//end if
+                }//end foreach
+
+                // Set missing variants to the largest available variant
+                foreach ($sizes as $variantName => $size) {
+                    if (isset($variants[$variantName]) === false) {
+                        $variants[$variantName] = $this->media->name;
+                    }
+                }
+
+                $this->media->variants = $variants;
+            }//end if
+
+            if (strlen($this->uploadedFilePath) > 0) {
+                unlink($this->uploadedFilePath);
+            }
+
+            $this->media->status = 'OK';
+            $this->media->save();
+        } catch (\Exception $e) {
+            Log::error($e->getMessage());
+            $this->media->status = "Failed";
+            $this->media->save();
+            $this->fail($e);
+        }//end try
+    }
+}

app/Mail/ForgotUsername.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class ForgotUsername extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The list of usernames
-     *
-     * @var string[]
-     */
-    public $usernames;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param array $usernames The usernames.
-     * @return void
-     */
-    public function __construct(array $usernames)
-    {
-        $this->usernames = $usernames;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '🤦 Forgot your username?',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.forgot_username',
-            text: 'emails.user.forgot_username_plain',
-        );
-    }
-}

app/Models/Analytics.php

@@ -15,4 +15,31 @@ class Analytics extends Model
      * @var array
      */
     protected $guarded = [];
+
+
+    /**
+     * Create a new row in the analytics table with the given attributes,
+     * automatically assigning a session value based on previous rows.
+     *
+     * @param  array $attributes Model attributes.
+     * @return static
+     */
+    public static function createWithSession(array $attributes)
+    {
+        $previousRow = self::where('useragent', $attributes['useragent'])
+        ->where('ip', $attributes['ip'])
+        ->where('created_at', '>=', now()->subMinutes(30))
+        ->whereNotNull('session')
+        ->orderBy('created_at', 'desc')
+        ->first();
+
+        if ($previousRow !== null) {
+            $attributes['session'] = $previousRow->session;
+        } else {
+            $lastSession = self::max('session');
+            $attributes['session'] = ($lastSession + 1);
+        }
+
+        return static::create($attributes);
+    }
 }

app/Models/Article.php

@@ -5,8 +5,9 @@ namespace App\Models;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 
-class Post extends Model
+class Article extends Model
 {
     use HasFactory;
     use Uuids;
@@ -27,7 +28,7 @@ class Post extends Model
 
 
     /**
-     * Get the post user
+     * Get the article user
      *
      * @return BelongsTo
      */
@@ -37,7 +38,9 @@ class Post extends Model
     }
 
     /**
-     * Get all of the post's attachments.
+     * Get all of the article's attachments.
+     *
+     * @return MorphMany
      */
     public function attachments()
     {

app/Models/Attachment.php

@@ -4,6 +4,8 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Attachment extends Model
 {
@@ -16,11 +18,23 @@ class Attachment extends Model
      */
     protected $fillable = [
         'media_id',
+        'private',
+    ];
+
+    /**
+     * The default attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'private' => 'false',
     ];
 
 
     /**
      * Get attachments attachable
+     *
+     * @return MorphTo
      */
     public function attachable()
     {
@@ -29,6 +43,8 @@ class Attachment extends Model
 
     /**
      * Get the media for this attachment.
+     *
+     * @return BelongsTo
      */
     public function media()
     {

app/Models/Event.php

@@ -5,6 +5,8 @@ namespace App\Models;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 class Event extends Model
 {
@@ -19,6 +21,7 @@ class Event extends Model
     protected $fillable = [
         'title',
         'location',
+        'location_url',
         'address',
         'start_at',
         'end_at',
@@ -34,10 +37,22 @@ class Event extends Model
 
 
     /**
-     * Get all of the post's attachments.
+     * Get all of the article's attachments.
+     *
+     * @return MorphMany
      */
     public function attachments()
     {
         return $this->morphMany('App\Models\Attachment', 'attachable');
     }
+
+    /**
+     * Get all the associated users.
+     *
+     * @return BelongsToMany
+     */
+    public function users()
+    {
+        return $this->belongsToMany(User::class, 'event_user', 'event_id', 'user_id');
+    }
 }

app/Models/EventUsers.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\Uuids;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class EventUser extends Model
+{
+    use HasFactory;
+    use Uuids;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'event_id',
+        'user_id',
+    ];
+
+
+    /**
+     * Get the event for this attachment.
+     *
+     * @return BelongsTo
+     */
+    public function event()
+    {
+        return $this->belongsTo(Event::class);
+    }
+
+    /**
+     * Get the user for this attachment.
+     *
+     * @return BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+}

app/Models/Media.php

@@ -2,19 +2,37 @@
 
 namespace App\Models;
 
+use App\Enum\HttpResponseCodes;
+use App\Jobs\MoveMediaJob;
+use App\Jobs\OptimizeMediaJob;
+use App\Jobs\StoreUploadedFileJob;
 use App\Traits\Uuids;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Http\UploadedFile;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
-use Intervention\Image\Facades\Image;
+use Illuminate\Support\Str;
-use Spatie\ImageOptimizer\OptimizerChainFactory;
+use InvalidArgumentException;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class Media extends Model
 {
     use HasFactory;
     use Uuids;
+    use DispatchesJobs;
+
+    public const INVALID_FILE_ERROR         = 1;
+    public const FILE_SIZE_EXCEEDED_ERROR   = 2;
+    public const FILE_NAME_EXISTS_ERROR     = 3;
+    public const TEMP_FILE_ERROR            = 4;
 
     /**
      * The attributes that are mass assignable.
@@ -23,20 +41,14 @@ class Media extends Model
      */
     protected $fillable = [
         'title',
-        'name',
-        'mime',
         'user_id',
+        'mime_type',
+        'permission',
+        'storage',
+        'description',
+        'name',
         'size',
-        'permission'
+        'status',
-    ];
-
-    /**
-     * The attributes that are hidden.
-     *
-     * @var array<int, string>
-     */
-    protected $hidden = [
-        'path',
     ];
 
     /**
@@ -48,6 +60,43 @@ class Media extends Model
         'url',
     ];
 
+    /**
+     * The default attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'storage' => 'cdn',
+        'variants' => '[]',
+        'description' => '',
+        'dimensions' => '',
+        'permission' => '',
+    ];
+
+    /**
+     * The storage file list cache.
+     *
+     * @var array
+     */
+    protected static $storageFileListCache = [];
+
+    /**
+     * The variant types.
+     *
+     * @var int[][][]
+     */
+    protected static $variantTypes = [
+        'image' => [
+            'thumb'     => ['width' => 150, 'height' => 150],
+            'small'     => ['width' => 300, 'height' => 225],
+            'medium'    => ['width' => 768, 'height' => 576],
+            'large'     => ['width' => 1024, 'height' => 768],
+            'xlarge'    => ['width' => 1536, 'height' => 1152],
+            'xxlarge'   => ['width' => 2048, 'height' => 1536],
+            'scaled'    => ['width' => 2560, 'height' => 1920]
+        ]
+    ];
+
 
     /**
      * Model Boot
@@ -63,30 +112,212 @@ class Media extends Model
                 $origPermission = $media->getOriginal()['permission'];
                 $newPermission = $media->permission;
 
-                $origPath = Storage::disk(Media::getStorageId(empty($origPermission)))->path($media->name);
+                $newPermissionLen = strlen($newPermission);
-                $newPath = Storage::disk(Media::getStorageId(empty($newPermission)))->path($media->name);
 
-                if ($origPath !== $newPath) {
+                if ($newPermissionLen !== strlen($origPermission)) {
-                    if (file_exists($origPath) === true) {
+                    if ($newPermissionLen === 0) {
-                        if (file_exists($newPath) === true) {
+                        $this->moveToStorage('cdn');
-                            $fileParts = pathinfo($newPath);
+                    } else {
-                            $newName = '';
+                        $this->moveToStorage('private');
-
+                    }
-                            // need a new name!
+                }
-                            $tmpPath = $newPath;
+            }
-                            while (file_exists($tmpPath) === true) {
-                                $newName = uniqid('', true) . $fileParts['extension'];
-                                $tmpPath = $fileParts['dirname'] . '/' . $newName;
-                            }
-
-                            $media->name = $newName;
-                        }
-
-                        rename($origPath, $newPath);
-                    }//end if
-                }//end if
-            }//end if
         });
+
+        static::deleting(function ($media) {
+            $media->deleteFile();
+        });
+    }
+
+
+    /**
+     * Get Type Variants.
+     *
+     * @param string $type The variant type to get.
+     * @return array The variant data.
+     */
+    public static function getTypeVariants(string $type)
+    {
+        if (isset(self::$variantTypes[$type]) === true) {
+            return self::$variantTypes[$type];
+        }
+
+        return [];
+    }
+
+    /**
+     * Variants Get Mutator.
+     *
+     * @param mixed $value The value to mutate.
+     * @return array The mutated value.
+     */
+    public function getVariantsAttribute(mixed $value)
+    {
+        if (is_string($value) === true) {
+            return json_decode($value, true);
+        }
+
+        return [];
+    }
+
+    /**
+     * Variants Set Mutator.
+     *
+     * @param mixed $value The value to mutate.
+     * @return void
+     */
+    public function setVariantsAttribute(mixed $value)
+    {
+        if (is_array($value) !== true) {
+            $value = [];
+        }
+
+        $this->attributes['variants'] = json_encode(($value ?? []));
+    }
+
+    /**
+     * Get previous variant.
+     *
+     * @param string $type    The variant type.
+     * @param string $variant The initial variant.
+     * @return string The previous variant name (or '').
+     */
+    public function getPreviousVariant(string $type, string $variant)
+    {
+        if (isset(self::$variantTypes[$type]) === false) {
+            return '';
+        }
+
+        $variants = self::$variantTypes[$type];
+        $keys = array_keys($variants);
+
+        $currentIndex = array_search($variant, $keys);
+        if ($currentIndex === false || $currentIndex === 0) {
+            return '';
+        }
+
+        return $keys[($currentIndex - 1)];
+    }
+
+    /**
+     * Get next variant.
+     *
+     * @param string $type    The variant type.
+     * @param string $variant The initial variant.
+     * @return string The next variant name (or '').
+     */
+    public function getNextVariant(string $type, string $variant)
+    {
+        if (isset(self::$variantTypes[$type]) === false) {
+            return '';
+        }
+
+        $variants = self::$variantTypes[$type];
+        $keys = array_keys($variants);
+
+        $currentIndex = array_search($variant, $keys);
+        if ($currentIndex === false || $currentIndex === (count($keys) - 1)) {
+            return '';
+        }
+
+        return $keys[($currentIndex + 1)];
+    }
+
+    /**
+     * Get variant URL.
+     *
+     * @param string  $variant       The variant to find.
+     * @param boolean $returnNearest Return the nearest variant if request is not found.
+     * @return string The URL.
+     */
+    public function getVariantURL(string $variant, bool $returnNearest = true)
+    {
+        $variants = $this->variants;
+        if (isset($variants[$variant]) === true) {
+            return self::getUrlPath() . $variants[$variant];
+        }
+
+        if ($returnNearest === true) {
+            $variantType = explode('/', $this->mime_type)[0];
+            $previousVariant = $variant;
+            while (empty($previousVariant) === false) {
+                $previousVariant = $this->getPreviousVariant($variantType, $previousVariant);
+                if (empty($previousVariant) === false && isset($variants[$previousVariant]) === true) {
+                    return self::getUrlPath() . $variants[$previousVariant];
+                }
+            }
+        }
+
+        return '';
+    }
+
+
+
+
+    /**
+     * Delete file and associated files with the modal.
+     *
+     * @return void
+     */
+    public function deleteFile()
+    {
+        $fileName = $this->name;
+        $baseName = pathinfo($fileName, PATHINFO_FILENAME);
+        $extension = pathinfo($fileName, PATHINFO_EXTENSION);
+
+        $files = Storage::disk($this->storage)->files();
+
+        foreach ($files as $file) {
+            if (preg_match("/{$baseName}(-[a-zA-Z0-9]+)?\.{$extension}/", $file) === 1) {
+                Storage::disk($this->storage)->delete($file);
+            }
+        }
+
+        $this->invalidateCFCache();
+    }
+
+    /**
+     * Invalidate Cloudflare Cache.
+     *
+     * @return void
+     * @throws InvalidArgumentException Exception.
+     */
+    private function invalidateCFCache()
+    {
+        $zone_id = env("CLOUDFLARE_ZONE_ID");
+        $api_key = env("CLOUDFLARE_API_KEY");
+        if ($zone_id !== null && $api_key !== null && $this->url !== "") {
+            $urls = [$this->url];
+
+            foreach ($this->variants as $variant => $name) {
+                $urls[] = str_replace($this->name, $name, $this->url);
+            }
+
+            $curl = curl_init();
+            curl_setopt_array($curl, [
+                CURLOPT_URL => "https://api.cloudflare.com/client/v4/zones/" . $zone_id . "/purge_cache",
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_CUSTOMREQUEST => "DELETE",
+                CURLOPT_POSTFIELDS => json_encode(["files" => $urls]),
+                CURLOPT_HTTPHEADER => [
+                    "Content-Type: application/json",
+                    "Authorization: Bearer " . $api_key
+                ],
+            ]);
+            curl_exec($curl);
+            curl_close($curl);
+        }//end if
+    }
+
+    /**
+     * Get URL path
+     *
+     * @return string
+     */
+    public function getUrlPath()
+    {
+        $url = config("filesystems.disks.$this->storage.url");
+        return "$url/";
     }
 
     /**
@@ -96,19 +327,9 @@ class Media extends Model
      */
     public function getUrlAttribute()
     {
-        $url = config('filesystems.disks.' . Media::getStorageId($this) . '.url');
+        if (isset($this->attributes['name']) === true) {
-        if (empty($url) === false) {
+            return self::getUrlPath() . $this->name;
-            $replace = [
+        }
-                'id'    => $this->id,
-                'name'  => $this->name
-            ];
-
-            $url = str_ireplace(array_map(function ($item) {
-                return '%' . $item . '%';
-            }, array_keys($replace)), array_values($replace), $url);
-
-            return $url;
-        }//end if
 
         return '';
     }
@@ -124,84 +345,151 @@ class Media extends Model
     }
 
     /**
-     * Get the file full local path
+     * Move files to new storage device.
      *
-     * @return string
+     * @param string $storage The storage ID to move to.
+     * @return void
      */
-    public function path()
+    public function moveToStorage(string $storage)
     {
-        return Storage::disk(Media::getStorageId($this))->path($this->name);
+        if ($storage !== $this->storage && Config::has("filesystems.disks.$storage") === true) {
+            $this->status = "Processing media";
+            MoveMediaJob::dispatch($this, $storage)->onQueue('media');
+            $this->save();
+        }
     }
 
     /**
-     * Get Storage ID
+     * Create new Media from UploadedFile data.
      *
-     * @param mixed $mediaOrPublic Media object or if file is public.
+     * @param App\Models\Request           $request The request data.
-     * @return string
+     * @param Illuminate\Http\UploadedFile $file    The file.
+     * @return null|Media The result or null if not successful.
      */
-    public static function getStorageId(mixed $mediaOrPublic)
+    public static function createFromUploadedFile(Request $request, UploadedFile $file)
     {
-        $isPublic = true;
+        $request->merge([
+            'title' => $request->get('title', ''),
+            'name' => '',
+            'size' => 0,
+            'mime_type' => '',
+            'status' => '',
+        ]);
 
-        if ($mediaOrPublic instanceof Media) {
+        if ($request->get('storage') === null) {
-            $isPublic = empty($mediaOrPublic->permission);
+            // We store images by default locally
-        } else {
+            if (strpos($file->getMimeType(), 'image/') === 0) {
-            $isPublic = boolval($mediaOrPublic);
+                $request->merge([
+                    'storage' => 'local',
+                ]);
+            } else {
+                $request->merge([
+                    'storage' => 'cdn',
+                ]);
+            }
         }
 
-        return $isPublic === true ? 'public' : 'local';
+        $mediaItem = $request->user()->media()->create($request->all());
+        $mediaItem->updateWithUploadedFile($file);
+
+        return $mediaItem;
     }
 
     /**
-     * Place uploaded file into storage. Return full path or null
+     * Update Media with UploadedFile data.
      *
-     * @param UploadedFile $file   File to put into storage.
+     * @param Illuminate\Http\UploadedFile $file The file.
-     * @param boolean      $public Is the file available to the public.
+     * @return null|Media The media item.
-     * @return array|null
      */
-    public static function store(UploadedFile $file, bool $public = true)
+    public function updateWithUploadedFile(UploadedFile $file)
     {
-        $storage = Media::getStorageId($public);
+        if ($file === null || $file->isValid() !== true) {
-        $name = $file->store('', ['disk' => $storage]);
+            throw new \Exception('The file is invalid.', self::INVALID_FILE_ERROR);
+        }
 
+        if ($file->getSize() > static::getMaxUploadSize()) {
+            throw new \Exception('The file size is larger then permitted.', self::FILE_SIZE_EXCEEDED_ERROR);
+        }
+
+        $name = static::generateUniqueFileName($file->getClientOriginalName());
         if ($name === false) {
-            return null;
+            throw new \Exception('The file name already exists in storage.', self::FILE_NAME_EXISTS_ERROR);
         }
 
-        $path = Storage::disk($storage)->path($name);
+        // remove file if there is an existing entry in this medium item
-        if (in_array($file->getClientOriginalExtension(), ['jpg', 'jpeg', 'png', 'gif']) === true) {
+        if (strlen($this->name) > 0 && strlen($this->storage) > 0) {
-        // Generate additional image sizes
+            Storage::disk($this->storage)->delete($this->name);
-            $sizes = [
+            foreach ($this->variants as $variantName => $fileName) {
-                'thumb' => [150, 150],
+                Storage::disk($this->storage)->delete($fileName);
-                'small' => [300, 300],
-                'medium' => [640, 640],
-                'large' => [1024, 1024],
-                'xlarge' => [1536, 1536],
-                'xxlarge' => [2560, 2560],
-            ];
-            $images = ['full' => $path];
-            foreach ($sizes as $sizeName => $size) {
-                $image = Image::make($path);
-                $image->resize($size[0], $size[1], function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                });
-                $newPath = pathinfo($path, PATHINFO_DIRNAME) . '/' . pathinfo($path, PATHINFO_FILENAME) . "-$sizeName." . pathinfo($path, PATHINFO_EXTENSION);
-                $image->save($newPath);
-                $images[$sizeName] = $newPath;
             }
 
-        // Optimize all images
+            $this->name = '';
-            $optimizerChain = OptimizerChainFactory::create();
+            $this->variants = [];
-            foreach ($images as $imagePath) {
+        }
-                $optimizerChain->optimize($imagePath);
-            }
-        }//end if
 
-        return [
+        if (strlen($this->title) === 0) {
-            'name' => $name,
+            $this->title = $name;
-            'path' => $path
+        }
-        ];
+
+        $this->name = $name;
+        $this->size = $file->getSize();
+        $this->mime_type = $file->getMimeType();
+        $this->status = 'Processing media';
+        $this->save();
+
+        $temporaryFilePath = generateTempFilePath();
+        copy($file->path(), $temporaryFilePath);
+
+        try {
+            StoreUploadedFileJob::dispatch($this, $temporaryFilePath)->onQueue('media');
+        } catch (\Exception $e) {
+            $this->status = 'Error';
+            $this->save();
+
+            throw $e;
+        }//end try
+
+        return $this;
+    }
+
+    /**
+     * Download the file from the storage to the user.
+     *
+     * @param string  $variant  The variant to download or null if none.
+     * @param boolean $fallback Fallback to the original file if the variant is not found.
+     * @return JsonResponse|StreamedResponse The response.
+     * @throws BindingResolutionException The Exception.
+     */
+    public function download(string $variant = null, bool $fallback = true)
+    {
+        $path = $this->name;
+        if ($variant !== null) {
+            if (array_key_exists($variant, $this->variant) === true) {
+                $path = $this->variant[$variant];
+            } else {
+                return response()->json(['message' => 'The resource was not found.'], HttpResponseCodes::HTTP_NOT_FOUND);
+            }
+        }
+
+        $disk = Storage::disk($this->storage);
+        if ($disk->exists($path) === true) {
+            $stream = $disk->readStream($path);
+            $response = response()->stream(
+                function () use ($stream) {
+                    fpassthru($stream);
+                },
+                200,
+                [
+                    'Content-Type' => $this->mime_type,
+                    'Content-Length' => $disk->size($path),
+                    'Content-Disposition' => 'attachment; filename="' . basename($path) . '"',
+                ]
+            );
+
+            return $response;
+        }
+
+        return response()->json(['message' => 'The resource was not found.'], HttpResponseCodes::HTTP_NOT_FOUND);
     }
 
     /**
@@ -209,7 +497,7 @@ class Media extends Model
      *
      * @return integer
      */
-    public static function maxUploadSize()
+    public static function getMaxUploadSize()
     {
         $sizes = [
             ini_get('upload_max_filesize'),
@@ -237,31 +525,123 @@ class Media extends Model
     }
 
     /**
-     * Sanitize filename for upload
+     * Generate a file name that is available within storage.
      *
-     * @param string $filename Filename to sanitize.
+     * @param string $fileName The proposed file name.
+     * @return string|boolean The available file name or false if failed.
+     */
+    public static function generateUniqueFileName(string $fileName)
+    {
+        $index = 1;
+        $maxTries = 100;
+        $extension = pathinfo($fileName, PATHINFO_EXTENSION);
+        $fileName = static::sanitizeFilename(pathinfo($fileName, PATHINFO_FILENAME));
+
+        if (static::fileNameHasSuffix($fileName) === true || static::fileExistsInStorage("$fileName.$extension") === true || Media::where('name', "$fileName.$extension")->where('status', 'not like', 'failed%')->exists() === true) {
+            $fileName .= '-';
+            for ($i = 1; $i < $maxTries; $i++) {
+                $fileNameIndex = $fileName . $index;
+                if (static::fileExistsInStorage("$fileNameIndex.$extension") !== true && Media::where('name', "$fileNameIndex.$extension")->where('status', 'not like', 'Failed%')->exists() !== true) {
+                    return "$fileNameIndex.$extension";
+                }
+
+                ++$index;
+            }
+
+            return false;
+        }
+
+        return "$fileName.$extension";
+    }
+
+    /**
+     * Determines if the file name exists in any of the storage disks.
+     *
+     * @param string  $fileName    The file name to check.
+     * @param boolean $ignoreCache Ignore the file list cache.
+     * @return boolean If the file exists on any storage disks.
+     */
+    public static function fileExistsInStorage(string $fileName, bool $ignoreCache = false)
+    {
+        $disks = array_keys(Config::get('filesystems.disks'));
+
+        if ($ignoreCache === false) {
+            if (count(static::$storageFileListCache) === 0) {
+                $disks = array_keys(Config::get('filesystems.disks'));
+
+                foreach ($disks as $disk) {
+                    try {
+                        static::$storageFileListCache[$disk] = Storage::disk($disk)->allFiles();
+                    } catch (\Exception $e) {
+                        Log::error($e->getMessage());
+                        throw new \Exception("Cannot get a file list for storage device '$disk'");
+                    }
+                }
+            }
+
+            foreach (static::$storageFileListCache as $disk => $files) {
+                if (in_array($fileName, $files) === true) {
+                    return true;
+                }
+            }
+        } else {
+            $disks = array_keys(Config::get('filesystems.disks'));
+
+            foreach ($disks as $disk) {
+                try {
+                    if (Storage::disk($disk)->exists($fileName) === true) {
+                        return true;
+                    }
+                } catch (\Exception $e) {
+                    Log::error($e->getMessage());
+                    throw new \Exception("Cannot verify if file '$fileName' already exists in storage device '$disk'");
+                }
+            }
+        }//end if
+
+        return false;
+    }
+
+    /**
+     * Test if the file name contains a special suffix.
+     *
+     * @param string $fileName The file name to test.
+     * @return boolean If the file name contains the special suffix.
+     */
+    public static function fileNameHasSuffix(string $fileName)
+    {
+        $suffix = '/(-\d+x\d+|-scaled)$/i';
+        $fileNameWithoutExtension = pathinfo($fileName, PATHINFO_FILENAME);
+
+        return preg_match($suffix, $fileNameWithoutExtension) === 1;
+    }
+
+    /**
+     * Sanitize fileName for upload
+     *
+     * @param string $fileName Filename to sanitize.
      * @return string
      */
-    public static function sanitizeFilename(string $filename)
+    private static function sanitizeFilename(string $fileName)
     {
         /*
-            # file system reserved https://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
+        # file system reserved https://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
-                [<>:"/\\\|?*]|
+        [<>:"/\\\|?*]|
 
-            # control characters http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
+        # control characters http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
-                [\x00-\x1F]|
+        [\x00-\x1F]|
 
-            # non-printing characters DEL, NO-BREAK SPACE, SOFT HYPHEN
+        # non-printing characters DEL, NO-BREAK SPACE, SOFT HYPHEN
-                [\x7F\xA0\xAD]|
+        [\x7F\xA0\xAD]|
 
-            # URI reserved https://www.rfc-editor.org/rfc/rfc3986#section-2.2
+        # URI reserved https://www.rfc-editor.org/rfc/rfc3986#section-2.2
-                [#\[\]@!$&\'()+,;=]|
+        [#\[\]@!$&\'()+,;=]|
 
-            # URL unsafe characters https://www.ietf.org/rfc/rfc1738.txt
+        # URL unsafe characters https://www.ietf.org/rfc/rfc1738.txt
-                [{}^\~`]
+        [{}^\~`]
         */
 
-        $filename = preg_replace(
+        $fileName = preg_replace(
             '~
             [<>:"/\\\|?*]|
             [\x00-\x1F]|
@@ -270,37 +650,37 @@ class Media extends Model
             [{}^\~`]
             ~x',
             '-',
-            $filename
+            $fileName
         );
 
-        $filename = ltrim($filename, '.-');
+        $fileName = ltrim($fileName, '.-');
 
-        $filename = preg_replace([
+        $fileName = preg_replace([
-            // "file   name.zip" becomes "file-name.zip"
+        // "file   name.zip" becomes "file-name.zip"
             '/ +/',
-            // "file___name.zip" becomes "file-name.zip"
+        // "file___name.zip" becomes "file-name.zip"
             '/_+/',
-            // "file---name.zip" becomes "file-name.zip"
+        // "file---name.zip" becomes "file-name.zip"
             '/-+/'
-        ], '-', $filename);
+        ], '-', $fileName);
-        $filename = preg_replace([
+        $fileName = preg_replace([
-            // "file--.--.-.--name.zip" becomes "file.name.zip"
+        // "file--.--.-.--name.zip" becomes "file.name.zip"
             '/-*\.-*/',
-            // "file...name..zip" becomes "file.name.zip"
+        // "file...name..zip" becomes "file.name.zip"
             '/\.{2,}/'
-        ], '.', $filename);
+        ], '.', $fileName);
         // lowercase for windows/unix interoperability http://support.microsoft.com/kb/100625
-        $filename = mb_strtolower($filename, mb_detect_encoding($filename));
+        $fileName = mb_strtolower($fileName, mb_detect_encoding($fileName));
         // ".file-name.-" becomes "file-name"
-        $filename = trim($filename, '.-');
+        $fileName = trim($fileName, '.-');
 
-        $ext = pathinfo($filename, PATHINFO_EXTENSION);
+        $ext = pathinfo($fileName, PATHINFO_EXTENSION);
-        $filename = mb_strcut(
+        $fileName = mb_strcut(
-            pathinfo($filename, PATHINFO_FILENAME),
+            pathinfo($fileName, PATHINFO_FILENAME),
             0,
             (255 - ($ext !== '' ? strlen($ext) + 1 : 0)),
-            mb_detect_encoding($filename)
+            mb_detect_encoding($fileName)
         ) . ($ext !== '' ? '.' . $ext : '');
-        return $filename;
+        return $fileName;
     }
 }

app/Models/Shortlink.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Models;
+
+use App\Enum\HttpResponseCodes;
+use App\Jobs\MoveMediaJob;
+use App\Jobs\OptimizeMediaJob;
+use App\Jobs\StoreUploadedFileJob;
+use App\Traits\Uuids;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use InvalidArgumentException;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class Shortlink extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'code',
+        'url',
+    ];
+}

app/Models/User.php

@@ -6,6 +6,7 @@ namespace App\Models;
 
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
@@ -25,12 +26,12 @@ class User extends Authenticatable implements Auditable
      * @var array<int, string>
      */
     protected $fillable = [
-        'username',
         'first_name',
         'last_name',
         'email',
         'phone',
         'password',
+        'display_name',
     ];
 
     /**
@@ -66,10 +67,14 @@ class User extends Authenticatable implements Auditable
         'permissions'
     ];
 
-
+    /**
-    // public function getPermissionsAttribute() {
+     * The default attributes.
-    //     return $this->permissions()->pluck('permission')->toArray();
+     *
-    // }
+     * @var string[]
+     */
+    protected $attributes = [
+        'phone' => '',
+    ];
 
 
     /**
@@ -111,7 +116,7 @@ class User extends Authenticatable implements Auditable
      */
     public function givePermission($permissions)
     {
-        if (!is_array($permissions)) {
+        if (is_array($permissions) === false) {
             $permissions = [$permissions];
         }
 
@@ -132,11 +137,11 @@ class User extends Authenticatable implements Auditable
      * Revoke permissions from the user
      *
      * @param string|array $permissions The permission(s) to revoke.
-     * @return int
+     * @return integer
      */
     public function revokePermission($permissions)
     {
-        if (!is_array($permissions)) {
+        if (is_array($permissions) === false) {
             $permissions = [$permissions];
         }
 
@@ -160,9 +165,9 @@ class User extends Authenticatable implements Auditable
      *
      * @return HasMany
      */
-    public function posts()
+    public function articles()
     {
-        return $this->hasMany(Post::class);
+        return $this->hasMany(Article::class);
     }
 
     /**
@@ -184,4 +189,14 @@ class User extends Authenticatable implements Auditable
     {
         return $this->hasMany(UserLogins::class);
     }
+
+    /**
+     * Get the events associated with the user.
+     *
+     * @return BelongsToMany
+     */
+    public function events()
+    {
+        return $this->belongsToMany(Event::class, 'event_user', 'user_id', 'event_id');
+    }
 }

app/Providers/AppServiceProvider.php

@@ -2,10 +2,15 @@
 
 namespace App\Providers;
 
+use App\Rules\RequiredIfAny;
+use App\Rules\Uniqueish;
 use Illuminate\Support\ServiceProvider;
 use Exception;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
 use PDOException;
+use Illuminate\Validation\Rule;
+use Illuminate\Support\Facades\Validator;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -26,6 +31,9 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Storage::macro('public', function ($diskName) {
+            $public = config("filesystems.disks.{$diskName}.public", false);
+            return $public;
+        });
     }
 }

app/Providers/EventServiceProvider.php

@@ -31,22 +31,7 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        Queue::after(function (JobProcessed $event) {
+        //
-            // Log::info($event->connectionName);
-            // Log::info('ID: ' . $event->job->getJobId());
-            // Log::info('Attempts: ' . $event->job->attempts());
-            // Log::info('Name: ' . $event->job->getName());
-            // Log::info('ResolveNAme: ' . $event->job->resolveName());
-            // Log::info('Queue: ' . $event->job->getQueue());
-            // Log::info('Body: ' . $event->job->getRawBody());
-            // Log::info(print_r($event->job->payload(), true));
-
-            // $payload = $event->job->payload();
-            // $data = unserialize($payload['data']['command']);
-
-            // Log::info('MAIL: ' . $data->to);
-            // Log::info('MAIL: ' . get_class($data->mailable));
-        });
     }
 
     /**

app/Providers/RouteServiceProvider.php

@@ -7,6 +7,7 @@ use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvi
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
 
 class RouteServiceProvider extends ServiceProvider
 {
@@ -37,6 +38,22 @@ class RouteServiceProvider extends ServiceProvider
             Route::middleware('web')
                 ->group(base_path('routes/web.php'));
         });
+
+        Route::macro('apiAttachmentResource', function ($uri, $controller) {
+            $singularUri = Str::singular($uri);
+
+            Route::get("$uri/{{$singularUri}}/attachments", [$controller, 'getAttachments'])
+                ->name("{{$singularUri}}.attachments.index");
+
+            Route::post("$uri/{{$singularUri}}/attachments", [$controller, 'storeAttachment'])
+                ->name("{{$singularUri}}.attachments.store");
+
+            Route::match(['put', 'patch'], "$uri/{{$singularUri}}/attachments", [$controller, 'updateAttachments'])
+                ->name("{{$singularUri}}.attachments.update");
+
+            Route::delete("$uri/{{$singularUri}}/attachments/{medium}", [$controller, 'deleteAttachment'])
+                ->name("{{$singularUri}}.attachments.destroy");
+        });
     }
 
     /**

app/Rules/UniqueFileName.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Rules;
+
+use App\Models\Media;
+use Illuminate\Contracts\Validation\Rule;
+
+class UniqueFileName implements Rule
+{
+    /**
+     * Create a new rule instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string $attribute
+     * @param  mixed  $value
+     * @return boolean
+     */
+    public function passes($attribute, $value)
+    {
+        return (Media::fileExists($value) === false);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'The file name already exists.';
+    }
+}

app/Rules/Uniqueish.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Facades\DB;
+use PDO;
+
+class Uniqueish implements Rule
+{
+    /**
+     * The table name to compare.
+     *
+     * @var string
+     */
+    protected $table;
+
+    /**
+     * The column name to compare.
+     *
+     * @var string|null
+     */
+    protected $column;
+
+    /**
+     * The ID of the record to be ignored.
+     *
+     * @var mixed
+     */
+    protected $ignoreId;
+
+
+    /**
+     * Create a new rule instance.
+     *
+     * @param string $table  The table name to compare.
+     * @param string $column The column name to compare.
+     * @return void
+     */
+    public function __construct(string $table, string $column = null)
+    {
+        $this->table = $table;
+        $this->column = $column;
+    }
+
+    /**
+     * Set the ID of the record to be ignored.
+     *
+     * @param  mixed $id The ID to ignore.
+     * @return $this
+     */
+    public function ignore(mixed $id)
+    {
+        $this->ignoreId = $id;
+        return $this;
+    }
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  mixed $attribute Not used.
+     * @param  mixed $value     The value to compare.
+     * @return boolean
+     */
+    public function passes(mixed $attribute, mixed $value)
+    {
+        $columnName = ($this->column ?? $attribute);
+        $similarValue = preg_replace('/[^A-Za-z]/', '', strtolower($value));
+
+        try {
+            $query = DB::table($this->table)
+            ->where($columnName, 'like', '%' . $similarValue . '%');
+
+            if ($this->ignoreId !== null) {
+                $query->where('id', '<>', $this->ignoreId);
+            }
+
+            $query->whereRaw('LOWER(REGEXP_REPLACE(' . $columnName . ', \'[^A-Za-z0-9]\', \'\')) = ?', [$similarValue]);
+            $result = $query->first();
+        } catch (\Illuminate\Database\QueryException $e) {
+            // Fall back to performing the regex replace in PHP
+            // $results = $query->get();
+            $query = DB::table($this->table);
+            $results = $query->get();
+
+            foreach ($results as $result) {
+                $resultValue = preg_replace('/[^A-Za-z0-9]/', '', strtolower($result->{$columnName}));
+                if ($resultValue === $similarValue && $result->id != $this->ignoreId) {
+                    return false; // Value already exists in the table
+                }
+            }
+            return true; // Value does not exist in the table
+        }//end try
+
+        return $result === null;
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'The :attribute is similar to one that already exists. Please choose another.';
+    }
+}

composer.json

@@ -15,23 +15,26 @@
         "laravel/framework": "^9.19",
         "laravel/sanctum": "^3.0",
         "laravel/tinker": "^2.7",
+        "league/flysystem-aws-s3-v3": "^3.12",
         "owen-it/laravel-auditing": "^13.0",
         "php-ffmpeg/php-ffmpeg": "^1.1",
-        "spatie/image-optimizer": "^1.6",
+        "sunspikes/clamav-validator": "*",
-        "thiagoalessio/tesseract_ocr": "^2.12"
+        "thiagoalessio/tesseract_ocr": "^2.12",
+        "vlucas/phpdotenv": "^5.5"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^6.1",
+        "nunomaduro/collision": "^7.1",
-        "phpunit/phpunit": "^9.5.10",
+        "phpunit/phpunit": "^10.1.3",
         "spatie/laravel-ignition": "^1.0"
     },
     "autoload": {
         "files": [
-            "app/Helpers/Array.php"
+            "app/Helpers/Array.php",
+            "app/Helpers/Temp.php"
         ],
         "psr-4": {
             "App\\": "app/",

config/clamav.php

@@ -0,0 +1,68 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Preferred socket
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the socket which is used, which is unix_socket or tcp_socket.
+    |
+    | Please note if the unix_socket is used and the socket-file is not found the tcp socket will be
+    | used as fallback.
+    */
+    'preferred_socket' => env('CLAMAV_PREFERRED_SOCKET', 'unix_socket'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Unix Socket
+    |--------------------------------------------------------------------------
+    | This option defines the location to the unix socket-file. For example
+    | /var/run/clamav/clamd.ctl
+    */
+    'unix_socket' => env('CLAMAV_UNIX_SOCKET', '/var/run/clamav/clamd.ctl'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | TCP Socket
+    |--------------------------------------------------------------------------
+    | This option defines the TCP socket to the ClamAV instance.
+    */
+    'tcp_socket' => env('CLAMAV_TCP_SOCKET', 'tcp://127.0.0.1:3310'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Socket connect timeout
+    |--------------------------------------------------------------------------
+    | This option defines the maximum time to wait in seconds for socket connection attempts before failure or timeout, default null = no limit.
+    */
+    'socket_connect_timeout' => env('CLAMAV_SOCKET_CONNECT_TIMEOUT', null),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Socket read timeout
+    |--------------------------------------------------------------------------
+    | This option defines the maximum time to wait in seconds for a read.
+    */
+    'socket_read_timeout' => env('CLAMAV_SOCKET_READ_TIMEOUT', 30),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Throw exceptions instead of returning failures when scan fails.
+    |--------------------------------------------------------------------------
+    | This makes it easier for a developer to find the source of a clamav
+    | failure, but an end user may only see a 500 error for the user
+    | if exceptions are not displayed.
+    */
+    'client_exceptions' => env('CLAMAV_CLIENT_EXCEPTIONS', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Skip validation
+    |--------------------------------------------------------------------------
+    | This skips the virus validation for current environment.
+    |
+    | Please note when true it won't connect to ClamAV and will skip the virus validation.
+    */
+    'skip_validation' => env('CLAMAV_SKIP_VALIDATION', false),
+];

config/filesystems.php

@@ -29,31 +29,43 @@ return [
     */
 
     'disks' => [
-
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app/uploads'),
+            'root' => storage_path('app/public'),
-            'throw' => false,
+            'url' => env('APP_URL') . "/storage",
-            'url' => env('STORAGE_LOCAL_URL'),
+            'public' => true,
         ],
 
-        'public' => [
+        'cdn' => [
-            'driver' => 'local',
-            'root' => public_path('uploads'),
-            'throw' => false,
-            'url' => env('STORAGE_PUBLIC_URL'),
-        ],
-
-        's3' => [
             'driver' => 's3',
-            'key' => env('AWS_ACCESS_KEY_ID'),
+            'key' => env('AWS_PUBLIC_ACCESS_KEY_ID'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'secret' => env('AWS_PUBLIC_SECRET_ACCESS_KEY'),
-            'region' => env('AWS_DEFAULT_REGION'),
+            'region' => env('AWS_PUBLIC_DEFAULT_REGION'),
-            'bucket' => env('AWS_BUCKET'),
+            'bucket' => env('AWS_PUBLIC_BUCKET'),
-            'url' => env('AWS_URL'),
+            'url' => env('AWS_PUBLIC_URL'),
-            'endpoint' => env('AWS_ENDPOINT'),
+            'endpoint' => env('AWS_PUBLIC_ENDPOINT'),
-            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'use_path_style_endpoint' => env('AWS_PUBLIC_USE_PATH_STYLE_ENDPOINT', false),
             'throw' => false,
+            'public' => true,
+            'options' => [
+                'ACL' => '',
+            ]
+        ],
+
+        'private' => [
+            'driver' => 's3',
+            'key' => env('AWS_PRIVATE_ACCESS_KEY_ID'),
+            'secret' => env('AWS_PRIVATE_SECRET_ACCESS_KEY'),
+            'region' => env('AWS_PRIVATE_DEFAULT_REGION'),
+            'bucket' => env('AWS_PRIVATE_BUCKET'),
+            'url' => env('AWS_PRIVATE_URL'),
+            'endpoint' => env('AWS_PRIVATE_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_PRIVATE_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
+            'public' => false,
+            'options' => [
+                'ACL' => '',
+            ]
         ],
 
     ],

database/factories/ArticleFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 /**
  * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Event>
  */
-class PostFactory extends Factory
+class ArticleFactory extends Factory
 {
     /**
      * Define the model's default state.

database/factories/MediaFactory.php

@@ -20,10 +20,9 @@ class MediaFactory extends Factory
         return [
             'title' => $this->faker->sentence(),
             'name' => storage_path('app/public/') . $this->faker->slug() . '.' . $this->faker->fileExtension,
-            'mime' => $this->faker->mimeType,
+            'mime_type' => $this->faker->mimeType,
             'user_id' => $this->faker->uuid,
             'size' => $this->faker->numberBetween(1000, 1000000),
-            'permission' => null
         ];
     }
 }

database/factories/UserFactory.php

@@ -20,15 +20,20 @@ class UserFactory extends Factory
         $faker = \Faker\Factory::create();
         $faker->addProvider(new \Faker\Provider\CustomInternetProvider($faker));
 
+        $first_name = $faker->firstName();
+        $last_name = $faker->lastName();
+
+        $display_name = $first_name . ' ' . $last_name;
+
         return [
-            'username' => $faker->unique()->userNameWithMinLength(6),
+            'first_name' => $first_name,
-            'first_name' => $faker->firstName(),
+            'last_name' => $last_name,
-            'last_name' => $faker->lastName(),
             'email' => $faker->safeEmail(),
             'email_verified_at' => now(),
             'phone' => $faker->phoneNumber(),
             'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
             'remember_token' => Str::random(10),
+            'display_name' => $display_name,
         ];
     }
 

database/migrations/2022_12_28_113117_create_posts_table.php

@@ -22,8 +22,6 @@ return new class extends Migration
             $table->uuid('hero');
             $table->text('content');
             $table->timestamps();
-
-            // $table->foreign('user_id')->references('id')->on('users');
         });
     }
 

database/migrations/2022_12_30_105153_create_media_table.php

@@ -22,8 +22,6 @@ return new class extends Migration
             $table->string('permission')->nullable();
             $table->bigInteger('size');
             $table->timestamps();
-
-            // $table->foreign('user_id')->references('id')->on('users');
         });
     }
 

database/migrations/2023_02_24_023054_create_attachments_table.php

@@ -30,6 +30,6 @@ return new class extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('media_attachments');
+        Schema::dropIfExists('attachments');
     }
 };

database/migrations/2023_04_05_222458_update_media_table.php

@@ -0,0 +1,59 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('media')->whereNull('mime')->update(['mime' => '']);
+        DB::table('media')->whereNull('permission')->update(['permission' => '']);
+
+        Schema::table('media', function (Blueprint $table) {
+            $table->string('storage')->default("cdn");
+            $table->string('description')->default("");
+            $table->string('status')->default("");
+            $table->string('dimensions')->default("");
+            $table->text('variants');
+
+            $table->bigInteger('size')->default(0)->change();
+            $table->string('permission')->default("")->nullable(false)->change();
+
+            $table->string('mime')->default("")->nullable(false)->change();            
+        });
+
+        Schema::table('media', function(Blueprint $table) {
+            $table->renameColumn('mime', 'mime_type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('media', function (Blueprint $table) {
+            $table->bigInteger('size')->change();
+            $table->string('mime_type')->nullable(true)->change();
+            $table->string('permission')->nullable(true)->change();
+
+            $table->renameColumn('mime_type', 'mime');
+
+            $table->dropColumn('status');
+            $table->dropColumn('dimensions');
+            $table->dropColumn('variants');
+            $table->dropColumn('description');
+            $table->dropColumn('storage');
+        });
+    }
+};

database/migrations/2023_04_18_111723_update_no_nullable_phone_on_users_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('users')->whereNull('phone')->update(['phone' => '']);
+        
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('phone')->default("")->nullable(false)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('phone')->nullable(true)->change();
+        });
+    }
+};

database/migrations/2023_04_18_113354_add_display_name_to_users_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('display_name')->default("");
+        });
+
+        // Update existing rows with display_name
+        DB::table('users')->select('id', 'username')->orderBy('id')->chunk(100, function ($users) {
+            foreach ($users as $user) {
+                DB::table('users')->where('id', $user->id)->update(['display_name' => $user->username]);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('display_name');
+        });
+    }
+};

database/migrations/2023_04_19_122711_drop_subscriptions_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('subscriptions');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::create('subscriptions', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('email');
+            $table->timestamp('confirmed_at')->nullable();
+            $table->timestamps();
+        });
+    }
+};

database/migrations/2023_04_25_235615_update_posts_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::rename('posts', 'articles');
+
+        // Update permissions to use articles instead of posts
+        DB::table('permissions')->select('id', 'permission')->where('permission', 'admin/posts')->update(['permission' => 'admin/articles']);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::rename('articles', 'posts');
+
+        // Update permissions to use posts instead of articles
+        DB::table('permissions')->select('id', 'permission')->where('permission', 'admin/articles')->update(['permission' => 'admin/posts']);
+    }
+};

database/migrations/2023_05_01_045630_update_analytics_table.php

@@ -0,0 +1,109 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('analytics', function (Blueprint $table) {
+            $table->bigInteger('session')->nullable(false);
+            $table->string('attribute')->default('')->change();
+        });
+
+        DB::table('analytics')
+        ->where('type', 'pageview')
+        ->update(['type' => 'apirequest']);
+
+        // Set first session
+        $session = 0;
+
+        do {
+            $rows = DB::table('analytics')
+            ->whereNull('session')
+            ->orWhere('session', 0)
+            ->orderBy('created_at', 'asc')
+            ->limit(1)
+            ->get();
+
+            if($rows->isEmpty()) {
+                break;
+            }
+
+            $sessionRow = $rows->first();
+            DB::table('analytics')->where('id', $sessionRow->id)->update(['session' => ++$session]);
+            $lastSessionUpdate = $sessionRow->created_at;
+
+            do {
+                $sameSessionRows = DB::table('analytics')
+                ->whereNull('session')
+                ->orWhere('session', 0)
+                ->where('useragent', $sessionRow->useragent)
+                ->where('created_at', '<=', date('Y-m-d H:i:s', strtotime('30 minutes', strtotime($lastSessionUpdate))))
+                ->orderBy('created_at', 'desc')
+                ->get();
+
+                if($sameSessionRows->isEmpty()) {
+                    break;
+                }
+
+                $ids = $sameSessionRows->pluck('id')->toArray();
+                DB::table('analytics')->whereIn('id', $ids)->update(['session' => $session]);
+                $lastSessionUpdate = $sameSessionRows->first()->created_at;
+            } while(true);
+        } while(true);
+
+
+        // Loop through the rows and update `session` based on the logic you described
+        // foreach ($rows as $row) {
+        //     // Check if this is the first row
+        //     if ($row->created_at === $rows->first()->created_at) {
+        //         DB::table('analytics')
+        //             ->where('id', $row->id)
+        //             ->update(['session' => $session]);
+        //     } else {
+        //         // Look for a previous row with the same useragent and ip within the last 30 minutes
+        //         $previousRow = DB::table('analytics')
+        //             ->where('useragent', $row->useragent)
+        //             ->where('ip', $row->ip)
+        //             ->where('created_at', '>=', date('Y-m-d H:i:s', strtotime('-30 minutes', strtotime($row->created_at))))
+        //             ->whereNotNull('session')
+        //             ->orderBy('created_at', 'desc')
+        //             ->first();
+
+        //         if ($previousRow) {
+        //             // If a previous row is found, set the session to the same value
+        //             DB::table('analytics')
+        //                 ->where('id', $row->id)
+        //                 ->update(['session' => $previousRow->session]);
+        //         } else {
+        //             // If no previous row is found, increment the session value
+        //             $session++;
+        //             DB::table('analytics')
+        //                 ->where('id', $row->id)
+        //                 ->update(['session' => $session]);
+        //         }
+        //     }
+        // }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('analytics', function (Blueprint $table) {
+            $table->dropColumn('session');
+        });
+    }
+};

database/migrations/2023_05_04_071954_remove_username_from_users_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('username');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('username')->unique();
+        });
+
+        DB::table('users')->update(['username' => DB::raw('display_name')]);
+    }
+};

database/migrations/2023_05_06_080418_create_shortlinks_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('shortlinks', function (Blueprint $table) {
+            $table->id();
+            $table->string('code', 4)->unique();
+            $table->string('url');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('shortlinks');
+    }
+};

database/migrations/2023_05_06_082705_add_counter_to_shortlinks_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('shortlinks', function (Blueprint $table) {
+            $table->bigInteger('used')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('shortlinks', function (Blueprint $table) {
+            //
+        });
+    }
+};

database/migrations/2023_05_08_021929_update_users_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('first_name')->default('')->change();
+            $table->string('last_name')->default('')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('first_name')->nullable(false)->change();
+            $table->string('last_name')->nullable(false)->change();
+        });
+    }
+};

database/migrations/2023_05_09_003156_add_location_url_to_events.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->string('location_url')->default('');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->dropColumn('location_url');
+        });
+    }
+};

database/migrations/2023_05_11_032859_add_private_to_attachments_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('attachments', function (Blueprint $table) {
+            $table->boolean('private')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('attachments', function (Blueprint $table) {
+            $table->dropColumn('private');
+        });
+    }
+};

database/migrations/2023_05_11_033621_create_event_users_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('event_users', function (Blueprint $table) {
+            $table->id();
+            $table->uuid('event_id');
+            $table->uuid('user_id');
+            $table->timestamps();
+
+            $table->foreign('event_id')->references('id')->on('events')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('event_users');
+    }
+};

database/seeders/DatabaseSeeder.php

@@ -20,7 +20,7 @@ class DatabaseSeeder extends Seeder
         \App\Models\User::factory(40)->create();
 
         \App\Models\User::factory()->create([
-            'username' => 'nomadjimbob',
+            'display_name' => 'James Collins',
             'first_name' => 'James',
             'last_name' => 'Collins',
             'email' => 'james@stemmechanics.com.au',

package.json

@@ -13,21 +13,22 @@
         "@typescript-eslint/parser": "^5.48.1",
         "eslint": "^8.31.0",
         "eslint-config-prettier": "^8.6.0",
-        "eslint-plugin-jsdoc": "^39.6.4",
+        "eslint-plugin-jsdoc": "^44.2.5",
         "eslint-plugin-vue": "^9.8.0",
+        "fontaine": "^0.3.1",
         "laravel-vite-plugin": "^0.7.2",
         "lodash": "^4.17.19",
         "postcss": "^8.1.14",
-        "prettier": "2.8.2",
+        "prettier": "2.8.8",
         "rollup-plugin-analyzer": "^4.0.0",
         "ts-node": "^10.9.1",
         "typescript": "^4.9.5",
         "vite": "^4.0.0",
-        "vite-plugin-compression2": "^0.8.2",
+        "vite-plugin-compression2": "^0.9.1",
         "vitest": "^0.28.5"
     },
     "dependencies": {
-        "@tinymce/tinymce-vue": "^4.0.7",
+        "@tinymce/tinymce-vue": "^5.1.0",
         "@vitejs/plugin-vue": "^4.0.0",
         "@vuepic/vue-datepicker": "^3.6.4",
         "dompurify": "^3.0.0",
@@ -39,9 +40,8 @@
         "tinymce": "^6.3.1",
         "vue": "^3.2.36",
         "vue-dompurify-html": "^3.1.2",
-        "vue-final-modal": "^3.4.11",
+        "vue-final-modal": "^4.4.2",
         "vue-loader": "^17.0.1",
-        "vue-recaptcha-v3": "^2.0.1",
         "vue-router": "^4.1.6",
         "vue3-easy-data-table": "^1.5.24"
     }

phpunit.xml

@@ -19,6 +19,7 @@
     </coverage>
     <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="APP_DEBUG" value="true"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="DB_CONNECTION" value="sqlite"/>

public/.htaccess

@@ -13,6 +13,14 @@
 
     RewriteEngine On
 
+    # Force HTTPS
+    RewriteCond %{HTTPS} !=on
+    RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+    # Support shortlinks
+    RewriteCond %{HTTP_HOST} ^(www\.)?stemmech\.com\.au$ [NC]
+    RewriteRule ^(.*)$ shortlink.php?code=$1 [L,QSA]
+
     # Add www subdomain if missing
     RewriteCond %{HTTP_HOST} ^stemmechanics.com.au$ [NC]
     RewriteRule (.*) https://www.stemmechanics.com.au/$1 [R=301,L]
@@ -27,9 +35,9 @@
     RewriteRule ^ %1 [L,R=301]
 
     # Pass to media handler if the media request has query
-    RewriteCond %{REQUEST_FILENAME} -f
+    #RewriteCond %{REQUEST_FILENAME} -f
-    RewriteCond %{QUERY_STRING} .
+    #RewriteCond %{QUERY_STRING} .
-    RewriteRule ^uploads/(.+)\.(jpe?g|png)$ media.php?url=uploads/$1.$2 [NC,QSA,L]
+    #RewriteRule ^uploads/(.+)\.(jpe?g|png)$ media.php?url=uploads/$1.$2 [NC,QSA,L]
 
     # AddEncoding allows you to have certain browsers uncompress information on the fly.
     AddEncoding gzip .gz
@@ -52,4 +60,5 @@
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]
+
 </IfModule>