fix: upgrade @tiptap/extension-highlight from 2.1.16 to 2.2.4

Snyk has created this PR to upgrade @tiptap/extension-highlight from 2.1.16 to 2.2.4.

See this package in npm:
https://www.npmjs.com/package/@tiptap/extension-highlight

See this project in Snyk:
https://app.snyk.io/org/nomadjimbob/project/66c7b29c-3171-4fcc-b6f1-0bc65698880c?utm_source=github&utm_medium=referral&page=upgrade-pr

.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=

.env.testing

@@ -0,0 +1,59 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=
+APP_DEBUG=true
+APP_URL=http://127.0.0.1
+APP_URL_API="${APP_URL}/api/"
+
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
+DB_CONNECTION=sqlite
+DB_DATABASE=:memory:
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=array
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=log
+MAIL_HOST=null
+MAIL_PORT=null
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+CONTACT_ADDRESS="hello@stemmechanics.com.au"
+CONTACT_SUBJECT="Contact from website"
+
+STORAGE_LOCAL_URL="${APP_URL}/api/media/%ID%/download"
+STORAGE_PUBLIC_URL="${APP_URL}/uploads/%NAME%"

.eslintignore

@@ -0,0 +1,3 @@
+.github/
+.vscode/
+vendor/

.eslintrc.js

@@ -4,14 +4,15 @@ module.exports = {
     },
     extends: [
         "eslint:recommended",
-        "plugin:vue/vue3-recommended",
+        "plugin:vue/vue3-strongly-recommended",
         "prettier",
         "plugin:jsdoc/recommended",
         "plugin:@typescript-eslint/recommended",
     ],
     rules: {
         "vue/multi-word-component-names": "off",
-        indent: ["error", 4],
+        indent: ["off", 4, { ignoredNodes: ["ConditionalExpression"] }],
+        "@typescript-eslint/no-inferrable-types": "off",
     },
     plugins: ["jsdoc", "@typescript-eslint"],
     parser: "vue-eslint-parser",

.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"

.github/workflows/laravel.yml

@@ -0,0 +1,42 @@
+name: Laravel
+
+on:
+    push:
+        branches: ["main"]
+
+jobs:
+    laravel-tests:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: "8.2"
+            - uses: actions/checkout@v3
+            - name: Copy .env
+              run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+            - name: Install Dependencies
+              run: composer install -q --no-interaction --no-progress --prefer-dist
+            - name: Generate key
+              run: php artisan key:generate
+            - name: Directory Permissions
+              run: chmod -R 777 storage bootstrap/cache
+            - name: Create Database
+              run: |
+                  mkdir -p database
+                  touch database/database.sqlite
+            - name: Execute tests (Unit and Feature tests) via PHPUnit
+              env:
+                  DB_CONNECTION: sqlite
+                  DB_DATABASE: database/database.sqlite
+              run: vendor/bin/phpunit
+            - name: Install Node.js
+              uses: actions/setup-node@v2
+              with:
+                  node-version: "16.x"
+            - name: Install dependencies
+              run: npm ci
+            - name: Run Vue tests
+              env:
+                  LARAVEL_BYPASS_ENV_CHECK: "1"
+              run: npm run test

.gitignore

@@ -26,7 +26,7 @@ storage/*.key
 Homestead.yaml
 Homestead.json
 /.vagrant
-.phpunit.result.cache
+/.phpunit.cache
 
 ### macOS ###
 # General
@@ -238,3 +238,21 @@ dist/
 /public/uploads
 /public/build
 *.key
+
+### TinyMCE ###
+/public/tinymce
+!/public/tinymce/skins/ui/stemmech/
+
+### Synk ###
+.dccache
+
+### TempCodeRunner ###
+tempCodeRunnerFile.*
+
+### PHPUnit ###
+.phpunit.result.cache
+.gitignore
+
+### Codesniffer ###
+phpcs.phar
+phpcbf.phar

.ls-lint.yml

@@ -0,0 +1,14 @@
+ls:
+    resources/js/store:
+        .ts: pascalcase
+    "*":
+        .js: camelcase
+        .ts: camelcase
+        .vue: pascalcase
+        .dir: snakecase
+        .type.ts: camelcase
+ignore:
+    - node_modules
+    - vendor
+    - public/build
+    - public/tinymce

.prettierrc.json

@@ -1,4 +1,5 @@
 {
     "bracketSameLine": true,
-    "tabWidth": 4
+    "tabWidth": 4,
+    "htmlWhitespaceSensitivity": "css"
 }

.vscode/settings.json

@@ -2,7 +2,7 @@
     "editor.formatOnType": true,
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "[vue]": {
@@ -14,5 +14,6 @@
     "[php]": {
         // "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
         "editor.defaultFormatter": "wongjn.php-sniffer"
-    }
+    },
+    "cSpell.words": ["TIMESTAMPDIFF"]
 }

app/Conductors/AnalyticsConductor.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Conductors;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AnalyticsConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\AnalyticsSession::class;
+
+    /**
+     * The default includes to include in a request.
+     *
+     * @var array
+     */
+    protected $includes = ['requests.type','requests.path'];
+
+
+    /**
+     * 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): bool
+    {
+        /** @var \App\Models\User */
+        $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(): bool
+    {
+        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): bool
+    {
+        /** @var \App\Models\User */
+        $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): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/analytics') === true);
+    }
+}

app/Conductors/ArticleConductor.php

@@ -0,0 +1,181 @@
+<?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 Illuminate\Support\Facades\Cache;
+use LogicException;
+
+class ArticleConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\Article::class;
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = '-publish_at';
+
+    /**
+     * The included fields
+     *
+     * @var string[]
+     */
+    protected $includes = ['attachments', 'user', 'gallery'];
+
+
+    /**
+     * Run a scope query on the collection before anything else.
+     *
+     * @param Builder $builder The builder in use.
+     * @return void
+     */
+    public function scope(Builder $builder): void
+    {
+        /** @var \App\Models\User */
+        $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): bool
+    {
+        if (Carbon::parse($model->publish_at)->isFuture() === true) {
+            /** @var \App\Models\User */
+            $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(): bool
+    {
+        /** @var \App\Models\User */
+        $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): bool
+    {
+        /** @var \App\Models\User */
+        $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): bool
+    {
+        /** @var \App\Models\User */
+        $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): array
+    {
+        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->getAttachments()->map(function ($attachment) {
+            return MediaConductor::includeModel(request(), 'attachments', $attachment->media);
+        });
+    }
+
+    /**
+     * Include Gallery Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeGallery(Model $model)
+    {
+        return $model->getGallery()->map(function ($item) {
+            return MediaConductor::includeModel(request(), 'gallery', $item->media);
+        });
+    }
+
+    /**
+     * Include User Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeUser(Model $model)
+    {
+        $cacheKey = "user:{$model['user_id']}";
+        $user = Cache::remember($cacheKey, now()->addDays(28), function () use ($model) {
+            return User::find($model['user_id']);
+        });
+
+        return UserConductor::includeModel(request(), 'user', $user);
+    }
+
+    /**
+     * Transform the Hero field.
+     *
+     * @param mixed $value The current value.
+     * @return array|null The new value.
+     */
+    public function transformHero(mixed $value): array|null
+    {
+        $cacheKey = "media:{$value}";
+        $media = Cache::remember($cacheKey, now()->addDays(28), function () use ($value) {
+            return Media::find($value);
+        });
+
+        return MediaConductor::includeModel(request(), 'hero', $media);
+    }
+}

app/Conductors/EventConductor.php

@@ -0,0 +1,140 @@
+<?php
+
+namespace App\Conductors;
+
+use App\Models\Media;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\InvalidCastException;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
+
+class EventConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\Event::class;
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = '-start_at';
+
+    /**
+     * The included fields
+     * @var string[]
+     */
+    protected $includes = ['attachments'];
+
+
+    /**
+     * Run a scope query on the collection before anything else.
+     *
+     * @param Builder $builder The builder in use.
+     * @return void
+     */
+    public function scope(Builder $builder): void
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        if ($user === null || $user->hasPermission('admin/events') === false) {
+            $builder
+                ->where('status', '!=', 'draft')
+                ->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): bool
+    {
+        if (strtolower($model->status) === 'draft' || Carbon::parse($model->publish_at)->isFuture() === true) {
+            /** @var \App\Models\User */
+            $user = auth()->user();
+            if ($user === null || $user->hasPermission('admin/events') === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Return if the current model is creatable.
+     *
+     * @return boolean Allow creating model.
+     */
+    public static function creatable(): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/events') === true);
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/events') === true);
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/events') === true);
+    }
+
+    /**
+     * Include Attachments Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeAttachments(Model $model)
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+
+        return $model->getAttachments()->map(function ($attachment) use ($user) {
+            if ($attachment->private === false || ($user !== null && $user->hasPermission('admin/events') === true)) {
+                return MediaConductor::includeModel(request(), 'attachments', $attachment->media);
+            }
+        });
+    }
+
+    /**
+     * Transform the Hero field.
+     *
+     * @param mixed $value The current value.
+     * @return array|null The new value.
+     */
+    public function transformHero(mixed $value): array|null
+    {
+        $cacheKey = "media:{$value}";
+        $media = Cache::remember($cacheKey, now()->addDays(28), function () use ($value) {
+            return Media::find($value);
+        });
+
+        return MediaConductor::includeModel(request(), 'hero', $media);
+    }
+}

app/Conductors/MediaConductor.php

@@ -0,0 +1,184 @@
+<?php
+
+namespace App\Conductors;
+
+use App\Models\MediaJob;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
+
+class MediaConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\Media::class;
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = 'created_at';
+
+    /**
+     * The included fields
+     *
+     * @var string[]
+     */
+    protected $includes = ['user', 'jobs'];
+
+    /**
+     * 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.
+     *
+     * @param Model $model The model in question.
+     * @return array The array of field names.
+     */
+    public function fields(Model $model): array
+    {
+        $fields = parent::fields($model);
+
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        if ($user === null || $user->hasPermission('admin/media') === false) {
+            $fields = arrayRemoveItem($fields, ['security_data', 'storage']);
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Run a scope query on the collection before anything else.
+     *
+     * @param Builder $builder The builder in use.
+     * @return void
+     */
+    public function scope(Builder $builder): void
+    {
+        $user = auth()->user();
+        if ($user === null) {
+            $builder->where('security_type', '')
+            ->orWhere('security_type', 'password');
+        } else {
+            $builder->where(function ($query) use ($user) {
+                $query->where('security_type', '')
+                    ->orWhere('security_type', 'password')
+                    ->orWhere(function ($subquery) use ($user) {
+                        $subquery->where('security_type', 'permission')
+                            ->whereIn('security_data', $user->permissions);
+                    });
+            });
+        }
+    }
+
+    /**
+     * 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): bool
+    {
+        if (strcasecmp('permission', $model->security_type) === 0) {
+            /** @var \App\Models\User */
+            $user = auth()->user();
+            if ($user === null || $user->hasPermission($model->security_data) === false) {
+                return false;
+            }
+        } elseif ($model->security_type !== '' && strcasecmp('password', $model->security_type) !== 0) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return if the current model is creatable.
+     *
+     * @return boolean Allow creating model.
+     */
+    public static function creatable(): bool
+    {
+        $user = auth()->user();
+        return ($user !== null);
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && (strcasecmp($model->user_id, $user->id) === 0 ||
+            $user->hasPermission('admin/media') === true));
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $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): array
+    {
+        unset($data['user_id']);
+        return $data;
+    }
+
+    /**
+     * Include User Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeUser(Model $model)
+    {
+        $user = Cache::remember("user:{$model['user_id']}", now()->addDays(28), function () use ($model) {
+            return User::find($model['user_id']);
+        });
+
+        return UserConductor::includeModel(request(), 'user', $user);
+    }
+
+    /**
+     * Include job models in Media
+     *
+     * @param Model $model The reference model.
+     * @return mixed
+     */
+    public function includeJobs(Model $model)
+    {
+        $jobs = $model->jobs()
+            ->select(['id','created_at','updated_at','user_id','status','status_text','progress'])
+            ->orderBy('created_at', 'desc')->get();
+        return $jobs;
+    }
+}

app/Conductors/MediaJobConductor.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Conductors;
+
+use App\Models\MediaJob;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
+
+class MediaJobConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\MediaJob::class;
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = 'created_at';
+
+    /**
+     * The included fields
+     *
+     * @var string[]
+     */
+    protected $includes = ['user'];
+
+
+    /**
+     * Return if the current model is creatable.
+     *
+     * @return boolean Allow creating model.
+     */
+    public static function creatable(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model): bool
+    {
+        return false;
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model): bool
+    {
+        return false;
+    }
+
+    /**
+     * Transform the final model data
+     *
+     * @param array $data The model data to transform.
+     * @return array The transformed model.
+     */
+    public function transformFinal(array $data): array
+    {
+        unset($data['user_id']);
+        return $data;
+    }
+}

app/Conductors/ShortlinkConductor.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Conductors;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ShortlinkConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\Shortlink::class;
+
+    /**
+     * 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(): bool
+    {
+        /** @var \App\Models\User */
+        $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): bool
+    {
+        /** @var \App\Models\User */
+        $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): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/shortlinks') === true);
+    }
+}

app/Conductors/SubscriptionConductor.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Conductors;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SubscriptionConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\Subscription::class;
+
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && (
+            (strcasecmp($model->email, $user->email) === 0 && $user->email_verified_at !== null) ||
+            $user->hasPermission('admin/subscriptions') === true
+        ));
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && ((strcasecmp($model->email, $user->email) === 0 &&
+        $user->email_verified_at !== null) || $user->hasPermission('admin/subscriptions') === true));
+    }
+}

app/Conductors/UserConductor.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Conductors;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\User::class;
+
+
+    /**
+     * Return the visible API fields.
+     *
+     * @param Model $model The model.
+     * @return string[] The fields visible.
+     */
+    public function fields(Model $model): array
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        if ($user === null || $user->hasPermission('admin/users') === false) {
+            return ['id', 'display_name'];
+        }
+
+        return parent::fields($model);
+    }
+
+    /**
+     * Transform the passed Model to an array
+     *
+     * @param Model $model The model to transform.
+     * @return array The transformed model.
+     */
+    public function transform(Model $model): array
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        $data = $model->toArray();
+        $limit = $this->fields($model);
+
+        if (
+            $user === null || (
+            $user->hasPermission('admin/users') === false && strcasecmp($user->id, $model->id) !== 0
+            )
+        ) {
+            $limit = ['id', 'display_name'];
+        } else {
+            $data['permissions'] = $user->permissions;
+        }
+
+        $data = arrayLimitKeys($data, $limit);
+        return $data;
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        if ($user !== null) {
+            return ($user->hasPermission('admin/users') === true || strcasecmp($user->id, $model->id) === 0);
+        }
+
+        return false;
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model): bool
+    {
+        /** @var \App\Models\User */
+        $user = auth()->user();
+        return ($user !== null && $user->hasPermission('admin/users') === true);
+    }
+}

app/Console/Commands/CleanupTempFiles.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class CleanupTempFiles extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:cleanup-temp-files';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete temporary files that are older that 1 day';
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle(): void
+    {
+        $keepTime = (1 * 24 * 60 * 60); // 1 Day
+        $currentTimeStamp = time();
+        $deletedFileCount = 0;
+
+        foreach (glob(storage_path('app/tmp/*')) as $filename) {
+            $fileModifiedTimeStamp = filemtime($filename);
+            if (($currentTimeStamp - $fileModifiedTimeStamp) > $keepTime) {
+                unlink($filename);
+                $deletedFileCount++;
+            }
+        }
+
+        $this->comment('Deleted ' . $deletedFileCount . ' files');
+    }
+}

app/Console/Commands/RemoveStaleMediaJobs.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\MediaJob;
+use Illuminate\Console\Command;
+
+class RemoveStaleMediaJobs extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:remove-stale-media-jobs';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove media_jobs that have not been modified for 48 hours';
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle(): void
+    {
+        $threshold = now()->subHours(48);
+
+        $staleJobs = MediaJob::where('updated_at', '<=', $threshold)->get();
+
+        foreach ($staleJobs as $job) {
+            $job->delete();
+        }
+
+        $this->info(count($staleJobs) . ' stale media_jobs removed.');
+    }
+}

app/Console/Kernel.php

@@ -13,9 +13,11 @@ class Kernel extends ConsoleKernel
      * @param  \Illuminate\Console\Scheduling\Schedule $schedule The schedule.
      * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         // $schedule->command('inspire')->hourly();
+        $schedule->command('app:cleanup-temp-files')->everyThirtyMinutes();
+        $schedule->command('app:remove-stale-media-jobs')->everyThirtyMinutes();
     }
 
     /**
@@ -23,7 +25,7 @@ class Kernel extends ConsoleKernel
      *
      * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__ . '/Commands');
 

app/Enum/CurlErrorCodes.php

@@ -0,0 +1,169 @@
+<?php
+
+namespace App\Enum;
+
+class CurlErrorCodes extends Enum
+{
+    public const CURLE_UNSUPPORTED_PROTOCOL         = 1;
+    public const CURLE_FAILED_INIT                  = 2;
+    public const CURLE_URL_MALFORMAT                = 3;
+    public const CURLE_URL_MALFORMAT_USER           = 4;
+    public const CURLE_COULDNT_RESOLVE_PROXY        = 5;
+    public const CURLE_COULDNT_RESOLVE_HOST         = 6;
+    public const CURLE_COULDNT_CONNECT              = 7;
+    public const CURLE_FTP_WEIRD_SERVER_REPLY       = 8;
+    public const CURLE_REMOTE_ACCESS_DENIED         = 9;
+    public const CURLE_FTP_WEIRD_PASS_REPLY         = 11;
+    public const CURLE_FTP_WEIRD_PASV_REPLY         = 13;
+    public const CURLE_FTP_WEIRD_227_FORMAT         = 14;
+    public const CURLE_FTP_CANT_GET_HOST            = 15;
+    public const CURLE_FTP_COULDNT_SET_TYPE         = 17;
+    public const CURLE_PARTIAL_FILE                 = 18;
+    public const CURLE_FTP_COULDNT_RETR_FILE        = 19;
+    public const CURLE_QUOTE_ERROR                  = 21;
+    public const CURLE_HTTP_RETURNED_ERROR          = 22;
+    public const CURLE_WRITE_ERROR                  = 23;
+    public const CURLE_UPLOAD_FAILED                = 25;
+    public const CURLE_READ_ERROR                   = 26;
+    public const CURLE_OUT_OF_MEMORY                = 27;
+    public const CURLE_OPERATION_TIMEDOUT           = 28;
+    public const CURLE_FTP_PORT_FAILED              = 30;
+    public const CURLE_FTP_COULDNT_USE_REST         = 31;
+    public const CURLE_RANGE_ERROR                  = 33;
+    public const CURLE_HTTP_POST_ERROR              = 34;
+    public const CURLE_SSL_CONNECT_ERROR            = 35;
+    public const CURLE_BAD_DOWNLOAD_RESUME          = 36;
+    public const CURLE_FILE_COULDNT_READ_FILE       = 37;
+    public const CURLE_LDAP_CANNOT_BIND             = 38;
+    public const CURLE_LDAP_SEARCH_FAILED           = 39;
+    public const CURLE_FUNCTION_NOT_FOUND           = 41;
+    public const CURLE_ABORTED_BY_CALLBACK          = 42;
+    public const CURLE_BAD_FUNCTION_ARGUMENT        = 43;
+    public const CURLE_INTERFACE_FAILED             = 45;
+    public const CURLE_TOO_MANY_REDIRECTS           = 47;
+    public const CURLE_UNKNOWN_TELNET_OPTION        = 48;
+    public const CURLE_TELNET_OPTION_SYNTAX         = 49;
+    public const CURLE_PEER_FAILED_VERIFICATION     = 51;
+    public const CURLE_GOT_NOTHING                  = 52;
+    public const CURLE_SSL_ENGINE_NOTFOUND          = 53;
+    public const CURLE_SSL_ENGINE_SETFAILED         = 54;
+    public const CURLE_SEND_ERROR                   = 55;
+    public const CURLE_RECV_ERROR                   = 56;
+    public const CURLE_SSL_CERTPROBLEM              = 58;
+    public const CURLE_SSL_CIPHER                   = 59;
+    public const CURLE_SSL_CACERT                   = 60;
+    public const CURLE_BAD_CONTENT_ENCODING         = 61;
+    public const CURLE_LDAP_INVALID_URL             = 62;
+    public const CURLE_FILESIZE_EXCEEDED            = 63;
+    public const CURLE_USE_SSL_FAILED               = 64;
+    public const CURLE_SEND_FAIL_REWIND             = 65;
+    public const CURLE_SSL_ENGINE_INITFAILED        = 66;
+    public const CURLE_LOGIN_DENIED                 = 67;
+    public const CURLE_TFTP_NOTFOUND                = 68;
+    public const CURLE_TFTP_PERM                    = 69;
+    public const CURLE_REMOTE_DISK_FULL             = 70;
+    public const CURLE_TFTP_ILLEGAL                 = 71;
+    public const CURLE_TFTP_UNKNOWNID               = 72;
+    public const CURLE_REMOTE_FILE_EXISTS           = 73;
+    public const CURLE_TFTP_NOSUCHUSER              = 74;
+    public const CURLE_CONV_FAILED                  = 75;
+    public const CURLE_CONV_REQD                    = 76;
+    public const CURLE_SSL_CACERT_BADFILE           = 77;
+    public const CURLE_REMOTE_FILE_NOT_FOUND        = 78;
+    public const CURLE_SSH                          = 79;
+    public const CURLE_SSL_SHUTDOWN_FAILED          = 80;
+    public const CURLE_AGAIN                        = 81;
+    public const CURLE_SSL_CRL_BADFILE              = 82;
+    public const CURLE_SSL_ISSUER_ERROR             = 83;
+    public const CURLE_FTP_PRET_FAILED              = 84;
+    public const CURLE_RTSP_CSEQ_ERROR              = 85;
+    public const CURLE_RTSP_SESSION_ERROR           = 86;
+    public const CURLE_FTP_BAD_FILE_LIST            = 87;
+    public const CURLE_CHUNK_FAILED                 = 88;
+
+
+    /**
+     * Curl Error messages
+     * @var string[]
+     */
+    public static $messages = [
+        1 => 'Unsupported protocol.',
+        2 => 'Failed initalization.',
+        3 => 'Invalid URL format.',
+        4 => 'CURLE_URL_MALFORMAT_USER.',
+        5 => 'Could not resolve proxy.',
+        6 => 'Could not resolve host.',
+        7 => 'Could not connect to host.',
+        8 => 'Invalid reply from FTP server.',
+        9 => 'Access denied on host.',
+        11 => 'Invalid pass reply from FTP server.',
+        13 => 'Invalid pasv reply from FTP server.',
+        14 => 'Invalid 227 format from FTP server.',
+        15 => 'Could not get FTP host.',
+        17 => 'Could not set type for FTP transfer.',
+        18 => 'Invalid partial size.',
+        19 => 'Could not retrieve file from FTP server.',
+        21 => 'Quote error.',
+        22 => 'HTTP server returned error.',
+        23 => 'File write error.',
+        25 => 'Upload file error.',
+        26 => 'File read error.',
+        27 => 'Out of memory.',
+        28 => 'File transfer timed out.',
+        30 => 'Invalid port for FTP server.',
+        31 => 'Could not use rest for FTP server.',
+        33 => 'File range error.',
+        34 => 'Invalid POST for HTTP server.',
+        35 => 'SSL connectio error.',
+        36 => 'Invalid resume download.',
+        37 => 'Could not read file.',
+        38 => 'Could not bind to LDAP.',
+        39 => 'LDAP search failed.',
+        41 => 'Function not found.',
+        42 => 'Aborted by callback.',
+        43 => 'Bad function argument.',
+        45 => 'Interface failed.',
+        47 => 'Too many redirects.',
+        48 => 'Unknown telnet option.',
+        49 => 'Telnet option syntax invalid.',
+        51 => 'Peer failed verification.',
+        52 => 'Did not receive any data.',
+        53 => 'SSL engine was not found.',
+        54 => 'SSL engine failed.',
+        55 => 'Send data error.',
+        56 => 'Receive data error.',
+        58 => 'SSL certificate error.',
+        59 => 'SSL cipher error.',
+        60 => 'SSL CACertificate failed.',
+        61 => 'Invalid content encoding.',
+        62 => 'Invalid LDAP url.',
+        63 => 'Filesize exceeded.',
+        64 => 'SSL Failed.',
+        65 => 'CURLE_SEND_FAIL_REWIND.',
+        66 => 'SSL engine initalization failed.',
+        67 => 'CURLE_LOGIN_DENIED.',
+        68 => 'CURLE_TFTP_NOTFOUND.',
+        69 => 'CURLE_TFTP_PERM.',
+        70 => 'CURLE_REMOTE_DISK_FULL.',
+        71 => 'CURLE_TFTP_ILLEGAL.',
+        72 => 'CURLE_TFTP_UNKNOWNID.',
+        73 => 'Remote file already exists.',
+        74 => 'No such user on FTP server.',
+        75 => 'Conversion failed.',
+        76 => 'Conversion required.',
+        77 => 'SSL CACertificate bad file.',
+        78 => 'Remove file not found.',
+        79 => 'SSH error.',
+        80 => 'SSL Shutdown failed.',
+        81 => 'Again.',
+        82 => 'SSL bad CRL file.',
+        83 => 'SSL issuer error.',
+        84 => 'FTP pret failed.',
+        85 => 'CURLE_RTSP_CSEQ_ERROR.',
+        86 => 'CURLE_RTSP_SESSION_ERROR.',
+        87 => 'CURLE_FTP_BAD_FILE_LIST.',
+        88 => 'CURLE_CHUNK_FAILED.',
+
+
+    ];
+}

app/Enum/Enum.php

@@ -6,6 +6,13 @@ use ReflectionClass;
 
 class Enum
 {
+    /**
+     * Message list
+     *
+     * @var array<string<static>>
+     */
+    public static $messages = [];
+
     /**
      * Caches reflections of enum subclasses.
      *
@@ -47,4 +54,20 @@ class Enum
     {
         return array_values(static::getReflection()->getConstants());
     }
+
+    /**
+     * Returns a message from the enum subclass
+     *
+     * @param integer $messageIndex   The message index to retrieve.
+     * @param string  $defaultMessage Message to use if index does not exist.
+     * @return string
+     */
+    public static function getMessage(int $messageIndex, string $defaultMessage = 'Unknown'): string
+    {
+        if (array_key_exists($messageIndex, self::$messages) === true) {
+            return self::$messages[$messageIndex];
+        }
+
+        return $defaultMessage;
+    }
 }

app/Exceptions/Handler.php

@@ -2,34 +2,18 @@
 
 namespace App\Exceptions;
 
-use App\Enum\HttpResponseCodes;
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
 use PDOException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of exception types with their corresponding custom log levels.
-     *
-     * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
-     */
-    protected $levels = [
-        //
-    ];
-
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array<int, class-string<\Throwable>>
-     */
-    protected $dontReport = [
-        //
-    ];
-
     /**
      * A list of the inputs that are never flashed to the session on validation exceptions.
      *
@@ -47,7 +31,7 @@ class Handler extends ExceptionHandler
      *
      * @return void
      */
-    public function register()
+    public function register(): void
     {
         // $this->renderable(function (HttpException $e, $request) {
         //     if ($request->is('api/*')) {
@@ -79,7 +63,36 @@ class Handler extends ExceptionHandler
         });
 
         $this->reportable(function (Throwable $e) {
-            //
+            if ($this->shouldReport($e) === true) {
+                if (App::runningUnitTests() === false) {
+                    $this->sendEmail($e);
+                }
+            }
         });
     }
+
+    /**
+     * Send email
+     *
+     * @param Throwable $exception Throwable object.
+     * @return void
+     */
+    public function sendEmail(Throwable $exception)
+    {
+        try {
+            $e = FlattenException::createFromThrowable($exception);
+            $handler = new HtmlErrorRenderer(true);
+            $css = $handler->getStylesheet();
+            $content = $handler->getBody($e);
+
+            Mail::send('emails.exception', compact('css', 'content'), function ($message) {
+                $message
+                ->to('webmaster@stemmechanics.com.au')
+                ->subject('Exception Generated')
+                ;
+            });
+        } catch (Throwable $ex) {
+            Log::error($ex);
+        }
+    }
 }

app/Filters/AuditFilter.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use Illuminate\Support\Collection;
-
-class AuditFilter
-{
-    // public static function filter(Collection $collection): array
-    // {
-    //     $collection->transform(function ($item, $key) {
-    //         $row = $item->toArray();
-
-    //         unset($row['user_type']);
-    //         unset($row['auditable_type']);
-
-    //         if (array_key_exists('password', $row['old_values'])) {
-    //             $row['old_values']['password'] = '###';
-    //         }
-    //         if (array_key_exists('password', $row['new_values'])) {
-    //             $row['new_values']['password'] = '###';
-    //         }
-
-    //         return $row;
-    //     });
-
-    //     return $collection->toArray();
-    // }
-}

app/Filters/EventFilter.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\Event;
-use Carbon\Carbon;
-use Illuminate\Contracts\Database\Eloquent\Builder;
-
-class EventFilter extends FilterAbstract
-{
-    /**
-     * Class name of Model
-     * @var string
-     */
-    protected $class = '\App\Models\Event';
-
-    /**
-     * Default column sorting (prefix with - for descending)
-     *
-     * @var string|array
-     */
-    protected $defaultSort = '-start_at';
-
-    /**
-     * Filter columns for q param
-     *
-     * @var string|array
-     */
-    protected $q = [
-        '_' => ['title','content'],
-        'location' => ['location','address'],
-    ];
-
-
-    /**
-     * Determine if the user can view the media model
-     *
-     * @param Event $event The event instance.
-     * @param mixed $user  The current logged in user.
-     * @return boolean
-     */
-    protected function viewable(Event $event, mixed $user)
-    {
-        return (strcasecmp($event->status, 'draft') !== 0 && $event->publish_at <= now())
-            || $user?->hasPermission('admin/events') === true;
-    }
-
-    /**
-     * Determine the prebuild query to limit results
-     *
-     * @param EloquentBuilder $builder The builder instance.
-     * @param mixed           $user    The current logged in user.
-     * @return EloquentBuilder|null
-     */
-    protected function prebuild(Builder $builder, mixed $user)
-    {
-        if (
-            $user?->hasPermission('admin/events') !== true
-        ) {
-            return $builder
-                ->where('status', '!=', 'draft')
-                ->where('publish_at', '<=', now());
-        }
-    }
-}

app/Filters/FilterAbstract.php

@@ -1,596 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Schema\SchemaException;
-use ReflectionClass;
-use RuntimeException;
-use InvalidArgumentException;
-use Illuminate\Http\Request;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-use Schema;
-
-abstract class FilterAbstract
-{
-    /**
-     * The model class to filter
-     *
-     * @var mixed
-     */
-    protected $class;
-
-    /**
-     * The filter request
-     *
-     * @var \Illuminate\Http\Request
-     */
-    protected $request;
-
-    /**
-     * The models table
-     *
-     * @var string
-     */
-    protected $table = '';
-
-    /**
-     * Array of columns that can be filtered by the api
-     *
-     * @var array
-     */
-    protected $filterable = null;
-
-    /**
-     * Default column sorting (prefix with - for descending)
-     *
-     * @var string|array
-     */
-    protected $defaultSort = 'id';
-
-    /**
-     * Default collection result limit
-     *
-     * @var integer
-     */
-    protected $defaultLimit = 50;
-
-    /**
-     * Found records from query
-     * @var integer
-     */
-    protected $foundTotal = 0;
-
-    /**
-     * Maximum collection result limit
-     *
-     * @var integer
-     */
-    protected $maxLimit = 100;
-
-    /**
-     * Only return these attributes in the results
-     * (minus any excludes)
-     *
-     * @var array
-     */
-    protected $only = [];
-
-    /**
-     * Exclude these attributes from the results
-     *
-     * @var array
-     */
-    protected $exclude = [];
-
-    /**
-     * Filter columns for q param
-     *
-     * @var string|array
-     */
-    protected $q = [];
-
-
-    /**
-     * Filter constructor.
-     *
-     * @param \Illuminate\Http\Request $request Request object.
-     */
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * Only include the specified attributes in the results.
-     *
-     * @param string|array $only Only return these attributes.
-     * @return void
-     */
-    public function only(mixed $only)
-    {
-        if (is_array($only) === true) {
-            $this->only = $only;
-        } else {
-            $this->only = [$only];
-        }
-    }
-
-    /**
-     * Exclude the specified attributes in the results.
-     *
-     * @param string|array $exclude Attributes to exclude.
-     * @return void
-     */
-    public function exclude(mixed $exclude)
-    {
-        if (is_array($exclude) === true) {
-            $this->exclude = $exclude;
-        } else {
-            $this->exclude = [$exclude];
-        }
-    }
-
-    /**
-     * Check if the model is viewable by the user
-     *
-     * @param mixed $model Model instance.
-     * @param mixed $user  Current user.
-     * @return boolean
-     */
-    // protected function viewable(mixed $model, mixed $user)
-    // {
-    //     return true;
-    // }
-
-    /**
-     * Prepend action to the builder to limit the results
-     *
-     * @param Builder $builder Builder instance.
-     * @param mixed   $user    Current user.
-     * @return Builder|null
-     */
-    // protected function prebuild(Builder $builder, mixed $user)
-    // {
-    //     return $builder;
-    // }
-
-
-    /**
-     * Return an array of attributes visible in the results
-     *
-     * @param array     $attributes Attributes currently visible.
-     * @param User|null $user       Current logged in user or null.
-     * @return mixed
-     */
-    protected function seeAttributes(array $attributes, mixed $user)
-    {
-        return $attributes;
-    }
-
-    /**
-     * Apply all the requested filters if available.
-     *
-     * @param Model $model Model object to filter. If null create query.
-     * @return Builder|Model
-     */
-    public function filter(Model $model = null)
-    {
-        $this->foundTotal = 0;
-
-        $builder = $this->class::query();
-
-        /* Get the related model */
-        $classModel = $model;
-        if ($model === null) {
-            $classModel = $builder->getModel();
-        }
-
-        /* Get table name */
-        if ($this->table === '') {
-            if ($model === null) {
-                $this->table = $classModel->getTable();
-            } else {
-                $this->table = $model->getTable();
-            }
-        }
-
-        /* Run query prebuilder or viewable */
-        if ($model === null) {
-            if (method_exists($this, 'prebuild') === true) {
-                $prebuilder = $this->prebuild($builder, $this->request->user());
-                if ($prebuilder instanceof Builder) {
-                    $builder = $prebuilder;
-                }
-            }
-        } else {
-            if (method_exists($this, 'viewable') === true) {
-                if ($this->viewable($model, $this->request->user()) === false) {
-                    return null;
-                }
-            }
-        }
-
-        /* Get attributes from table or use 'only' */
-        $attributes = [];
-        if (is_array($this->only) === true && count($this->only) > 0) {
-            $attributes = $this->only;
-        } else {
-            $attributes = Schema::getColumnListing($this->table);
-        }
-
-        /* Run attribute modifiers*/
-        $modifiedAttribs = $this->seeAttributes($attributes, $this->request->user());
-        if (is_array($modifiedAttribs) === true) {
-            $attributes = $modifiedAttribs;
-        }
-
-        foreach ($attributes as $key => $column) {
-            $method = 'see' . Str::studly($column) . 'Attribute';
-            if (
-                method_exists($this, $method) === true &&
-                $this->$method($this->request->user()) === false
-            ) {
-                unset($attributes[$key]);
-            }
-        }
-
-        if (is_array($this->exclude) === true && count($this->exclude) > 0) {
-            $attributes = array_diff($attributes, $this->exclude);
-        }
-
-        /* Setup attributes and appends */
-        // $attributesAppends = array_merge($attributes, $classModel->getAppends());
-
-        /* Apply ?fields= request to attributes */
-        if ($this->request->has('fields') === true) {
-            $attributes = array_intersect($attributes, explode(',', $this->request->fields));
-        }
-
-        /* Hide remaining attributes in model (if present) and return */
-        if ($model !== null) {
-            // TODO: Also show $this->request->fields that are appends
-
-            $model->makeHidden(array_diff(Schema::getColumnListing($this->table), $attributes));
-            return $model;
-        }
-
-        /* Are there attributes left? */
-        if (count($attributes) === 0) {
-            $this->foundTotal = 0;
-            return new Collection();
-        }
-
-        /* apply select! */
-        $builder->select($attributes);
-
-        /* Setup filterables if not present */
-        if ($this->filterable === null) {
-            $this->filterable = $attributes;
-        }
-
-        /* Filter values */
-        $filterRequest = array_filter($this->request->only(array_intersect($attributes, $this->filterable)));
-        $this->builderArrayFilter($builder, $filterRequest);
-
-        if (is_array($this->q) === true && count($this->q) > 0) {
-            $qQueries = [];
-            foreach ($this->q as $key => $value) {
-                if (is_array($value) === true) {
-                    $qKey = $key === '_' ? '' : $key;
-                    foreach ($value as $subvalue) {
-                        $qQueries[$key][$subvalue] = $this->request->get("q" . $qKey);
-                    }
-                } elseif ($this->request->has("q") === true) {
-                    $qQueries['_'][$value] = $this->request->get("q");
-                }
-            }
-
-            foreach ($qQueries as $key => $value) {
-                $builder->where(function ($query) use ($value) {
-                    $this->builderArrayFilter($query, $value, 'or');
-                });
-            }
-        }//end if
-
-        /* Apply sorting */
-        $sortList = $this->defaultSort;
-        if ($this->request->has('sort') === true) {
-            $sortList = explode(',', $this->request->sort);
-        }
-
-        /* Transform sort list to array */
-        if (is_array($sortList) === false) {
-            if (strlen($sortList) > 0) {
-                $sortList = [$sortList];
-            } else {
-                $sortList = [];
-            }
-        }
-
-        /* Remove non-viewable attributes from sort list */
-        if (count($sortList) > 0) {
-            $sortList = array_filter($sortList, function ($item) use ($attributes) {
-                $parsedItem = $item;
-                if (substr($parsedItem, 0, 1) === '-') {
-                    $parsedItem = substr($parsedItem, 1);
-                }
-
-                return in_array($parsedItem, $attributes);
-            });
-        }
-
-        /* Do we have any sort element left? */
-        if (count($sortList) > 0) {
-            foreach ($sortList as $sortAttribute) {
-                $prefix = substr($sortAttribute, 0, 1);
-                $direction = 'asc';
-
-                if (in_array($prefix, ['-', '+']) === true) {
-                    $sortAttribute = substr($sortAttribute, 1);
-                    if ($prefix === '-') {
-                        $direction = 'desc';
-                    }
-                }
-
-                $builder->orderBy($sortAttribute, $direction);
-            }//end foreach
-        }//end if
-
-        /* save found count */
-        $this->foundTotal = $builder->count();
-
-        /* Apply result limit */
-        $limit = $this->defaultLimit;
-        if ($this->request->has('limit') === true) {
-            $limit = intval($this->request->limit);
-        }
-        if ($limit < 1) {
-            $limit = 1;
-        }
-        if ($limit > $this->maxLimit && $this->maxLimit !== 0) {
-            $limit = $this->maxLimit;
-        }
-
-        $builder->limit($limit);
-
-        /* Apply page offset */
-        if ($this->request->has('page') === true) {
-            $page = intval($this->request->page);
-            if ($page < 1) {
-                $page = 1;
-            }
-
-            $builder->offset((intval($this->request->page) - 1) * $limit);
-        }
-
-        /* run spot run */
-        $collection = $builder->get();
-
-        return $collection;
-    }
-
-    /**
-     * Filter content based on the filterRequest
-     * @param mixed  $builder        Builder object
-     * @param array  $filterRequest  Filter key/value
-     * @param string $defaultBoolean Default where boolean
-     * @return void
-     */
-    protected function builderArrayFilter(mixed $builder, array $filterRequest, string $defaultBoolean = 'and')
-    {
-        foreach ($filterRequest as $filterAttribute => $filterValue) {
-            $tags = [];
-            $boolean = $defaultBoolean;
-
-            $matches = preg_split('/(?<!\\\\)"/', $filterValue, -1, PREG_SPLIT_OFFSET_CAPTURE);
-            foreach ($matches as $idx => $match_info) {
-                if (($idx % 2) === true) {
-                    if (substr($filterValue, ($match_info[1] - 2), 1) === ',') {
-                        $tags[] = ['operator' => '', 'tag' => stripslashes(trim($match_info[0]))];
-                    } else {
-                        $tags[(count($tags) - 1)]['tag'] .= stripslashes(trim($match_info[0]));
-                    }
-                } else {
-                    $innerTags = [$match_info[0]];
-                    if (strpos($match_info[0], ',') !== false) {
-                        $innerTags = preg_split('/(?<!\\\\),/', $match_info[0]);
-                    }
-
-                    foreach ($innerTags as $tag) {
-                        $tag = stripslashes(trim($tag));
-                        if (strlen($tag) > 0) {
-                            $operator = '=';
-
-                            $single = substr($tag, 0, 1);
-                            $double = substr($tag . ' ', 0, 2); // add empty space incase len $tag < 2
-
-                            // check for operators at start
-                            if (in_array($double, ['!=', '<>', '><', '>=', '<=', '=>', '=<']) === true) {
-                                if ($double === '<>' || $double === '><') {
-                                    $double = '!=';
-                                } elseif ($double === '=>') {
-                                    $double = '>=';
-                                } elseif ($double === '=<') {
-                                    $double == '>=';
-                                }
-
-                                $operator = $double;
-                                $tag = substr($tag, 2);
-                            } else {
-                                if (in_array($single, ['=', '!', '>', '<', '~', '%']) === true) {
-                                    if ($single === '=') {
-                                        $single = '=='; // a single '=' is actually a double '=='
-                                    }
-
-                                    $operator = $single;
-                                    $tag = substr($tag, 1);
-                                }
-                            }//end if
-
-                            $tags[] = ['operator' => $operator, 'tag' => $tag];
-                        }//end if
-                    }//end foreach
-                }//end if
-            }//end foreach
-
-            if (count($tags) > 1) {
-                $boolean = 'or';
-            }
-
-            foreach ($tags as $tag_data) {
-                $operator = $tag_data['operator'];
-                $value = $tag_data['tag'];
-                $table = $this->table;
-                $column = $filterAttribute;
-
-                if (($dotPos = strpos($filterAttribute, '.')) !== false) {
-                    $table = substr($filterAttribute, 0, $dotPos);
-                    $column = substr($filterAttribute, ($dotPos + 1));
-                }
-
-                $columnType = DB::getSchemaBuilder()->getColumnType($table, $column);
-
-                if (
-                    in_array($columnType, ['tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint',
-                        'decimal', 'float', 'double', 'real', 'double precision'
-                    ]) === true
-                ) {
-                    if (in_array($operator, ['=', '>', '<', '>=', '<=', '%', '!']) === false) {
-                        continue;
-                    }
-
-                    $columnType = 'numeric';
-                } elseif (in_array($columnType, ['date', 'time', 'datetime', 'timestamp', 'year']) === true) {
-                    if (in_array($operator, ['=', '>', '<', '>=', '<=', '!']) === false) {
-                        continue;
-                    }
-
-                    $columnType = 'datetime';
-                } elseif (
-                    in_array($columnType, ['string', 'char', 'varchar', 'timeblob', 'blob', 'mediumblob',
-                        'longblob', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum'
-                    ]) === true
-                ) {
-                    if (in_array($operator, ['=', '==', '!', '!=', '~']) === false) {
-                        continue;
-                    }
-
-                    $columnType = 'text';
-
-                    if ($value === "''" || $value === '""') {
-                        $value = '';
-                    } elseif (strcasecmp($value, 'null') !== 0) {
-                        if ($operator === '!') {
-                            $operator = 'NOT LIKE';
-                            $value = '%' . $value . '%';
-                        } elseif ($operator === '=') {
-                            $operator = 'LIKE';
-                            $value = '%' . $value . '%';
-                        } elseif ($operator === '~') {
-                            $operator = 'SOUNDS LIKE';
-                        } elseif ($operator === '==') {
-                            $operator = '=';
-                        }
-                    }
-                } elseif ($columnType === 'boolean') {
-                    if (in_array($operator, ['=', '!']) === false) {
-                        continue;
-                    }
-
-                    if (strtolower($value) === 'true') {
-                        $value = 1;
-                    } elseif (strtolower($value) === 'false') {
-                        $value = 0;
-                    }
-                }//end if
-
-                $betweenSeperator = strpos($value, '<>');
-                if (
-                    $operator === '=' && $betweenSeperator !== false && in_array($columnType, ['numeric',
-                        'datetime'
-                    ]) === true
-                ) {
-                    $value = explode('<>', $value);
-                    $operator = '<>';
-                }
-
-                if ($operator !== '') {
-                    $this->builderWhere($builder, $table, $column, $operator, $value, $boolean);
-                }
-            }//end foreach
-        }//end foreach
-    }
-
-    /**
-     * Insert a where statement into the builder, taking the filter map into consideration
-     *
-     * @param Builder $builder  Builder instance.
-     * @param string  $table    Table name.
-     * @param string  $column   Column name.
-     * @param string  $operator Where operator.
-     * @param mixed   $value    Value to test.
-     * @param string  $boolean  Use Or comparison.
-     * @return void
-     * @throws RuntimeException Error applying statement.
-     * @throws InvalidArgumentException Error applying statement.
-     */
-    protected function builderWhere(
-        Builder &$builder,
-        string $table,
-        string $column,
-        string $operator,
-        mixed $value,
-        string $boolean
-    ) {
-        if (
-            (is_string($value) === true && $operator !== '<>') || (is_array($value) === true && count($value) === 2 &&
-            $operator === '<>')
-        ) {
-            if ($table !== '' && $table !== $this->table) {
-                $builder->whereHas($table, function ($query) use ($column, $operator, $value, $boolean) {
-                    if ($operator !== '<>') {
-                        if (strcasecmp($value, 'null') === 0) {
-                            if ($operator === '!') {
-                                $query->whereNotNull($column, $boolean);
-                            } else {
-                                $query->whereNull($column, $boolean);
-                            }
-                        } else {
-                            $query->where($column, $operator, $value, $boolean);
-                        }
-                    } else {
-                        $query->whereBetween($column, $value, $boolean);
-                    }
-                });
-            } else {
-                if ($operator !== '<>') {
-                    if (strcasecmp($value, 'null') === 0) {
-                        if ($operator === '!') {
-                            $builder->whereNotNull($column, $boolean);
-                        } else {
-                            $builder->whereNull($column, $boolean);
-                        }
-                    } else {
-                        $builder->where($column, $operator, $value, $boolean);
-                    }
-                } else {
-                    $builder->whereBetween($column, $value, $boolean);
-                }
-            }//end if
-        }//end if
-    }
-
-    /**
-     * Return the found total of items
-     * @return integer
-     */
-    public function foundTotal()
-    {
-        return $this->foundTotal;
-    }
-}

app/Filters/MediaFilter.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\Media;
-use Illuminate\Contracts\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-
-class MediaFilter extends FilterAbstract
-{
-    /**
-     * Class name of Model
-     * @var string
-     */
-    protected $class = '\App\Models\Media';
-
-
-    /**
-     * Determine if the user can view the media model
-     *
-     * @param Media $media The media instance.
-     * @param mixed $user  The current logged in user.
-     * @return boolean
-     */
-    protected function viewable(Media $media, mixed $user)
-    {
-        if (empty($media->permission) === false) {
-            return ($user?->hasPermission('admin/media') || $user?->hasPermission($media->permission));
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine the prebuild query to limit results
-     *
-     * @param EloquentBuilder $builder The builder instance.
-     * @param mixed           $user    The current logged in user.
-     * @return EloquentBuilder|null
-     */
-    protected function prebuild(Builder $builder, mixed $user)
-    {
-        if ($user === null) {
-            return $builder->whereNull('permission');
-        }
-    }
-
-    /**
-     * Show the permission attribute in the results
-     *
-     * @param User|null $user Current logged in user or null.
-     * @return boolean
-     */
-    protected function seePermissionAttribute(mixed $user)
-    {
-        return ($user?->hasPermission('admin/media'));
-    }
-}

app/Filters/PostFilter.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\Post;
-use Carbon\Carbon;
-use Illuminate\Contracts\Database\Eloquent\Builder;
-
-class PostFilter extends FilterAbstract
-{
-    /**
-     * Class name of Model
-     * @var string
-     */
-    protected $class = '\App\Models\Post';
-
-    /**
-     * Default column sorting (prefix with - for descending)
-     *
-     * @var string|array
-     */
-    protected $defaultSort = '-publish_at';
-
-
-    /**
-     * Determine if the user can view the media model
-     *
-     * @param Post  $post The post instance.
-     * @param mixed $user The current logged in user.
-     * @return boolean
-     */
-    protected function viewable(Post $post, mixed $user)
-    {
-        if ($user?->hasPermission('admin/posts') !== true) {
-            return ($post->publish_at <= now());
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine the prebuild query to limit results
-     *
-     * @param EloquentBuilder $builder The builder instance.
-     * @param mixed           $user    The current logged in user.
-     * @return EloquentBuilder|null
-     */
-    protected function prebuild(Builder $builder, mixed $user)
-    {
-        if ($user?->hasPermission('admin/posts') !== true) {
-            return $builder->where('publish_at', '<=', Carbon::now());
-        }
-    }
-}

app/Filters/SubscriptionFilter.php

@@ -11,7 +11,7 @@ class SubscriptionFilter extends FilterAbstract
      *
      * @var mixed
      */
-    protected $class = '\App\Models\Subscription';
+    protected $class = \App\Models\Subscription::class;
 
 
     /**

app/Filters/UserFilter.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\User;
-
-class UserFilter extends FilterAbstract
-{
-    /**
-     * The model class to filter
-     *
-     * @var mixed
-     */
-    protected $class = '\App\Models\User';
-
-
-    /**
-     * Return an array of attributes visible in the results
-     *
-     * @param array     $attributes Attributes currently visible.
-     * @param User|null $user       Current logged in user or null.
-     * @return mixed
-     */
-    protected function seeAttributes(array $attributes, mixed $user)
-    {
-        if ($user?->hasPermission('admin/users') !== true) {
-            return ['id', 'username'];
-        }
-    }
-}

app/Helpers/Array.php

@@ -0,0 +1,78 @@
+<?php
+
+/* Array Helper Functions */
+
+
+/**
+ * Remove an item from an array.
+ *
+ * @param array        $arr  The array to check.
+ * @param string|array $item The item or items to remove.
+ * @return array The filtered array.
+ */
+function arrayRemoveItem(array $arr, string|array $item): array
+{
+    $filteredArr = $arr;
+
+    if (is_string($item) === true) {
+        $item = [$item];
+    }
+
+    foreach ($item as $str) {
+        $filteredArr = array_filter($arr, function ($item) use ($str) {
+            return $item !== $str;
+        });
+    }
+
+    return $filteredArr;
+}
+
+/**
+ * Return an array with specified the keys
+ *
+ * @param array        $arr  The array to filter.
+ * @param string|array $keys The keys to keep.
+ * @return array The filtered array.
+ */
+function arrayLimitKeys(array $arr, array $keys): array
+{
+    return array_intersect_key($arr, array_flip($keys));
+}
+
+/**
+ * Return an array value or default value if it does not exist
+ *
+ * @param string $key   The key value to return if exists.
+ * @param array  $arr   The array to check.
+ * @param mixed  $value The value to return if key does not exist.
+ * @return mixed
+ */
+function arrayDefaultValue(string $key, array $arr, mixed $value): mixed
+{
+    if (array_key_exists($key, $arr) === true) {
+        return $arr[$key];
+    }
+
+    return $value;
+}
+
+/**
+ * Return if an item exists in an array, case insensitive
+ *
+ * @param string $val The value to check.
+ * @param array  $arr The array to check.
+ * @return boolean
+ */
+function existsInArray(string $val, array $arr): bool
+{
+    $exists = false;
+
+    foreach ($arr as $el) {
+        if (strcasecmp($val, $el) === 0) {
+            $exists = true;
+            break;
+        }
+    }
+
+    return $exists;
+}

app/Helpers/Temp.php

@@ -0,0 +1,92 @@
+<?php
+
+/* Temp File Helper Functions */
+
+
+/**
+ * Generate a temporary file path.
+ *
+ * @param string $extension The file extension to use.
+ * @param string $part      The file part number.
+ * @return string The filtered array.
+ */
+function generateTempFilePath(string $extension = '', string $part = ''): string
+{
+    $temporaryDir = storage_path('app/tmp');
+    if (is_dir($temporaryDir) === false) {
+        mkdir($temporaryDir, 0777, true);
+    }
+
+    return $temporaryDir . DIRECTORY_SEPARATOR . uniqid('upload_', true) . ($extension !== '' ? ".{$extension}" : '') .
+    ($part !== '' ? ".part-{$part}" : '');
+}
+
+/**
+ * Get Temp file information
+ *
+ * @param string $filePath The temp file name.
+ * @return array The temp file name details.
+ */
+function tempFileInfo(string $filePath): array
+{
+    $part = '';
+
+    // Extract the part if it's present
+    if (preg_match('/\.part-(\d+)$/', $filePath, $matches) !== false) {
+        $part = $matches[1];
+        $filePath = substr($filePath, 0, -strlen($matches[0]));
+    }
+
+    $info = pathinfo($filePath);
+
+    $directory = $info['dirname'];
+    $name = $info['filename'];
+    $extension = '';
+
+    // If there's an extension, separate it
+    if (isset($info['extension']) === true) {
+        $extension = $info['extension'];
+    }
+
+    return [
+        'dirname' => $directory,
+        'basename' => $name . ($extension !== '' ? ".{$extension}" : ''),
+        'filename' => $name,
+        'extension' => $extension,
+        'part' => $part,
+    ];
+}
+
+/**
+ * Check a temporary file exists.
+ *
+ * @param string $dir       The file parent directory.
+ * @param string $name      The file name.
+ * @param string $extension The file extension to use.
+ * @param string $part      The file part number.
+ * @return boolean If the file exists.
+ */
+function tempFileExists(string $dir, string $name, string $extension = '', string $part = ''): bool
+{
+    $filename = constructTempFileName($dir, $name, $extension, $part);
+    $exists = file_exists($filename);
+
+    return $exists;
+}
+
+/**
+ * Construct the temp file name based on the information
+ *
+ * @param string $dir       The file parent directory.
+ * @param string $name      The file name.
+ * @param string $extension The file extension to use.
+ * @param string $part      The file part number.
+ * @return string The file path.
+ */
+function constructTempFileName(string $dir, string $name, string $extension = '', string $part = ''): string
+{
+    $filename = $dir . DIRECTORY_SEPARATOR . $name . ($extension !== '' ? ".{$extension}" : '') .
+    ($part !== "" ? ".part-{$part}" : '');
+
+    return $filename;
+}

app/Helpers/TypeValue.php

@@ -0,0 +1,27 @@
+<?php
+
+/* Type Value Helper Functions */
+
+
+/**
+ * Is value true
+ *
+ * @param mixed $value Value to check.
+ * @return boolean
+ */
+function isTrue(mixed $value): bool
+{
+    if (is_bool($value) === true && $value === true) {
+        return true;
+    }
+
+    if (is_numeric($value) === true && intval($value) === 1) {
+        return true;
+    }
+
+    if (is_string($value) === true && in_array(strtolower($value), ['true', '1'], true) === true) {
+        return true;
+    }
+
+    return false;
+}

app/Http/Controllers/Api/AnalyticsController.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\AnalyticsConductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\AnalyticsRequest;
+use App\Models\AnalyticsItemRequest;
+use App\Models\AnalyticsSession;
+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) {
+            $request->rename([
+                'type' => 'requests.type',
+                'path' => 'requests.path'
+            ]);
+
+            list($collection, $total) = AnalyticsConductor::request($request);
+
+            return $this->respondAsResource(
+                $collection,
+                ['resourceName' => 'session',
+                    '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\AnalyticsSession $session The analytics session.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, AnalyticsSession $session)
+    {
+        if ($request->user() !== null && $request->user()?->hasPermission('admin/analytics') === true) {
+            $session->load(['requests' => function ($query) {
+                $query->select('session_id', 'type', 'path', 'created_at');
+            }
+            ]);
+
+            foreach ($session->requests as $requestItem) {
+                $requestItem->makeHidden('session_id');
+            }
+
+            return $this->respondAsResource(
+                $session,
+                ['resourceName' => 'session']
+            );
+        }
+
+        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'),
+                'path' => $request->input('path', ''),
+                'useragent' => $request->userAgent(),
+                'ip' => $request->ip()
+            ];
+
+            if (
+                $user !== null &&
+                $user->hasPermission('admin/analytics') === true &&
+                $request->has('session') === true
+            ) {
+                $data['session_id'] = $request->input('session_id');
+                $analytics = AnalyticsItemRequest::create($data);
+            } else {
+                $analytics = AnalyticsItemRequest::create($data);
+            }
+
+            return $this->respondAsResource(
+                AnalyticsConductor::model($request, $analytics),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
+        } else {
+            return $this->respondForbidden();
+        }//end if
+    }
+}

app/Http/Controllers/Api/ApiController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use Illuminate\Http\JsonResponse;
 use App\Enum\HttpResponseCodes;
 use App\Http\Controllers\Controller;
 use Illuminate\Database\Eloquent\Model;
@@ -23,10 +24,13 @@ class ApiController extends Controller
      * @param array   $data        Response data.
      * @param integer $respondCode Response status code.
      * @param array   $headers     Response headers.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondJson(array $data, int $respondCode = HttpResponseCodes::HTTP_OK, array $headers = [])
+    public function respondJson(
-    {
+        array $data,
+        int $respondCode = HttpResponseCodes::HTTP_OK,
+        array $headers = []
+    ): JsonResponse {
         return response()->json($data, $respondCode, $headers);
     }
 
@@ -34,10 +38,11 @@ class ApiController extends Controller
      * Return forbidden message
      *
      * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondForbidden(string $message = 'You do not have permission to access the resource.')
+    public function respondForbidden(
-    {
+        string $message = 'You do not have permission to access the resource.'
+    ): JsonResponse {
         return response()->json(['message' => $message], HttpResponseCodes::HTTP_FORBIDDEN);
     }
 
@@ -45,9 +50,9 @@ class ApiController extends Controller
      * Return forbidden message
      *
      * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondNotFound(string $message = 'The resource was not found.')
+    public function respondNotFound(string $message = 'The resource was not found.'): JsonResponse
     {
         return response()->json(['message' => $message], HttpResponseCodes::HTTP_NOT_FOUND);
     }
@@ -56,40 +61,74 @@ class ApiController extends Controller
      * Return too large message
      *
      * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondTooLarge(string $message = 'The request entity is too large.')
+    public function respondTooLarge(string $message = 'The request entity is too large.'): JsonResponse
     {
         return response()->json(['message' => $message], HttpResponseCodes::HTTP_REQUEST_ENTITY_TOO_LARGE);
     }
 
     /**
-     * Return no content
+     * Return no content.
-     * @return \Illuminate\Http\JsonResponse
+     *
+     * @return JsonResponse
      */
-    public function respondNoContent()
+    public function respondNoContent(): JsonResponse
     {
         return response()->json([], HttpResponseCodes::HTTP_NO_CONTENT);
     }
 
     /**
-     * Return created
+     * Return no content
-     * @return \Illuminate\Http\JsonResponse
+     *
+     * @return JsonResponse
      */
-    public function respondCreated()
+    public function respondNotImplemented(): JsonResponse
+    {
+        return response()->json([], HttpResponseCodes::HTTP_NOT_IMPLEMENTED);
+    }
+
+    /**
+     * Return created.
+     *
+     * @return JsonResponse
+     */
+    public function respondCreated(): JsonResponse
     {
         return response()->json([], HttpResponseCodes::HTTP_CREATED);
     }
 
+    /**
+     * Return accepted.
+     *
+     * @return JsonResponse
+     */
+    public function respondAccepted(): JsonResponse
+    {
+        return response()->json([], HttpResponseCodes::HTTP_ACCEPTED);
+    }
+
+    /**
+     * Return server error.
+     *
+     * @return JsonResponse
+     */
+    public function respondServerError(): JsonResponse
+    {
+        return response()->json([], HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR);
+    }
+
     /**
      * Return single error message
      *
      * @param string  $message      Error message.
      * @param integer $responseCode Resource code.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondError(string $message, int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY)
+    public function respondError(
-    {
+        string $message,
+        int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY
+    ): JsonResponse {
         return response()->json([
             'message' => $message
         ], $responseCode);
@@ -100,10 +139,12 @@ class ApiController extends Controller
      *
      * @param array   $errors       Error messages.
      * @param integer $responseCode Resource code.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondWithErrors(array $errors, int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY)
+    public function respondWithErrors(
-    {
+        array $errors,
+        int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY
+    ): JsonResponse {
         $keys = array_keys($errors);
         $error = $errors[$keys[0]];
 
@@ -122,45 +163,57 @@ class ApiController extends Controller
      * Return resource data
      *
      * @param array|Model|Collection $data         Resource data.
-     * @param array|null             $appendData  Data to append to response.
+     * @param array                  $options      Respond options.
-     * @param integer                $respondCode Resource code.
+     * @param callable|null          $validationFn Optional validation function to check the data before responding.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     protected function respondAsResource(
         mixed $data,
-        mixed $appendData = null,
+        array $options = [],
-        int $respondCode = HttpResponseCodes::HTTP_OK
+        $validationFn = null
-    ) {
+    ): JsonResponse {
+        $isCollection = ($options['isCollection'] ?? false);
+        $appendData = ($options['appendData'] ?? null);
+        $resourceName = ($options['resourceName'] ?? '');
+        $transformResourceName = ($options['transformResourceName'] ?? true);
+        $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'];
             }
 
-        $resourceName = $this->resourceName;
+            if ($validationFn === null || $validationFn($validationData) === true) {
+                return $this->respondNotFound();
+            }
+        }
 
-        if ($this->resourceName === '') {
+        if (empty($resourceName) === true) {
+            $resourceName = $this->resourceName;
+        }
+
+        if (empty($resourceName) === true) {
             $resourceName = get_class($this);
             $resourceName = substr($resourceName, (strrpos($resourceName, '\\') + 1));
             $resourceName = substr($resourceName, 0, strpos($resourceName, 'Controller'));
             $resourceName = strtolower($resourceName);
         }
 
-        $is_multiple = true;
-
         $dataArray = [];
         if ($data instanceof Collection) {
             $dataArray = $data->toArray();
         } elseif (is_array($data) === true) {
             $dataArray = $data;
         } elseif ($data instanceof Model) {
-            $is_multiple = false;
             $dataArray = $data->toArray();
         }
 
         $resource = [];
-        if ($is_multiple === true) {
+        if ($isCollection === true) {
-            $resource = [Str::plural($resourceName) => $dataArray];
+            $resource = [$transformResourceName === true ? Str::plural($resourceName) : $resourceName => $dataArray];
         } else {
-            $resource = [Str::singular($resourceName) => $dataArray];
+            $resource = [$transformResourceName === true ? Str::singular($resourceName) : $resourceName => $dataArray];
         }
 
         if ($appendData !== null) {
@@ -169,4 +222,22 @@ class ApiController extends Controller
 
         return response()->json($resource, $respondCode);
     }
+
+    /**
+     * Get the Controller Model Class name.
+     *
+     * @return string
+     */
+    public function getModelClass(): string
+    {
+        $controllerClass = static::class;
+
+        $modelName = 'App\\Models\\' . Str::replaceLast('Controller', '', Str::afterLast($controllerClass, '\\'));
+
+        if (class_exists($modelName) === false) {
+            return $modelName;
+        }
+
+        return $modelName;
+    }
 }

app/Http/Controllers/Api/ArticleController.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\MediaConductor;
+use App\Conductors\ArticleConductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\ArticleRequest;
+use App\Models\Media;
+use App\Models\Article;
+use App\Traits\HasAttachments;
+use App\Traits\HasGallery;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ArticleController extends ApiController
+{
+    use HasAttachments;
+    use HasGallery;
+
+
+    /**
+     * ApplicationController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')
+            ->only([
+                'store',
+                '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)
+    {
+        list($collection, $total) = ArticleConductor::request($request);
+
+        return $this->respondAsResource(
+            $collection,
+            ['isCollection' => true,
+                'appendData' => ['total' => $total]
+            ]
+        );
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @param  \App\Models\Article      $article The article model.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, Article $article)
+    {
+        if (ArticleConductor::viewable($article) === true) {
+            return $this->respondAsResource(ArticleConductor::model($request, $article));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param \App\Http\Requests\ArticleRequest $request The user request.
+     * @return \Illuminate\Http\Response
+     */
+    public function store(ArticleRequest $request)
+    {
+        if (ArticleConductor::creatable() === true) {
+            $article = Article::create($request->except(['attachments', 'gallery']));
+
+            if ($request->has('attachments') === true) {
+                $article->addAttachments($request->get('attachments'));
+            }
+
+            if ($request->has('gallery') === true) {
+                $article->galleryAddMany($request->get('gallery'));
+            }
+
+            return $this->respondAsResource(
+                ArticleConductor::model($request, $article),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
+        } else {
+            return $this->respondForbidden();
+        }//end if
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \App\Http\Requests\ArticleRequest $request The article update request.
+     * @param  \App\Models\Article               $article The specified article.
+     * @return \Illuminate\Http\Response
+     */
+    public function update(ArticleRequest $request, Article $article)
+    {
+        if (ArticleConductor::updatable($article) === true) {
+            if ($request->has('attachments') === true) {
+                $article->deleteAttachments();
+                $article->addAttachments($request->get('attachments'));
+            }
+
+            if ($request->has('gallery') === true) {
+                $article->gallery()->delete();
+                $article->galleryAddMany($request->get('gallery'));
+            }
+
+            $article->update($request->except(['attachments', 'gallery']));
+            return $this->respondAsResource(ArticleConductor::model($request, $article));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\Article $article The specified article.
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Article $article)
+    {
+        if (ArticleConductor::destroyable($article) === true) {
+            $article->delete();
+            return $this->respondNoContent();
+        } else {
+            return $this->respondForbidden();
+        }
+    }
+}

app/Http/Controllers/Api/AuthController.php

@@ -33,7 +33,7 @@ class AuthController extends ApiController
      * @param Request $request Current request data.
      * @return JsonResponse
      */
-    public function me(Request $request)
+    public function me(Request $request): JsonResponse
     {
         $user = $request->user()->makeVisible(['permissions']);
         return $this->respondAsResource($user);
@@ -47,18 +47,22 @@ 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.'
                 ]);
             }
 
@@ -73,13 +77,13 @@ class AuthController extends ApiController
 
             return $this->respondAsResource(
                 $user->makeVisible(['permissions']),
-                ['token' => $token]
+                ['appendData' => ['token' => $token]]
             );
         }//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',
         ]);
     }
 
@@ -89,7 +93,7 @@ class AuthController extends ApiController
      * @param Request $request Current request data.
      * @return JsonResponse
      */
-    public function logout(Request $request)
+    public function logout(Request $request): JsonResponse
     {
         $user = $request->user();
 

app/Http/Controllers/Api/EventController.php

@@ -3,10 +3,17 @@
 namespace App\Http\Controllers\Api;
 
 use App\Enum\HttpResponseCodes;
-use App\Filters\EventFilter;
-use App\Http\Requests\EventRequest;
 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\Contracts\Container\BindingResolutionException;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class EventController extends ApiController
 {
@@ -16,62 +23,87 @@ class EventController extends ApiController
     public function __construct()
     {
         $this->middleware('auth:sanctum')
-        ->only(['store','update','destroy']);
+        ->only(['store','update','destroy', 'userAdd', 'userUpdate', 'userDelete']);
     }
 
     /**
      * Display a listing of the resource.
      *
-     * @param  EventFilter $filter The event filter.
+     * @param \Illuminate\Http\Request $request The endpoint request.
      * @return \Illuminate\Http\Response
      */
-    public function index(EventFilter $filter)
+    public function index(Request $request)
     {
-        return $this->respondAsResource(
+        list($collection, $total) = EventConductor::request($request);
-            $filter->filter(),
-            ['total' => $filter->foundTotal()]
-        );
-    }
 
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  EventRequest $request The event store request.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(EventRequest $request)
-    {
-        $event = Event::create($request->all());
         return $this->respondAsResource(
-            (new EventFilter($request))->filter($event),
+            $collection,
-            null,
+            ['isCollection' => true,
-            HttpResponseCodes::HTTP_CREATED
+                'appendData' => ['total' => $total]
+            ]
         );
     }
 
     /**
      * Display the specified resource.
      *
-     * @param  EventFilter       $filter The event filter.
+     * @param \Illuminate\Http\Request $request The endpoint request.
      * @param  \App\Models\Event        $event   The specified event.
      * @return \Illuminate\Http\Response
      */
-    public function show(EventFilter $filter, Event $event)
+    public function show(Request $request, Event $event)
     {
-        return $this->respondAsResource($filter->filter($event));
+        if (EventConductor::viewable($event) === true) {
+            return $this->respondAsResource(EventConductor::model($request, $event));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \App\Http\Requests\EventRequest $request The request.
+     * @return \Illuminate\Http\Response
+     */
+    public function store(EventRequest $request)
+    {
+        if (EventConductor::creatable() === true) {
+            $event = Event::create($request->except(['attachments']));
+
+            if ($request->has('attachments') === true) {
+                $event->addAttachments($request->get('attachments'));
+            }
+
+            return $this->respondAsResource(
+                EventConductor::model($request, $event),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
+        } else {
+            return $this->respondForbidden();
+        }
     }
 
     /**
      * Update the specified resource in storage.
      *
-     * @param  EventRequest      $request The event update request.
+     * @param  \App\Http\Requests\EventRequest $request The endpoint request.
      * @param  \App\Models\Event               $event   The specified event.
      * @return \Illuminate\Http\Response
      */
     public function update(EventRequest $request, Event $event)
     {
-        $event->update($request->all());
+        if (EventConductor::updatable($event) === true) {
-        return $this->respondAsResource((new EventFilter($request))->filter($event));
+            if ($request->has('attachments') === true) {
+                $event->deleteAttachments();
+                $event->addAttachments($request->get('attachments'));
+            }
+
+            $event->update($request->except(['attachments']));
+            return $this->respondAsResource(EventConductor::model($request, $event));
+        }
+
+        return $this->respondForbidden();
     }
 
     /**
@@ -82,7 +114,121 @@ class EventController extends ApiController
      */
     public function destroy(Event $event)
     {
+        if (EventConductor::destroyable($event) === true) {
             $event->delete();
             return $this->respondNoContent();
+        } else {
+            return $this->respondForbidden();
+        }
+    }
+
+    /**
+     * List users of Event
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
+     * @return JsonResponse
+     */
+    public function userList(Request $request, Event $event): JsonResponse
+    {
+        $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();
+        }//end if
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Add user to Event
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
+     * @return JsonResponse
+     */
+    public function userAdd(Request $request, Event $event): JsonResponse
+    {
+        $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();
+    }
+
+    /**
+     * Update user
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
+     * @return void
+     */
+    public function userUpdate(Request $request, Event $event): void
+    {
+        // only admin/events permitted
+    }
+
+    /**
+     * Delete user from event
+     *
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
+     * @param User    $user    User model.
+     * @return JsonResponse
+     */
+    public function userDelete(Request $request, Event $event, User $user): JsonResponse
+    {
+        $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/InfoController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Enum\HttpResponseCodes;
+use App\Models\Media;
+use Illuminate\Http\Request;
+
+class InfoController extends ApiController
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $info = [
+            "version" => "1.0.0",
+            "max_upload_size" => Media::getMaxUploadSize()
+        ];
+
+        return $this->respondJson($info);
+    }
+}

app/Http/Controllers/Api/LogController.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+
+class LogController extends ApiController
+{
+    /**
+     * ApplicationController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')
+        ->only(['show']);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  Request $request The log request.
+     * @param  string  $name    The log name.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, string $name)
+    {
+        if ($request->user()?->hasPermission('logs/' . $name) === true) {
+            switch (strtolower($name)) {
+                case 'discord':
+                    $data = [];
+
+                    $log = $request->get('log');
+                    if ($log === null) {
+                        $log = ['output', 'error'];
+                    } else {
+                        $log = explode(',', strtolower($log));
+                    }
+
+                    $lines = intval($request->get('lines', 50));
+                    if ($lines > 100) {
+                        $lines = 100;
+                    } elseif ($lines < 0) {
+                        $lines = 1;
+                    }
+
+                    $before = $request->get('before');
+                    if ($before !== null) {
+                        $before = preg_split(
+                            "/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/",
+                            $before,
+                            -1,
+                            (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                        );
+                        if (count($before) !== 6) {
+                            $before = null;
+                        }
+                    }
+
+                    $after = $request->get('after');
+                    if ($after !== null) {
+                        $after = preg_split(
+                            "/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/",
+                            $after,
+                            -1,
+                            (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                        );
+                        if (count($after) !== 6) {
+                            $after = null;
+                        }
+                    }
+
+                    $logFiles = [
+                        [
+                            'name' => 'output',
+                            'path' => '/home/discordbot/.pm2/logs/stemmech-discordbot-out-0.log'
+                        ],[
+                            'name' => 'error',
+                            'path' => '/home/discordbot/.pm2/logs/stemmech-discordbot-error-0.log'
+                        ]
+                    ];
+
+                    foreach ($logFiles as $logFile) {
+                        if (in_array($logFile['name'], $log) === true) {
+                            $logContent = '';
+
+                            if (file_exists($logFile['path']) === true) {
+                                $logContent = file_get_contents($logFile['path']);
+                            }
+
+                            $logArray = preg_split(
+                                // phpcs:ignore Generic.Files.LineLength.TooLong
+                                "/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: (?:(?!\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: )[\s\S])*)/",
+                                $logContent,
+                                -1,
+                                (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                            );
+
+                            $logContent = '';
+                            $logLineCount = 0;
+                            $logLineSkip = false;
+                            foreach (array_reverse($logArray) as $logLine) {
+                                $lineDate = preg_split(
+                                    "/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2}): /",
+                                    $logLine,
+                                    -1,
+                                    (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                                );
+                                if (count($lineDate) >= 6) {
+                                    $logLineSkip = false;
+
+                                    // Is line before
+                                    if (
+                                        $before !== null && (
+                                        $lineDate[0] > $before[0] ||
+                                        $lineDate[1] > $before[1] ||
+                                        $lineDate[2] > $before[2] ||
+                                        $lineDate[3] > $before[3] ||
+                                        $lineDate[4] > $before[4] ||
+                                        $lineDate[5] > $before[5]
+                                        )
+                                    ) {
+                                        $logLineSkip = true;
+                                        continue;
+                                    }
+
+                                    // Is line after
+                                    if (
+                                        $after !== null && (
+                                        $after[0] > $lineDate[0] ||
+                                        $after[1] > $lineDate[1] ||
+                                        $after[2] > $lineDate[2] ||
+                                        $after[3] > $lineDate[3] ||
+                                        $after[4] > $lineDate[4] ||
+                                        $after[5] > $lineDate[5]
+                                        )
+                                    ) {
+                                        $logLineSkip = true;
+                                        continue;
+                                    }
+
+                                    $logLineCount += 1;
+                                }//end if
+
+                                if ($logLineCount > $lines) {
+                                    break;
+                                }
+
+                                if ($logLineSkip === false) {
+                                    $logContent .= $logLine;
+                                }
+                            }//end foreach
+
+                            $data[$logFile['name']] = $logContent;
+                        }//end if
+                    }//end foreach
+
+                    return $this->respondJson([
+                        'log' => $data
+                    ]);
+            }//end switch
+        }//end if
+
+        return $this->respondForbidden();
+    }
+}

app/Http/Controllers/Api/MediaController.php

@@ -2,13 +2,18 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Conductors\MediaConductor;
+use App\Conductors\MediaJobConductor;
 use App\Enum\HttpResponseCodes;
-use App\Filters\MediaFilter;
+use App\Http\Requests\MediaRequest;
-use App\Http\Requests\MediaStoreRequest;
-use App\Http\Requests\MediaUpdateRequest;
 use App\Models\Media;
+use App\Models\MediaJob;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Laravel\Sanctum\PersonalAccessToken;
 
@@ -26,177 +31,310 @@ class MediaController extends ApiController
     /**
      * Display a listing of the resource.
      *
-     * @param \App\Filters\MediaFilter $filter Created filter object.
+     * @param \Illuminate\Http\Request $request The endpoint request.
      * @return \Illuminate\Http\Response
      */
-    public function index(MediaFilter $filter)
+    public function index(Request $request)
     {
+        list($collection, $total) = MediaConductor::request($request);
+
         return $this->respondAsResource(
-            $filter->filter(),
+            $collection,
-            ['total' => $filter->foundTotal()]
+            ['isCollection' => true,
+                'appendData' => ['total' => $total]
+            ],
+            function ($options) {
+                return $options['total'] === 0;
+            }
         );
     }
 
     /**
      * Display the specified resource.
      *
-     * @param  MediaFilter $filter The request filter.
+     * @param \Illuminate\Http\Request $request The endpoint request.
-     * @param  Media       $medium The request media.
+     * @param  \App\Models\Media        $medium  The request media.
      * @return \Illuminate\Http\Response
      */
-    public function show(MediaFilter $filter, Media $medium)
+    public function show(Request $request, Media $medium)
     {
-        return $this->respondAsResource($filter->filter($medium));
+        if (MediaConductor::viewable($medium) === true) {
+            return $this->respondAsResource(MediaConductor::model($request, $medium));
+        }
+
+        return $this->respondForbidden();
     }
 
     /**
      * Store a new media resource
      *
-     * @param  MediaStoreRequest $request The uploaded media.
+     * @param  \App\Http\Requests\MediaRequest $request The uploaded media.
      * @return \Illuminate\Http\Response
      */
-    public function store(MediaStoreRequest $request)
+    public function store(MediaRequest $request)
     {
-        $file = $request->file('file');
+        // allowed to create a media item
-        if ($file === null) {
+        if (MediaConductor::creatable() === false) {
-            return $this->respondError(['file' => 'An error occurred uploading the file to the server.']);
+            return $this->respondForbidden();
         }
 
+        // check for file
+        $file = $request->file('file');
+        if ($file === null) {
+            return $this->respondWithErrors(['file' => 'The browser did not upload the file correctly to the server.']);
+        }
+
+        return $this->storeOrUpdate($request, null);
+    }
+
+    /**
+     * Update the media resource in storage.
+     *
+     * @param  \App\Http\Requests\MediaRequest $request The update request.
+     * @param  \App\Models\Media               $medium  The specified media.
+     * @return \Illuminate\Http\Response
+     */
+    public function update(MediaRequest $request, Media $medium)
+    {
+        // allowed to update a media item
+        if (MediaConductor::updatable($medium) === false) {
+            return $this->respondForbidden();
+        }
+
+        return $this->storeOrUpdate($request, $medium);
+    }
+
+    /**
+     * Store a new media resource
+     *
+     * @param  \App\Http\Requests\MediaRequest $request The uploaded media.
+     * @param  \App\Models\Media|null          $medium  The specified media.
+     * @return \Illuminate\Http\Response
+     */
+    public function storeOrUpdate(MediaRequest $request, Media|null $medium)
+    {
+        $file = $request->file('file');
+        if ($file !== null) {
+            // validate file object
             if ($file->isValid() !== true) {
                 switch ($file->getError()) {
                     case UPLOAD_ERR_INI_SIZE:
                     case UPLOAD_ERR_FORM_SIZE:
                         return $this->respondTooLarge();
                     case UPLOAD_ERR_PARTIAL:
-                    return $this->respondError(['file' => 'The file upload was interrupted.']);
+                        return $this->respondWithErrors([$file => 'The file upload was interrupted.']);
                     default:
-                    return $this->respondError(['file' => 'An error occurred uploading the file to the server.']);
+                        return $this->respondWithErrors(
+                            [$file => 'An error occurred uploading the file to the server.']
+                        );
                 }
             }
 
-        if ($file->getSize() > Media::maxUploadSize()) {
+            if ($file->getSize() > Media::getMaxUploadSize()) {
                 return $this->respondTooLarge();
             }
+        }
 
-        $title = $file->getClientOriginalName();
+        // create/get media job
-        $mime = $file->getMimeType();
+        $mediaJob = null;
-        $fileInfo = Media::store($file, empty($request->input('permission')));
+        $data = [];
-        if ($fileInfo === null) {
+
-            return $this->respondError(
+        if ($request->missing('job_id') === true) {
-                ['file' => 'The file could not be stored on the server'],
+            /** @var \App\Models\User */
-                HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR
+            $user = auth()->user();
+
+            $mediaJob = new MediaJob();
+            $mediaJob->user_id = $user->id;
+            if ($medium !== null) {
+                $mediaJob->media_id = $medium->id;
+            }
+
+            if ($request->has('title') === true || $file !== null) {
+                $data['title'] = $request->get('title', '');
+            }
+
+            if ($request->has('name') === true || $file !== null) {
+                $data['name'] = (
+                    $request->has('chunk') === true ? $request->get('name', '') : $file->getClientOriginalName()
                 );
             }
 
-        $request->merge([
-            'title' => $title,
-            'mime' => $mime,
-            'name' => $fileInfo['name'],
-            'size' => filesize($fileInfo['path'])
-        ]);
-
-        $media = $request->user()->media()->create($request->all());
-        return $this->respondAsResource((new MediaFilter($request))->filter($media));
-    }
-
-    /**
-     * Update the media resource in storage.
-     *
-     * @param  MediaUpdateRequest $request The update request.
-     * @param  \App\Models\Media  $medium  The specified media.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(MediaUpdateRequest $request, Media $medium)
-    {
-        if ((new MediaFilter($request))->filter($medium) === null) {
-            return $this->respondNotFound();
-        }
-
-        $file = $request->file('file');
             if ($file !== null) {
-            if ($file->getSize() > Media::maxUploadSize()) {
+                $data['size'] = $request->has('chunk') === true ? intval($request->get('size', 0)) : $file->getSize();
-                return $this->respondTooLarge();
+                $data['mime_type'] = (
-            }
+                    $request->has('chunk') === true ? $request->get('mime_type', '') : $file->getMimeType()
-
-            $oldPath = $medium->path();
-            $fileInfo = Media::store($file, empty($request->input('permission')));
-            if ($fileInfo === null) {
-                return $this->respondError(
-                    ['file' => 'The file could not be stored on the server'],
-                    HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR
                 );
             }
 
-            if (file_exists($oldPath) === true) {
+            if ($request->has('storage') === true || $file !== null) {
-                unlink($oldPath);
+                $data['storage'] = $request->get('storage', '');
             }
 
-            $request->merge([
+            if ($request->has('security_type') === true || $file !== null) {
-                'title' => $file->getClientOriginalName(),
+                $data['security']['type'] = $request->get('security_type', '');
-                'mime' => $file->getMimeType(),
+                $data['security']['data'] = $request->get('security_data', '');
-                'name' => $fileInfo['name'],
+
-                'size' => filesize($fileInfo['path'])
+                if ($data['security']['type'] === '') {
-            ]);
+                    $data['security']['data'] = '';
+                }
+
+                if ($medium === null || strcasecmp($data['security']['type'], $medium->security_type) !== 0) {
+                    if ($request->has('storage') === false) {
+                        $mime_type = $request->get('mime_type', $medium === null ? '' : $medium->mime_type);
+                        $data['storage'] = Media::recommendedStorage($mime_type, $data['security']['type']);
+                    }
+                }
+            }
+
+            if (
+                array_key_exists('storage', $data) === true && (
+                    array_key_exists('security', $data) === true &&
+                    array_key_exists('type', $data['security']) === true
+                ) &&
+                array_key_exists('mime_type', $data) === true &&
+                $data['mime_type'] !== ""
+            ) {
+                    $error = Media::verifyStorage($data['mime_type'], $data['security']['type'], $data['storage']);
+                    // Log::error($data['mime_type'] . ' - ' . $data['security']['type'] . ' - ' . $data['storage']);
+                switch ($error) {
+                    case Media::STORAGE_VALID:
+                        break;
+                    case Media::STORAGE_MIME_MISSING:
+                        return $this->respondWithErrors(['mime_type' => 'The file type is required.']);
+                    case Media::STORAGE_NOT_FOUND:
+                        return $this->respondWithErrors(['storage' => 'Storage was not found.']);
+                    case Media::STORAGE_INVALID_SECURITY:
+                        return $this->respondWithErrors(
+                            ['storage' => 'Storage invalid for this security requirement.']
+                        );
+                    default:
+                        return $this->respondWithErrors(['storage' => 'Storage verification error occurred.']);
+                }
+            }
+
+            if ($request->has('transform') === true) {
+                $transform = [];
+
+                foreach (explode(',', $request->get('transform', '')) as $value) {
+                    if (is_string($value) === true) {
+                        if (preg_match('/^rotate-(-?\d+)$/', $value, $matches) !== false) {
+                            $transform['rotate'] = $matches[1];
+                        } elseif (preg_match('/^flip-([vh]|vh|hv)$/', $value, $matches) !== false) {
+                            $transform['flip'] = $matches[1];
+                        } elseif (preg_match('/^crop-(\d+)-(\d+)$/', $value, $matches) !== false) {
+                            $transform['crop'] = ['width' => $matches[1], 'height' => $matches[2]];
+                        } elseif (preg_match('/^crop-(\d+)-(\d+)-(\d+)-(\d+)$/', $value, $matches) !== false) {
+                            $transform['crop'] = [
+                                'width' => $matches[1],
+                                'height' => $matches[2],
+                                'x' => $matches[3],
+                                'y' => $matches[4]
+                            ];
+                        }
+                    }
+                }
+
+                if (count($transform) > 0) {
+                    $data['transform'] = $transform;
+                }
             }//end if
 
-        $medium->update($request->all());
+            $mediaJob->setStatusWaiting();
-        return $this->respondWithTransformer($file);
+        } else {
+            $mediaJob = MediaJob::find($request->get('job_id'));
+            if ($mediaJob === null || $mediaJob->exists() === false) {
+                $this->respondNotFound();
             }
 
+            $data = json_decode($mediaJob->data, true);
+            if ($data === null) {
+                Log::error(`{$mediaJob->id} contains no data`);
+                return $this->respondServerError();
+            }
 
+            if (array_key_exists('name', $data) === false) {
+                Log::error(`{$mediaJob->id} data does not contain the name key`);
+                return $this->respondServerError();
+            }
+        }//end if
+
+        if ($mediaJob === null) {
+            Log::error(`media job does not exist`);
+            return $this->respondServerError();
+        }
+
+        // save uploaded file
+        if ($file !== null) {
+            if ($data['name'] === '') {
+                Log::error(`filename does not exist`);
+                return $this->respondServerError();
+            }
+
+            $temporaryFilePath = generateTempFilePath(
+                pathinfo($data['name'], PATHINFO_EXTENSION),
+                $request->get('chunk', '')
+            );
+            copy($file->path(), $temporaryFilePath);
+
+            if ($request->has('chunk') === true) {
+                $data['chunks'][$request->get('chunk', '1')] = $temporaryFilePath;
+                $data['chunk_count'] = $request->get('chunk_count', 1);
+            } else {
+                $data['file'] = $temporaryFilePath;
+            }
+        }
+
+        $mediaJob->data = json_encode($data, true);
+        $mediaJob->save();
+        $mediaJob->process();
+
+        return $this->respondAsResource(
+            MediaJobConductor::model($request, $mediaJob),
+            ['resourceName' => 'media_job', 'respondCode' => HttpResponseCodes::HTTP_ACCEPTED]
+        );
+    }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param Request           $request Request instance.
      * @param  \App\Models\Media $medium Specified media file.
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request, Media $medium)
+    public function destroy(Media $medium)
     {
-        if ((new MediaFilter($request))->filter($medium) !== null) {
+        if (MediaConductor::destroyable($medium) === true) {
-            if (file_exists($medium->path()) === true) {
-                unlink($medium->path());
-            }
-
             $medium->delete();
             return $this->respondNoContent();
         }
 
-        return $this->respondNotFound();
+        return $this->respondForbidden();
     }
 
     /**
      * Display the specified resource.
      *
-     * @param  Request           $request Request instance.
+     * @param \Illuminate\Http\Request $request The endpoint request.
-     * @param  \App\Models\Media $medium  Specified media.
+     * @param  \App\Models\Media        $media   Specified media.
      * @return \Illuminate\Http\Response
      */
-    public function download(Request $request, Media $medium)
+    public function download(Request $request, Media $media): Response
     {
-        $respondJson = in_array('application/json', explode(',', $request->header('Accept', 'application/json')));
-
         $headers = [];
-        $path = $medium->path();
 
-        /* File exists */
+        /* Check file exists */
-        if (file_exists($path) === false) {
+        if (Storage::disk($media->storage)->exists($media->name) === false) {
-            if ($respondJson === false) {
-                return redirect('/not-found');
-            } else {
             return $this->respondNotFound();
         }
-        }
 
-        $updated_at = Carbon::parse(filemtime($path));
+        $updated_at = Carbon::parse(Storage::disk($media->storage)->lastModified($media->name));
 
         $headerPragma = 'no-cache';
         $headerCacheControl = 'max-age=0, must-revalidate';
         $headerExpires = $updated_at->toRfc2822String();
 
-        if (empty($medium->permission) === true) {
+        /* construct user if can */
-            if ($request->user() === null && $request->has('token') === true) {
+        $user = $request->user();
+        if ($user === null && $request->has('token') === true) {
             $accessToken = PersonalAccessToken::findToken(urldecode($request->input('token')));
 
             if (
@@ -206,24 +344,38 @@ class MediaController extends ApiController
                 $user = $accessToken->tokenable;
             }
         }
-            if ($request->user() === null || $user->hasPermission($medium->permission) === false) {
+
-                if ($respondJson === false) {
+        if ($media->security_type === '') {
-                    return redirect('/login?redirect=' . $request->path());
+            /* no security */
-                } else {
-                    return $this->respondForbidden();
-                }
-            }
-        } else {
             $headerPragma = 'public';
             $headerExpires = $updated_at->addMonth()->toRfc2822String();
+        } elseif (strcasecmp('password', $media->security_type) === 0) {
+            /* password */
+            if (
+                ($user === null || $user->hasPermission('admin/media') === false) &&
+                ($request->has('password') === false || $request->get('password') !== $media->security_data)
+            ) {
+                    return $this->respondForbidden();
+            }
+        } elseif (strcasecmp('permission', $media->security_type) === 0) {
+            /* permission */
+            if (
+                $user === null || (
+                    $user->hasPermission('admin/media') === false &&
+                    $user->hasPermission($media->security_data) === false
+                )
+            ) {
+                    return $this->respondForbidden();
+            }
         }//end if
 
+        // deepcode ignore InsecureHash: Browsers expect Etag to be a md5 hash
         $headerEtag = md5($updated_at->format('U'));
         $headerLastModified = $updated_at->toRfc2822String();
 
         $headers = [
             'Cache-Control' => $headerCacheControl,
-            'Content-Disposition' => sprintf('inline; filename="%s"', basename($path)),
+            'Content-Disposition' => sprintf('inline; filename="%s"', basename($media->name)),
             'Etag' => $headerEtag,
             'Expires' => $headerExpires,
             'Last-Modified' => $headerLastModified,
@@ -242,6 +394,50 @@ class MediaController extends ApiController
             return response()->make('', 304, $headers);
         }
 
-        return response()->file($path, $headers);
+        $headers['Content-Type'] = Storage::disk($media->storage)->mimeType($media->name);
+        $headers['Content-Length'] = Storage::disk($media->storage)->size($media->name);
+        $headers['Content-Disposition'] = 'attachment; filename="' . basename($media->name) . '"';
+
+        $stream = Storage::disk($media->storage)->readStream($media->name);
+        return response()->stream(
+            function () use ($stream) {
+                while (ob_get_level() > 0) {
+                    ob_end_flush();
+                }
+                fpassthru($stream);
+            },
+            200,
+            $headers
+        );
+    }
+
+    /**
+     * Validate a File item in a request is valid
+     *
+     * @param UploadedFile $file     The file to validate.
+     * @param string       $errorKey The error key to use.
+     * @return JsonResponse|null
+     */
+    private function validateFileObject(UploadedFile $file, string $errorKey = 'file'): JsonResponse|null
+    {
+        if ($file->isValid() !== true) {
+            switch ($file->getError()) {
+                case UPLOAD_ERR_INI_SIZE:
+                case UPLOAD_ERR_FORM_SIZE:
+                    return $this->respondTooLarge();
+                case UPLOAD_ERR_PARTIAL:
+                    return $this->respondWithErrors([$errorKey => 'The file upload was interrupted.']);
+                default:
+                    return $this->respondWithErrors(
+                        [$errorKey => 'An error occurred uploading the file to the server.']
+                    );
+            }
+        }
+
+        if ($file->getSize() > Media::getMaxUploadSize()) {
+            return $this->respondTooLarge();
+        }
+
+        return null;
     }
 }

app/Http/Controllers/Api/MediaJobController.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\MediaJobConductor;
+use App\Http\Controllers\Api\ApiController;
+use App\Models\MediaJob;
+use Illuminate\Http\Request;
+
+class MediaJobController extends ApiController
+{
+    /**
+     * 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) = MediaJobConductor::request($request);
+
+        return $this->respondAsResource(
+            $collection,
+            ['isCollection' => true,
+                'appendData' => ['total' => $total],
+                'resourceName' => 'media_job'
+            ],
+            function ($options) {
+                return $options['total'] === 0;
+            }
+        );
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request  The endpoint request.
+     * @param  \App\Models\MediaJob     $mediaJob The request media job.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, MediaJob $mediaJob)
+    {
+        if (MediaJobConductor::viewable($mediaJob) === true) {
+            return $this->respondAsResource(
+                MediaJobConductor::model($request, $mediaJob),
+                ['resourceName' => 'media_job']
+            );
+        }
+
+        return $this->respondForbidden();
+    }
+}

app/Http/Controllers/Api/OCRController.php

@@ -0,0 +1,234 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use thiagoalessio\TesseractOCR\TesseractOCR;
+use FFMpeg;
+use App\Enum\CurlErrorCodes;
+
+class OCRController extends ApiController
+{
+    /**
+     * ApplicationController constructor.
+     */
+    public function __construct()
+    {
+        // $this->middleware('auth:sanctum')
+        // ->only(['show']);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  Request $request The log request.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request)
+    {
+        // if ($request->user()?->hasPermission('logs/' . $name) === true) {
+        $url = $request->get('url');
+        if ($url !== null) {
+            $data = ['ocr' => []];
+
+            $filters = $request->get('filters', ['tesseract']);
+            if (is_array($filters) === false) {
+                $filters = explode(',', $filters);
+            }
+
+            $tesseractOEM = $request->get('tesseract.oem');
+            $tesseractDigits = $request->get('tesseract.digits');
+            $tesseractAllowlist = $request->get('tesseract.allowlist');
+
+            // Download URL
+            $urlDownloadFilePath = tempnam(sys_get_temp_dir(), 'download');
+            $maxDownloadSize = (1024 * 1024); // 1MB
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+            // 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 (
+                $downloadSize,
+                $downloaded,
+                $uploadSize,
+                $uploaded
+            ) use ($maxDownloadSize) {
+                return ($downloaded > $maxDownloadSize) ? 1 : 0;
+            });
+
+            $curlResult = curl_exec($ch);
+            $curlError = curl_errno($ch);
+            $curlSize = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD);
+            curl_close($ch);
+            if ($curlError !== 0) {
+                $error = 'File size is larger then allowed';
+                if ($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) {
+                    $error = CurlErrorCodes::getMessage($curlError);
+                }
+
+                return $this->respondWithErrors(['url' => $error]);
+            }
+
+            // Save url file
+            file_put_contents($urlDownloadFilePath, $curlResult);
+            $urlDownloadFilePathBase = preg_replace('/\\.[^.\\s]{3,4}$/', '', $urlDownloadFilePath);
+
+            // tesseract (overall)
+            $ocr = null;
+            foreach ($filters as $filterItem) {
+                if (str_starts_with($filterItem, 'tesseract') === true) {
+                    $ocr = new TesseractOCR();
+                    $ocr->image($urlDownloadFilePath);
+                    if ($tesseractOEM !== null) {
+                        $ocr->oem($tesseractOEM);
+                    }
+                    if ($tesseractDigits !== null) {
+                        $ocr->digits();
+                    }
+                    if ($tesseractAllowlist !== null) {
+                        $ocr->allowlist($tesseractAllowlist);
+                    }
+                    break;
+                }
+            }
+
+            // Image Filter Function
+            $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();
+                    ob_end_clean();
+                    $imgDataSize = strlen($imgData);
+
+                    $ocr->imageData($imgData, $imgDataSize);
+                    imagedestroy($img);
+
+                    $result = $ocr->run(500);
+                }
+
+                return $result;
+            };
+
+            // Image Scale Function
+            $tesseractImageScaleFunc = function ($scaleFunc) use ($curlResult, $ocr) {
+                $result = '';
+                $srcImage = imagecreatefromstring($curlResult);
+                $srcWidth = imagesx($srcImage);
+                $srcHeight = imagesy($srcImage);
+
+                $dstWidth = $scaleFunc($srcWidth);
+                $dstHeight = $scaleFunc($srcHeight);
+                $dstImage = imagecreatetruecolor($dstWidth, $dstHeight);
+
+                imagecopyresampled($dstImage, $srcImage, 0, 0, 0, 0, $dstWidth, $dstHeight, $srcWidth, $srcHeight);
+
+                ob_start();
+                imagepng($dstImage);
+                $imgData = ob_get_contents();
+                ob_end_clean();
+                $imgDataSize = strlen($imgData);
+
+                imagedestroy($srcImage);
+                imagedestroy($dstImage);
+
+                $ocr->imageData($imgData, $imgDataSize);
+                $result = $ocr->run(500);
+                return $result;
+            };
+
+            // filter: tesseract
+            if (in_array('tesseract', $filters) === true) {
+                $data['ocr']['tesseract'] = $ocr->run(500);
+            }
+
+            // filter: tesseract.grayscale
+            if (in_array('tesseract.grayscale', $filters) === true) {
+                $data['ocr']['tesseract.grayscale'] = $tesseractImageFilterFunc(IMG_FILTER_GRAYSCALE);
+            }
+
+            // filter: tesseract.double_scale
+            if (in_array('tesseract.double_scale', $filters) === true) {
+                $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) {
+                    return $size / 2;
+                });
+            }
+
+            // filter: tesseract.edgedetect
+            if (in_array('tesseract.edgedetect', $filters) === true) {
+                $data['ocr']['tesseract.edgedetect'] = $tesseractImageFilterFunc(IMG_FILTER_EDGEDETECT);
+            }
+
+            // filter: tesseract.mean_removal
+            if (in_array('tesseract.mean_removal', $filters) === true) {
+                $data['ocr']['tesseract.mean_removal'] = $tesseractImageFilterFunc(IMG_FILTER_MEAN_REMOVAL);
+            }
+
+            // filter: tesseract.negate
+            if (in_array('tesseract.negate', $filters) === true) {
+                $data['ocr']['tesseract.negate'] = $tesseractImageFilterFunc(IMG_FILTER_NEGATE);
+            }
+
+            // filter: tesseract.pixelate
+            if (in_array('tesseract.pixelate', $filters) === true) {
+                $data['ocr']['tesseract.pixelate'] = $tesseractImageFilterFunc(IMG_FILTER_PIXELATE, 3);
+            }
+
+            // filter: keras
+            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));
+                } else {
+                    $output = '';
+                }
+                $data['ocr']['keras'] = $output;
+            }
+
+            unlink($urlDownloadFilePath);
+            return $this->respondJson($data);
+        }//end if
+
+        return $this->respondWithErrors(['url' => 'url is missing']);
+    }
+
+    // $ffmpeg = FFMpeg\FFMpeg::create();
+
+    // // Load the input video
+    // $inputFile = $ffmpeg->open('input.mp4');
+
+    // // Split the video into individual frames
+    // $videoFrames = $inputFile->frames();
+    // foreach ($videoFrames as $frame) {
+    //   // Save the frame as a PNG
+    //   $frame->save(new FFMpeg\Format\Video\PNG(), 'frame-' . $frame->getMetadata('pts') . '.png');
+
+    //   // Pass the PNG to Tesseract for processing
+    //   exec("tesseract frame-" . $frame->getMetadata('pts') . ".png output");
+    // }
+
+    // // Read the output from Tesseract
+    // $text = file_get_contents("output.txt");
+
+    // // Do something with the text from Tesseract
+    // echo $text;
+}

app/Http/Controllers/Api/PostController.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Enum\HttpResponseCodes;
-use App\Filters\PostFilter;
-use App\Http\Requests\PostStoreRequest;
-use App\Http\Requests\PostUpdateRequest;
-use App\Models\Post;
-use Illuminate\Http\Request;
-
-class PostController extends ApiController
-{
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum')
-            ->only([
-                'store',
-                'update',
-                'delete'
-            ]);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \App\Filters\PostFilter $filter Post filter request.
-     * @return \Illuminate\Http\Response
-     */
-    public function index(PostFilter $filter)
-    {
-        return $this->respondAsResource(
-            $filter->filter(),
-            ['total' => $filter->foundTotal()]
-        );
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  PostFilter       $filter The filter request.
-     * @param  \App\Models\Post $post   The post model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(PostFilter $filter, Post $post)
-    {
-        return $this->respondAsResource($filter->filter($post));
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  PostStoreRequest $request The post store request.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(PostStoreRequest $request)
-    {
-        $post = Post::create($request->all());
-        return $this->respondAsResource(
-            (new PostFilter($request))->filter($post),
-            null,
-            HttpResponseCodes::HTTP_CREATED
-        );
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  PostUpdateRequest $request The post update request.
-     * @param  \App\Models\Post  $post    The specified post.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(PostUpdateRequest $request, Post $post)
-    {
-        $post->update($request->all());
-        return $this->respondAsResource((new PostFilter($request))->filter($post));
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\Models\Post $post The specified post.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Post $post)
-    {
-        $post->delete();
-        return $this->respondNoContent();
-    }
-}

app/Http/Controllers/Api/ShortlinkController.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\ShortlinkConductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\ShortlinkRequest;
+use App\Models\Shortlink;
+use Illuminate\Http\Request;
+
+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               $shortlink 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 $shortlink 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

@@ -1,132 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Models\Subscription;
-use App\Filters\SubscriptionFilter;
-use App\Http\Requests\SubscriptionRequest;
-use App\Jobs\SendEmailJob;
-use App\Mail\SubscriptionConfirm;
-use App\Mail\SubscriptionUnsubscribed;
-
-class SubscriptionController extends ApiController
-{
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum')
-        ->except(['store', 'destroyByEmail']);
-    }
-
-    /**
-     * Display a listing of subscribers.
-     *
-     * @param \App\Filters\SubscriptionFilter $filter Filter object.
-     * @return \Illuminate\Http\Response
-     */
-    public function index(SubscriptionFilter $filter)
-    {
-        $collection = $filter->filter();
-        return $this->respondAsResource(
-            $collection,
-            ['total' => $filter->foundTotal()]
-        );
-    }
-
-    /**
-     * Store a subscriber email in the database.
-     *
-     * @param  SubscriptionRequest $request The subscriber update request.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(SubscriptionRequest $request)
-    {
-        if (Subscription::where('email', $request->email)->first() !== null) {
-            return $this->respondWithErrors(['email' => 'This email address has already subscribed']);
-        }
-
-        Subscription::create($request->all());
-        dispatch((new SendEmailJob($request->email, new SubscriptionConfirm($request->email))))->onQueue('mail');
-
-        return $this->respondCreated();
-    }
-
-
-    /**
-     * Display the specified user.
-     *
-     * @param  SubscriptionFilter $filter       The subscription filter.
-     * @param  Subscription       $subscription The subscription model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(SubscriptionFilter $filter, Subscription $subscription)
-    {
-        return $this->respondAsResource($filter->filter($subscription));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  SubscriptionRequest $request      The subscription update request.
-     * @param  Subscription        $subscription The specified subscription.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(SubscriptionRequest $request, Subscription $subscription)
-    {
-        // $input = [];
-        // $updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password'];
-
-        // if ($request->user()->hasPermission('admin/user') === true) {
-        //     $updatable = array_merge($updatable, ['email_verified_at']);
-        // } elseif ($request->user()->is($user) !== true) {
-        //     return $this->respondForbidden();
-        // }
-
-        // $input = $request->only($updatable);
-        // if (array_key_exists('password', $input) === true) {
-        //     $input['password'] = Hash::make($request->input('password'));
-        // }
-
-        // $user->update($input);
-
-        // return $this->respondAsResource((new UserFilter($request))->filter($user));
-    }
-
-
-    /**
-     * Remove the user from the database.
-     *
-     * @param  Subscription $subscription The specified subscription.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Subscription $subscription)
-    {
-        // if ($user->hasPermission('admin/user') === false) {
-        //     return $this->respondForbidden();
-        // }
-
-        $email = $subscription->email;
-
-        $subscription->delete();
-        return $this->respondNoContent();
-    }
-
-    /**
-     * Remove the user from the database.
-     *
-     * @param  SubscriptionRequest $request The specified subscription.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroyByEmail(SubscriptionRequest $request)
-    {
-        $subscription = Subscription::where('email', $request->email)->first();
-        if ($subscription !== null) {
-            $subscription->delete();
-            dispatch((new SendEmailJob($request->email, new SubscriptionUnsubscribed($request->email))))->onQueue('mail');
-        }
-
-        return $this->respondNoContent();
-    }
-}

app/Http/Controllers/Api/UserController.php

@@ -2,12 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Conductors\EventConductor;
 use App\Enum\HttpResponseCodes;
-use App\Filters\UserFilter;
+use App\Http\Requests\UserRequest;
-use App\Http\Requests\UserUpdateRequest;
-use App\Http\Requests\UserStoreRequest;
 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;
@@ -16,13 +14,15 @@ 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;
 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
 {
@@ -38,73 +38,81 @@ class UserController extends ApiController
             'register',
             'exists',
             'forgotPassword',
-            'forgotUsername',
             'resetPassword',
             'verifyEmail',
-            'resendVerifyEmailCode'
+            'resendVerifyEmailCode',
+            'eventList',
         ]);
     }
 
     /**
      * Display a listing of the resource.
      *
-     * @param \App\Filters\UserFilter $filter Filter object.
+     * @param \Illuminate\Http\Request $request The endpoint request.
      * @return \Illuminate\Http\Response
      */
-    public function index(UserFilter $filter)
+    public function index(Request $request)
     {
-        $collection = $filter->filter();
+        list($collection, $total) = UserConductor::request($request);
+
         return $this->respondAsResource(
             $collection,
-            ['total' => $filter->foundTotal()]
+            ['isCollection' => true,
+                'appendData' => ['total' => $total]
+            ]
         );
     }
 
     /**
      * Store a newly created user in the database.
      *
-     * @param  UserStoreRequest $request The user update request.
+     * @param \App\Http\Requests\UserRequest $request The endpoint request.
      * @return \Illuminate\Http\Response
      */
-    public function store(UserStoreRequest $request)
+    public function store(UserRequest $request)
     {
-        if ($request->user()->hasPermission('admin/user') !== true) {
+        if (UserConductor::creatable() === true) {
+            $user = User::create($request->all());
+            return $this->respondAsResource(
+                UserConductor::model($request, $user),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
+        } else {
             return $this->respondForbidden();
         }
-
-        $user = User::create($request->all());
-        return $this->respondAsResource((new UserFilter($request))->filter($user), [], HttpResponseCodes::HTTP_CREATED);
     }
 
-
     /**
      * Display the specified user.
      *
-     * @param  UserFilter $filter The user filter.
+     * @param \Illuminate\Http\Request $request The endpoint request.
-     * @param  User       $user   The user model.
+     * @param  \App\Models\User         $user    The user model.
      * @return \Illuminate\Http\Response
      */
-    public function show(UserFilter $filter, User $user)
+    public function show(Request $request, User $user)
     {
-        return $this->respondAsResource($filter->filter($user));
+        if (UserConductor::viewable($user) === true) {
+            return $this->respondAsResource(UserConductor::model($request, $user));
+        }
+
+        return $this->respondForbidden();
     }
 
     /**
      * Update the specified resource in storage.
      *
-     * @param  UserUpdateRequest $request The user update request.
+     * @param  \App\Http\Requests\UserRequest $request The user update request.
-     * @param  User              $user    The specified user.
+     * @param  \App\Models\User               $user    The specified user.
      * @return \Illuminate\Http\Response
      */
-    public function update(UserUpdateRequest $request, User $user)
+    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']);
-        } elseif ($request->user()->is($user) !== true) {
-            return $this->respondForbidden();
             }
 
             $input = $request->only($updatable);
@@ -114,44 +122,59 @@ class UserController extends ApiController
 
             $user->update($input);
 
-        return $this->respondAsResource((new UserFilter($request))->filter($user));
+            return $this->respondAsResource(UserConductor::model($request, $user));
         }
 
+        return $this->respondForbidden();
+    }
 
     /**
      * Remove the user from the database.
      *
-     * @param  User $user The specified user.
+     * @param  \App\Models\User $user The specified user.
      * @return \Illuminate\Http\Response
      */
     public function destroy(User $user)
     {
-        if ($user->hasPermission('admin/user') === false) {
+        if (UserConductor::destroyable($user) === true) {
-            return $this->respondForbidden();
-        }
-
             $user->delete();
             return $this->respondNoContent();
         }
 
+        return $this->respondForbidden();
+    }
+
     /**
      * Register a new user
      *
-     * @param UserRegisterRequest $request The register user request.
+     * @param \App\Http\Requests\UserRegisterRequest $request The register user request.
-     * @return \Illuminate\Http\Response
+     * @return JsonResponse
      */
-    public function register(UserRegisterRequest $request)
+    public function register(UserRegisterRequest $request): JsonResponse
     {
         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',
             ]);
@@ -168,35 +191,15 @@ class UserController extends ApiController
         }//end try
     }
 
-    /**
-     * Sends an email with all the usernames registered at that address
-     *
-     * @param 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
      *
-     * @param UserForgotPasswordRequest $request The reset password request.
+     * @param \App\Http\Requests\UserForgotPasswordRequest $request The reset password request.
      * @return \Illuminate\Http\Response
      */
     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([
@@ -213,7 +216,7 @@ class UserController extends ApiController
     /**
      * Resets a user password
      *
-     * @param UserResetPasswordRequest $request The reset password request.
+     * @param \App\Http\Requests\UserResetPasswordRequest $request The reset password request.
      * @return \Illuminate\Http\Response
      */
     public function resetPassword(UserResetPasswordRequest $request)
@@ -240,14 +243,14 @@ class UserController extends ApiController
         }
 
         return $this->respondError([
-            'code' => 'The code was not found or has expired'
+            'code' => 'The code was not found or has expired.'
         ]);
     }
 
     /**
      * Verify an email code
      *
-     * @param UserVerifyEmailRequest $request The verify email request.
+     * @param \App\Http\Requests\UserVerifyEmailRequest $request The verify email request.
      * @return \Illuminate\Http\Response
      */
     public function verifyEmail(UserVerifyEmailRequest $request)
@@ -278,21 +281,21 @@ class UserController extends ApiController
         }//end if
 
         return $this->respondWithErrors([
-            'code' => 'The code was not found or has expired'
+            'code' => 'The code was not found or has expired.'
         ]);
     }
 
     /**
      * Resend a new verify email
      *
-     * @param UserResendVerifyEmailRequest $request The resend verify email request.
+     * @param \App\Http\Requests\UserResendVerifyEmailRequest $request The resend verify email request.
-     * @return \Illuminate\Http\Response
+     * @return JsonResponse
      */
-    public function resendVerifyEmail(UserResendVerifyEmailRequest $request)
+    public function resendVerifyEmail(UserResendVerifyEmailRequest $request): JsonResponse
     {
         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();
@@ -312,12 +315,12 @@ class UserController extends ApiController
     /**
      * Resend verification email
      *
-     * @param UserResendVerifyEmailRequest $request The resend user request.
+     * @param \App\Http\Requests\UserResendVerifyEmailRequest $request The resend user request.
      * @return \Illuminate\Http\Response
      */
     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();
 
@@ -334,4 +337,33 @@ 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): JsonResponse
+    {
+        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/Controllers/Controller.php

@@ -3,13 +3,11 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests;
-    use DispatchesJobs;
     use ValidatesRequests;
 }

app/Http/Kernel.php

@@ -40,28 +40,30 @@ class Kernel extends HttpKernel
 
         'api' => [
             // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
-            'throttle:api',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class . ':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             // \App\Http\Middleware\ForceJsonResponse::class,
+            \App\Http\Middleware\UnmangleRequest::class,
             'useSanctumGuard',
             \App\Http\Middleware\LogRequest::class,
         ],
     ];
 
     /**
-     * The application's route middleware.
+     * The application's middleware aliases.
      *
-     * These middleware may be assigned to groups or used individually.
+     * Aliases may be used to conveniently assign middleware to routes and groups.
      *
      * @var array<string, class-string|string>
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'unmangle' => \App\Http\Middleware\UnmangleRequest::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

app/Http/Middleware/Authenticate.php

@@ -10,12 +10,14 @@ class Authenticate extends Middleware
      * Get the path the user should be redirected to when they are not authenticated.
      *
      * @param  mixed $request Request.
-     * @return string|null
+     * @return ?string
      */
-    protected function redirectTo(mixed $request)
+    protected function redirectTo(mixed $request): ?string
     {
         if ($request->expectsJson() === false) {
             return route('login');
         }
+
+        return null;
     }
 }

app/Http/Middleware/ForceJsonResponse.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
 
@@ -10,11 +11,9 @@ class ForceJsonResponse
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         $request->headers->set('Accept', 'application/json');
         return $next($request);

app/Http/Middleware/LogRequest.php

@@ -2,30 +2,29 @@
 
 namespace App\Http\Middleware;
 
+use App\Models\AnalyticsItemRequest;
+use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
-use App\Models\Analytics;
 
 class LogRequest
 {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request                                                                          $request
+     * @param Illuminate\Http\Request $request HTTP Request.
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
+     * @param  \Closure                $next    Closure.
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     * @return Symfony\Component\HttpFoundation\Response
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         // Make it an after middleware
         $response = $next($request);
 
         try {
-            Analytics::create([
+            AnalyticsItemRequest::create([
-                'type' => 'pageview',
+                'type' => 'apirequest',
-                'attribute' => $request->path(),
+                'path' => $request->path(),
-                'useragent' => $request->userAgent(),
-                'ip' => $request->ip(),
             ]);
 
             return $response;

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Http\Request;
@@ -13,11 +14,11 @@ class RedirectIfAuthenticated
      * Handle an incoming request.
      *
      * @param  Request     $request   Request.
-     * @param  Closure(Request): (Response|RedirectResponse) $next      Next.
+     * @param  \Closure    $next      Closure.
      * @param  string|null ...$guards Guards.
-     * @return Response|RedirectResponse
+     * @return Response
      */
-    public function handle(Request $request, Closure $next, ...$guards)
+    public function handle(Request $request, Closure $next, string ...$guards): Response
     {
         $guards = empty($guards) === true ? [null] : $guards;
 

app/Http/Middleware/TrustHosts.php

@@ -11,7 +11,7 @@ class TrustHosts extends Middleware
      *
      * @return array<int, string|null>
      */
-    public function hosts()
+    public function hosts(): array
     {
         return [
             $this->allSubdomainsOfApplicationUrl(),

app/Http/Middleware/UnmangleRequest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Symfony\Component\HttpFoundation\Response;
+use App\Providers\RouteServiceProvider;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class UnmangleRequest
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request     $request   Request.
+     * @param  \Closure    $next      Next.
+     * @param  string|null ...$guards Guards.
+     * @return Response response.
+     */
+    public function handle(Request $request, Closure $next, string ...$guards): Response
+    {
+        if (isset($_SERVER['QUERY_STRING']) === true) {
+            $params = $request->all();
+
+            $string = $_SERVER['QUERY_STRING'];
+            $parts = explode('&', $string);
+            foreach ($parts as $part) {
+                $key = $part;
+                $splitPos = strpos($key, '=');
+                if ($splitPos !== false) {
+                    $key = urldecode(substr($key, 0, $splitPos));
+                }
+
+                $replace_key = str_replace('.', '_', $key);
+                if (strpos($key, '.') !== false && array_key_exists($replace_key, $params) === true) {
+                    $params[$key] = $params[$replace_key];
+                    unset($params[$replace_key]);
+                }
+            }
+
+            $request->replace($params);
+        }//end if
+
+        return $next($request);
+    }
+}

app/Http/Middleware/UseSanctumGuard.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -11,11 +12,11 @@ class UseSanctumGuard
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request                                                                          $request
+     * @param Request  $request Request object.
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
+     * @param  \Closure $next    Closure object.
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     * @return Response
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         Auth::shouldUse('sanctum');
         return $next($request);

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(): array
+    {
+        return [
+            'type' => 'required|string',
+        ];
+    }
+
+    /**
+     * Get the validation rules that apply to PUT request.
+     *
+     * @return array<string, mixed>
+     */
+    public function putRules(): array
+    {
+        return [
+            'type' => 'string',
+            'useragent' => 'string',
+            'ip' => 'ipv4|ipv6',
+            'session' => 'number',
+        ];
+    }
+}

app/Http/Requests/ArticleRequest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Validation\Rule;
+
+class ArticleRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to POST requests.
+     *
+     * @return array<string, mixed>
+     */
+    public function postRules(): array
+    {
+        return [
+            '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',
+            'content' => 'required|string|min:6',
+            'hero' => 'required|uuid|exists:media,id',
+        ];
+    }
+
+    /**
+     * Get the validation rules that apply to PUT request.
+     *
+     * @return array<string, mixed>
+     */
+    public function putRules(): array
+    {
+        return [
+            'slug' => [
+                'string',
+                'min:6',
+                Rule::unique('articles')->ignoreModel($this->article),
+            ],
+            'title' => 'string|min:6|max:255',
+            'publish_at' => 'date',
+            'user_id' => 'uuid|exists:users,id',
+            'content' => 'string|min:6',
+            'hero' => 'uuid|exists:media,id',
+        ];
+    }
+}

app/Http/Requests/AuthLoginRequest.php

@@ -11,10 +11,10 @@ class AuthLoginRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
-            'username' => 'required|string|min:6|max:255',
+            'email' => 'required|string|min:6|max:255',
             'password' => 'required|string|min:6',
         ];
     }

app/Http/Requests/BaseRequest.php

@@ -12,12 +12,18 @@ class BaseRequest extends FormRequest
      *
      * @return boolean
      */
-    public function authorize()
+    public function authorize(): bool
     {
-        if (method_exists($this, 'postAuthorize') === true && request()->isMethod('post') === true) {
+        if (request()->isMethod('post') === true && method_exists($this, 'postAuthorize') === true) {
             return $this->postAuthorize();
-        } elseif (method_exists($this, 'putAuthorize') === true && request()->isMethod('put') === true) {
+        } elseif (
+            (
+            request()->isMethod('put') === true || request()->isMethod('patch') === true
+            ) && method_exists($this, 'putAuthorize') === true
+        ) {
             return $this->putAuthorize();
+        } elseif (request()->isMethod('delete') === true && method_exists($this, 'destroyAuthorize') === true) {
+            return $this->deleteAuthorize();
         }
 
         return true;
@@ -28,7 +34,7 @@ class BaseRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = [];
 
@@ -38,8 +44,12 @@ class BaseRequest extends FormRequest
 
         if (method_exists($this, 'postRules') === true && request()->isMethod('post') === true) {
             $rules = $this->mergeRules($rules, $this->postRules());
-        } elseif (method_exists($this, 'putRules') === true && request()->isMethod('put') === true) {
+        } elseif (
-            $rules = $this->mergeRules($rules, $this->postRules());
+            method_exists($this, 'putRules') === true && (
+            request()->isMethod('put') === true || request()->isMethod('patch') === true
+            )
+        ) {
+            $rules = $this->mergeRules($rules, $this->putRules());
         } elseif (method_exists($this, 'destroyRules') === true && request()->isMethod('delete') === true) {
             $rules = $this->mergeRules($rules, $this->destroyRules());
         }
@@ -54,7 +64,7 @@ class BaseRequest extends FormRequest
      * @param array $collection2 The second collection of rules to merge.
      * @return array
      */
-    private function mergeRules(array $collection1, array $collection2)
+    private function mergeRules(array $collection1, array $collection2): array
     {
         $rules = [];
 
@@ -73,8 +83,8 @@ class BaseRequest extends FormRequest
 
                     if (is_array($collection2[$key]) === true) {
                         $key_ruleset = array_merge($key_ruleset, $collection2[$key]);
-                    } elseif (is_string($collection1[$key]) === true) {
+                    } elseif (is_string($collection2[$key]) === true) {
-                        $key_ruleset = array_merge($key_ruleset, explode('|', $collection1[$key]));
+                        $key_ruleset = array_merge($key_ruleset, explode('|', $collection2[$key]));
                     }
 
                     if (count($key_ruleset) > 0) {

app/Http/Requests/ContactSendRequest.php

@@ -12,13 +12,13 @@ class ContactSendRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name' => 'required|max:255',
             'email' => 'required|email|max:255',
             'content' => 'required|max:2000',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Http/Requests/EventRequest.php

@@ -2,37 +2,16 @@
 
 namespace App\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
 class EventRequest extends BaseRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function postAuthorize()
-    {
-        return $this->user()?->hasPermission('admin/events');
-    }
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function putAuthorize()
-    {
-        return $this->user()?->hasPermission('admin/events');
-    }
-
     /**
      * Apply the base rules to this request
      *
      * @return array<string, mixed>
      */
-    public function baseRules()
+    public function baseRules(): array
     {
         return [
             'title'             => 'min:6',
@@ -44,16 +23,18 @@ class EventRequest extends BaseRequest
             'end_at'            => 'date|after:start_date',
             'publish_at'        => 'date|nullable',
             'status' => [
-                Rule::in(['draft', 'open', 'closed', 'cancelled']),
+                Rule::in(['draft', 'soon', 'open', 'closed', 'cancelled', 'scheduled', 'full']),
             ],
             'registration_type' => [
-                Rule::in(['none', 'email', 'link']),
+                Rule::in(['none', 'email', 'link', 'message']),
             ],
             'registration_data' => [
                 Rule::when(strcasecmp('email', $this->attributes->get('registration_type')) == 0, 'required|email'),
-                Rule::when(strcasecmp('link', $this->attributes->get('registration_type')) == 0, 'required|url')
+                Rule::when(strcasecmp('link', $this->attributes->get('registration_type')) == 0, 'required|url'),
+                Rule::when(strcasecmp('message', $this->attributes->get('registration_type')) == 0, 'required|message'),
             ],
             'hero'              => 'uuid|exists:media,id',
+            'location_url'      => 'sometimes|string|max:255',
         ];
     }
 
@@ -62,7 +43,7 @@ class EventRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    protected function postRules()
+    protected function postRules(): array
     {
         return [
             'title'             => 'required',

app/Http/Requests/MediaRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Validation\Rule;
+
+class MediaRequest extends BaseRequest
+{
+    /**
+     * POST request rules
+     *
+     * @return array
+     */
+    public function postRules(): array
+    {
+        return [
+            'job_id' => [
+                Rule::requiredIf(function () {
+                    return request()->has('chunk') && request('chunk') != 1;
+                }),
+                'string',
+            ],
+            'name' => [
+                Rule::requiredIf(function () {
+                    return request()->has('chunk') && request('chunk') == 1;
+                }),
+                'string',
+            ],
+            'chunk' => 'required_with:chunk_count|integer|min:1|max:999|lte:chunk_count',
+            'chunk_count' => 'required_with:chunk|integer|min:1',
+        ];
+    }
+}

app/Http/Requests/MediaStoreRequest.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class MediaStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/MediaUpdateRequest.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class MediaUpdateRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/PostStoreRequest.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class PostStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'slug' => 'string|min:6|unique:posts',
-            'title' => 'string|min:6|max:255',
-            'publish_at' => 'date',
-            'user_id' => 'uuid|exists:users,id',
-        ];
-    }
-}

app/Http/Requests/PostUpdateRequest.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class PostUpdateRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'slug' => [
-                'string',
-                'min:6',
-                Rule::unique('posts')->ignoreModel($this->post),
-            ],
-            'title' => 'string|min:6|max:255',
-            'publish_at' => 'date',
-            'user_id' => 'uuid|exists:users,id',
-        ];
-    }
-}

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(): array
+    {
+        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(): array
+    {
+        $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

@@ -11,11 +11,11 @@ class SubscriptionRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function postRules()
+    public function postRules(): array
     {
         return [
-            'email' => 'required|email',
+            'email' => 'required|email|unique:subscriptions',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 
@@ -24,11 +24,23 @@ class SubscriptionRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function destroyRules()
+    public function destroyRules(): array
     {
         return [
             'email' => 'required|email',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
+        ];
+    }
+
+    /**
+     * Get the custom error messages.
+     *
+     * @return array
+     */
+    public function messages(): array
+    {
+        return [
+            'email.unique' => 'This email address has already subscribed',
         ];
     }
 }

app/Http/Requests/UserForgotPasswordRequest.php

@@ -12,11 +12,11 @@ class UserForgotPasswordRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         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
@@ -11,13 +12,11 @@ class UserRegisterRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         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

@@ -0,0 +1,111 @@
+<?php
+
+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
+{
+    /**
+     * Apply the additional POST base rules to this request
+     *
+     * @return array<string, mixed>
+     */
+    public function postRules(): array
+    {
+        $user = auth()->user();
+        $isAdminUser = $user->hasPermission('admin/users');
+
+        return [
+            'first_name' => (
+                $isAdminUser === true ? 'required_with:last_name,display_name,phone' : 'required'
+            ) . '|string|max:255|min:2',
+            'last_name' => (
+                $isAdminUser === true ? 'required_with:first_name,display_name,phone' : 'required'
+            ) . '|string|max:255|min:2',
+            'display_name' => [
+                $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'
+        ];
+    }
+
+    /**
+     * Get the validation rules that apply to PUT request.
+     *
+     * @return array<string, mixed>
+     */
+    public function putRules(): array
+    {
+        $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 [
+            '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',
+                Rule::unique('users')->ignore($ruleUser->id)->when(
+                    $this->email !== $ruleUser->email,
+                    function ($query) {
+                        return $query->where('email', $this->email);
+                    }
+                ),
+            ],
+            'phone' => ['nullable', 'regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
+            'password' => "nullable|string|min:8"
+        ];
+    }
+}

app/Http/Requests/UserResendVerifyEmailRequest.php

@@ -12,11 +12,11 @@ class UserResendVerifyEmailRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
-            'username' => 'required|exists:users,username',
+            'email' => 'required|exists:users,email',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Http/Requests/UserResetPasswordRequest.php

@@ -12,12 +12,12 @@ class UserResetPasswordRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'code' => 'required|digits:6',
             'password' => 'required|string|min:8',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Http/Requests/UserStoreRequest.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'username' => 'required|string|max:255|min:4|unique:users',
-            'first_name' => 'required|string|max:255|min:2',
-            'last_name' => 'required|string|max:255|min:2',
-            'email' => 'required|string|email|max:255',
-            'phone' => ['string', 'regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
-            'email_verified_at' => 'date'
-        ];
-    }
-}

app/Http/Requests/UserUpdateRequest.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserUpdateRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'username' => 'string|max:255|min:6|unique:users',
-            'first_name' => 'string|max:255|min:2',
-            'last_name' => 'string|max:255|min:2',
-            'email' => 'string|email|max:255',
-            'phone' => ['nullable','regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
-            'password' => 'string|min:8'
-        ];
-    }
-}

app/Http/Requests/UserVerifyEmailRequest.php

@@ -12,11 +12,11 @@ class UserVerifyEmailRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'code' => 'required|digits:6',
-            'captcha_token' => [new Recaptcha()],
+            // 'captcha_token' => [new Recaptcha()],
         ];
     }
 }

app/Jobs/MediaWorkerJob.php

@@ -0,0 +1,393 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Media;
+use App\Models\MediaJob;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use FFMpeg;
+use FFMpeg\Coordinate\Dimension;
+use FFMpeg\FFProbe;
+use FFMpeg\Format\VideoInterface;
+use Intervention\Image\Facades\Image;
+
+/** @property on $format */
+class MediaWorkerJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    /**
+     * MediaJob item
+     *
+     * @var MediaJob
+     */
+    protected $mediaJob;
+
+
+    /**
+     * Create a new job instance.
+     *
+     * @param MediaJob $mediaJob The mediaJob model.
+     * @return void
+     */
+    public function __construct(MediaJob $mediaJob)
+    {
+        $this->mediaJob = $mediaJob;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle(): void
+    {
+        $media = $this->mediaJob->media()->first();
+        $newMedia = false;
+        $data = json_decode($this->mediaJob->data, true);
+
+        try {
+            // FILE
+            if (array_key_exists('file', $data) === true) {
+                if (file_exists($data['file']) === false) {
+                    $this->throwMediaJobFailure('temporary upload file no longer exists');
+                }
+
+                // convert HEIC files to JPG
+                $fileExtension = File::extension($data['file']);
+                if ($fileExtension === 'heic') {
+                    $this->mediaJob->setStatusProcessing(0, 0, 'converting image');
+
+                    // Get the path without the file name
+                    $uploadedFileDirectory = dirname($data['file']);
+
+                    // Convert the HEIC file to JPG
+                    $jpgFileName = pathinfo($data['file'], PATHINFO_FILENAME) . '.jpg';
+                    $jpgFilePath = $uploadedFileDirectory . '/' . $jpgFileName;
+                    if (file_exists($jpgFilePath) === true) {
+                        $this->throwMediaJobFailure('file already exists on server');
+                    }
+
+                    Image::make($data['file'])->save($jpgFilePath);
+
+                    // Update the uploaded file path and file name
+                    unlink($data['file']);
+                    $data['file'] = $jpgFileName;
+                }//end if
+
+                // get security
+                $security = [];
+                if ($media === null) {
+                    if (array_key_exists('security', $data) === true) {
+                        $security = $data['security'];
+                    }
+                } else {
+                    $security['type'] = $media->security_type;
+                    $security['data'] = $media->security_data;
+                }
+
+                // get storage
+                $storage = '';
+                if ($media === null) {
+                    if (array_key_exists('storage', $data) === true) {
+                        $storage = $data['storage'];
+                    }
+                } else {
+                    $storage = $media->storage;
+                }
+
+                if ($storage === '') {
+                    if (count($security) === 0 || $security['type'] === '') {
+                        if (strpos($data['mime_type'], 'image/') === 0) {
+                            $storage = 'local';
+                        } else {
+                            $storage = 'cdn';
+                        }
+                    } else {
+                        $storage = 'private';
+                    }
+                }
+
+                // Check if file already exists
+                $exists = Storage::disk($storage)->exists($data['name']);
+                if ($exists === true) {
+                    if (array_key_exists('noreplace', $data) === true && isTrue($data['noreplace']) === true) {
+                        $this->throwMediaJobFailure('file already exists on server');
+                    }
+                }
+
+                if ($exists === true) {
+                    $pathInfo = pathinfo($data['name']);
+                    $basename = $pathInfo['filename'];
+                    $extension = $pathInfo['extension'];
+                    $index = 0;
+
+                    do {
+                        $index++;
+                        $data['name'] = $basename . '-' . $index . '.' . $extension;
+                    } while (Storage::disk($storage)->exists($data['name']) === true);
+                }
+
+                if ($media === null) {
+                    $newMedia = true;
+                    $media = new Media([
+                        'user_id' => $this->mediaJob->user_id,
+                        'title' => $data['title'],
+                        'name' => $data['name'],
+                        'mime_type' => $data['mime_type'],
+                        'size' => $data['size'],
+                        'security_type' => $data['security']['type'],
+                        'security_data' => $data['security']['data'],
+                        'storage' => $storage,
+                    ]);
+                }//end if
+
+                $media->setStagingFile($data['file']);
+            } else {
+                if ($media === null) {
+                    $this->throwMediaJobFailure('The media item no longer exists');
+                }
+            }//end if
+
+            if (array_key_exists('transform', $data) === true) {
+                $media->createStagingFile();
+
+                // Modifications
+                if (strpos($media->mime_type, 'image/') === 0) {
+                    $modified = false;
+                    $image = Image::make($media->getStagingFilePath());
+
+                    // ROTATE
+                    if (array_key_exists("rotate", $data['transform']) === true) {
+                        $rotate = intval($data['transform']['rotate']);
+                        if ($rotate !== 0) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'rotating image');
+                            $image = $image->rotate($rotate);
+                            $modified = true;
+                        }
+                    }
+
+                    // FLIP-H/V
+                    if (array_key_exists('flip', $data['transform']) === true) {
+                        if (stripos($data['transform']['flip'], 'h') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping image');
+                            $image = $image->flip('h');
+                            $modified = true;
+                        }
+
+                        if (stripos($data['transform']['flip'], 'v') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping image');
+                            $image = $image->flip('v');
+                            $modified = true;
+                        }
+                    }
+
+                    // CROP
+                    if (array_key_exists("crop", $data['transform']) === true) {
+                        $cropData = $data['transform']['crop'];
+                        $width = intval(arrayDefaultValue("width", $cropData, $image->getWidth()));
+                        $height = intval(arrayDefaultValue("height", $cropData, $image->getHeight()));
+                        $x = intval(arrayDefaultValue("x", $cropData, 0));
+                        $y = intval(arrayDefaultValue("y", $cropData, 0));
+
+                        $this->mediaJob->setStatusProcessing(0, 0, 'cropping image');
+                        $image = $image->crop($width, $height, $x, $y);
+                        $modified = true;
+                    }//end if
+
+                    if ($modified === true) {
+                        $image->save();
+                    }
+                } elseif (strpos($data['mime_type'], 'video/') === 0) {
+                    $stagingFilePath = $media->getStagingFilePath();
+                    $ffmpeg = FFMpeg\FFMpeg::create();
+                    $video = $ffmpeg->open($stagingFilePath);
+                    $format = $this->detectVideoFormat($stagingFilePath);
+                    $modified = false;
+
+                    if ($format === null) {
+                        $this->mediaJob->setStatusFailed('Unsupported video format');
+                        return;
+                    }
+
+                    /** @var FFMpeg\Media\Video::filters */
+                    $filters = $video->filters();
+
+                    // ROTATE
+                    if (array_key_exists("rotate", $data['transform']) === true) {
+                        $rotate = intval($data['transform']['rotate']);
+                        $rotate = (($rotate % 360 + 360) % 360); // remove excess rotations
+                        $rotate = intval(round($rotate / 90) * 90); // round to nearest 90%
+
+                        if ($rotate > 0) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'rotating video');
+
+                            if ($rotate === 90) {
+                                $filters->rotate(FFMpeg\Filters\Video\RotateFilter::ROTATE_270);
+                                $modified = true;
+                            } elseif ($rotate === 180) {
+                                $filters->rotate(FFMpeg\Filters\Video\RotateFilter::ROTATE_180);
+                                $modified = true;
+                            } elseif ($rotate === 270) {
+                                $filters->rotate(FFMpeg\Filters\Video\RotateFilter::ROTATE_90);
+                                $modified = true;
+                            }
+                        }
+                    }
+
+                    // FLIP-H/V
+                    if (array_key_exists('flip', $data['transform']) === true) {
+                        if (stripos($data['transform']['flip'], 'h') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping video');
+                            $filters->hflip()->synchronize();
+                            $modified = true;
+                        }
+
+                        if (stripos($data['transform']['flip'], 'v') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping video');
+                            $filters->vflip()->synchronize();
+                            $modified = true;
+                        }
+                    }
+
+                    // CROP
+                    if (array_key_exists("crop", $data['transform']) === true) {
+                        $cropData = $data['transform']['crop'];
+                        $videoStream = $video->getStreams()->videos()->first();
+
+                        $width = intval(arrayDefaultValue("width", $cropData, $videoStream->get('width')));
+                        $height = intval(arrayDefaultValue("height", $cropData, $videoStream->get('height')));
+                        $x = intval(arrayDefaultValue("x", $cropData, 0));
+                        $y = intval(arrayDefaultValue("y", $cropData, 0));
+
+                        $cropDimension = new Dimension($width, $height);
+
+                        $this->mediaJob->setStatusProcessing(0, 0, 'cropping video');
+                        $filters->crop($cropDimension, $x, $y)->synchronize();
+                        $modified = true;
+                    }//end if
+
+                    $tempFilePath = generateTempFilePath(pathinfo($stagingFilePath, PATHINFO_EXTENSION));
+                    if (method_exists($format, 'on') === true) {
+                        $mediaJob = $this->mediaJob;
+                        $format->on('progress', function ($video, $format, $percentage) use ($mediaJob) {
+                            $mediaJob->setStatusProcessing($percentage, 100, 'transcoded');
+                        });
+                    }
+
+                    if ($modified === true) {
+                        $video->save($format, $tempFilePath);
+                        $media->changeStagingFile($tempFilePath);
+                    }
+                }//end if
+            }//end if
+
+            // Update attributes
+            if (array_key_exists('title', $data) === true) {
+                $media->title = $data['title'];
+            }
+
+            // Relocate file (if requested)
+            if (array_key_exists('security', $data) === true && array_key_exists('type', $data['security']) === true) {
+                $media->security_type = $data['security']['type'];
+                $media->security_data = $data['security']['data'];
+            }
+
+            if (array_key_exists('storage', $data) === true) {
+                if ($media->storage !== $data['storage']) {
+                    $media->createStagingFile();
+                    Storage::disk($media->storage)->delete($media->name);
+                    $media->storage = $data['storage'];
+                }
+            }
+
+            // Finish media object
+            if ($media->hasStagingFile() === true) {
+                $this->mediaJob->setStatusProcessing(0, 0, 'transferring to cdn');
+                $media->deleteFile();
+                $media->saveStagingFile(true);
+            }
+
+            $media->save();
+            $this->mediaJob->media_id = $media->id;
+            $this->mediaJob->setStatusComplete();
+        } catch (\Exception $e) {
+            if ($this->mediaJob->status !== 'failed') {
+                $this->mediaJob->setStatusFailed('Unexpected server error occurred');
+            }
+
+            if ($media !== null) {
+                $media->deleteStagingFile();
+                if ($newMedia === true) {
+                    $media->delete();
+                }
+            }
+
+            Log::error($e->getMessage() . "\n" . $e->getFile() . " - " . $e->getLine() . "\n" . $e->getTraceAsString());
+            $this->fail($e);
+        }//end try
+    }
+
+    /**
+     * Detects the format of a video using FFProbe
+     *
+     * @param string $videoPath The video file path.
+     * @return VideoInterface | null
+     */
+    public function detectVideoFormat(string $videoPath): VideoInterface | null
+    {
+        $ffprobe = FFProbe::create();
+
+        $videoStream = $ffprobe
+            ->streams($videoPath)  // Provide the path to the video file
+            ->videos()             // Filter video streams
+            ->first();
+
+        $codecName = $videoStream->get('codec_name');
+
+        $codecToFormatClass = [
+            'h264' => 'FFMpeg\Format\Video\X264',
+            'wmv2' => 'FFMpeg\Format\Video\WMV',
+            'vp9'  => 'FFMpeg\Format\Video\WebM',
+            'theora' => 'FFMpeg\Format\Video\Ogg',
+            'mpeg4' => 'FFMpeg\Format\Video\Mpeg4',
+            // Add more mappings as needed
+        ];
+
+        if (isset($codecToFormatClass[$codecName]) === false) {
+            Log::info("Unsupported codec: $codecName");
+            return null;
+        }
+
+        $formatClassName = $codecToFormatClass[$codecName];
+
+        if (class_exists($formatClassName) === false) {
+            Log::info("Format class does not exist: $formatClassName");
+            return null;
+        }
+
+        return new $formatClassName();
+    }
+
+    /**
+     * Set failure status of MediaJob and throw exception.
+     *
+     * @param string $error The failure message.
+     * @return void
+     */
+    private function throwMediaJobFailure(string $error): void
+    {
+        $this->mediaJob->setStatusFailed($error);
+        throw new \Exception($error);
+    }
+}

app/Jobs/SendEmailJob.php

@@ -50,7 +50,7 @@ class SendEmailJob implements ShouldQueue
      *
      * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         Mail::to($this->to)->send($this->mailable);
     }

app/Mail/ChangeEmailVerify.php

@@ -55,9 +55,9 @@ class ChangeEmailVerify extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👋🏻 Lets change your email!',
@@ -67,9 +67,9 @@ class ChangeEmailVerify extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.change_email_verify',

app/Mail/ChangedEmail.php

@@ -55,9 +55,9 @@ class ChangedEmail extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👍 Your email has been changed!',
@@ -67,9 +67,9 @@ class ChangedEmail extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.changed_email',

app/Mail/ChangedPassword.php

@@ -37,9 +37,9 @@ class ChangedPassword extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👍 Your password has been changed!',
@@ -49,9 +49,9 @@ class ChangedPassword extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.changed_password',

app/Mail/Contact.php

@@ -54,9 +54,9 @@ class Contact extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: config('contact.contact_subject'),
@@ -66,9 +66,9 @@ class Contact extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.contact',

app/Mail/EmailVerify.php

@@ -46,9 +46,9 @@ class EmailVerify extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👋🏻 Welcome to STEMMechanics!',
@@ -58,9 +58,9 @@ class EmailVerify extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.email_verify',

app/Mail/ExceptionMail.php

@@ -9,52 +9,51 @@ use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 
-class ForgotUsername extends Mailable
+class ExceptionMail 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)
+    public function __construct()
     {
-        $this->usernames = $usernames;
+        //
     }
 
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
-            subject: '🤦 Forgot your username?',
+            subject: 'Exception Mail',
         );
     }
 
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
-            view: 'emails.user.forgot_username',
+            view: 'view.name',
-            text: 'emails.user.forgot_username_plain',
         );
     }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
 }

app/Mail/ForgotPassword.php

@@ -46,9 +46,9 @@ class ForgotPassword extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '🤦 Forgot your password?',
@@ -58,9 +58,9 @@ class ForgotPassword extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.forgot_password',

app/Mail/SubscriptionConfirm.php

@@ -37,9 +37,9 @@ class SubscriptionConfirm extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '🗞️ You\'re on the mailing list!',
@@ -49,9 +49,9 @@ class SubscriptionConfirm extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.subscription_confirm',

app/Mail/SubscriptionUnsubscribed.php

@@ -37,9 +37,9 @@ class SubscriptionUnsubscribed extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: 'You have been unsubscribed',
@@ -49,9 +49,9 @@ class SubscriptionUnsubscribed extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.subscription_unsubscribed',

app/Models/Analytics.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Analytics extends Model
-{
-    use HasFactory;
-
-    /**
-     * The attributes that aren't mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = [];
-}

app/Models/AnalyticsItemRequest.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class AnalyticsItemRequest extends Model
+{
+    use HasFactory;
+
+    /**
+     * The table name
+     *
+     * @var string
+     */
+    protected $table = 'analytics_requests';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'type',
+        'path'
+    ];
+
+
+    /**
+     * Model Boot.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function (AnalyticsItemRequest $analytics) {
+            if (isset($analytics->session_id) !== true) {
+                $request = request();
+                if ($request !== null) {
+                    $session = AnalyticsSession::where('ip', $request->ip())
+                        ->where('useragent', $request->userAgent())
+                        ->where('ended_at', '>=', now()->subMinutes(30))
+                        ->first();
+                    if ($session === null) {
+                        $session = AnalyticsSession::create([
+                            'ip'    => $request->ip(),
+                            'useragent' => $request->userAgent(),
+                            'ended_at'  => now()
+                        ]);
+                    } else {
+                        $session->update(['ended_at' => now()]);
+                    }
+
+                    $analytics->session_id = $session->id;
+                }
+            }//end if
+        });
+    }
+
+    /**
+     * Return the Analytics Session model.
+     *
+     * @return BelongsTo
+     */
+    public function session(): BelongsTo
+    {
+        return $this->belongsTo(AnalyticsSession::class, 'id', 'session_id');
+    }
+}

app/Models/AnalyticsSession.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class AnalyticsSession extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'ip',
+        'useragent',
+        'ended_at'
+    ];
+
+    /**
+     * Set the "useragent" attribute.
+     *
+     * @param  mixed  $value
+     * @return void
+     */
+    public function setUseragentAttribute($value)
+    {
+        $this->attributes['useragent'] = $value !== null ? $value : '';
+    }
+    
+    /**
+     * Returns the related requests for this session.
+     * 
+     * @return Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function requests(): HasMany {
+        return $this->hasMany(AnalyticsItemRequest::class, 'session_id', 'id');
+    }
+    
+}

app/Models/Article.php

@@ -2,14 +2,19 @@
 
 namespace App\Models;
 
+use App\Traits\HasAttachments;
+use App\Traits\HasGallery;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class Post extends Model
+class Article extends Model
 {
     use HasFactory;
     use Uuids;
+    use HasGallery;
+    use HasAttachments;
 
     /**
      * The attributes that are mass assignable.
@@ -27,11 +32,11 @@ class Post extends Model
 
 
     /**
-     * Get the file user
+     * Get the article user
      *
-     * @return BelongsTo
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function user()
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }

app/Models/Attachment.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Facades\Cache;
+
+class Attachment extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'media_id',
+        'private',
+    ];
+
+    /**
+     * The default attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'private' => false,
+    ];
+
+
+    /**
+     * Get the media for this attachment.
+     *
+     * @return BelongsTo
+     */
+    public function media(): BelongsTo
+    {
+        return $this->belongsTo(Media::class);
+    }
+
+    /**
+     * Get associated Media object.
+     *
+     * @return null|Media
+     */
+    public function getMediaAttribute(): ?Media
+    {
+        $mediaId = '0';
+        $media = null;
+
+        if (Cache::has("attachment:{$this->id}:media") === true) {
+            $mediaId = Cache::get("attachment:{$this->id}:media");
+        } else {
+            $media = $this->media()->first();
+            if ($media === null) {
+                return null;
+            }
+
+            $mediaId = $media->id;
+            Cache::put("attachment:{$this->id}:media", $mediaId, now()->addDays(28));
+        }
+
+        return Cache::remember("media:{$mediaId}", now()->addDays(28), function () use ($media) {
+            if ($media !== null) {
+                return $media;
+            }
+
+            return $this->media()->first();
+        });
+    }
+
+    /**
+     * Set the media for this item.
+     *
+     * @param Media $media The media model.
+     * @return void
+     */
+    public function setMediaAttribute(Media $media): void
+    {
+        $this->media()->associate($media)->save();
+        Cache::put("attachment:{$this->id}:media", $media->id, now()->addDays(28));
+    }
+}

app/Models/Event.php

@@ -2,12 +2,16 @@
 
 namespace App\Models;
 
+use App\Traits\HasAttachments;
 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
 {
+    use HasAttachments;
     use HasFactory;
     use Uuids;
 
@@ -19,6 +23,7 @@ class Event extends Model
     protected $fillable = [
         'title',
         'location',
+        'location_url',
         'address',
         'start_at',
         'end_at',
@@ -27,6 +32,20 @@ class Event extends Model
         'registration_type',
         'registration_data',
         'hero',
-        'content'
+        'content',
+        'price',
+        'ages',
+        'open_at',
     ];
+
+
+    /**
+     * Get all the associated users.
+     *
+     * @return BelongsToMany
+     */
+    public function users(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'event_user', 'event_id', 'user_id');
+    }
 }

app/Models/EventUsers.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\Uuids;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+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 Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function event(): BelongsTo
+    {
+        return $this->belongsTo(Event::class);
+    }
+
+    /**
+     * Get the user for this attachment.
+     *
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}

app/Models/Gallery.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\Uuids;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Support\Facades\Cache;
+
+class Gallery extends Model
+{
+    use HasFactory;
+    use Uuids;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'media_id',
+    ];
+
+
+    /**
+     * Boot the model.
+     *
+     * @return void
+     */
+    protected static function boot(): void
+    {
+        parent::boot();
+
+        $clearCache = function ($gallery) {
+            Cache::forget("gallery:{$gallery->id}:media");
+        };
+
+        static::saving($clearCache);
+        static::deleting($clearCache);
+    }
+
+    /**
+     * Get gallery addendum model.
+     *
+     * @return Illuminate\Database\Eloquent\Relations\MorphTo Addenum model.
+     */
+    public function addendum(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * Get the media for this item.
+     *
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo The media model.
+     */
+    public function media(): BelongsTo
+    {
+        return $this->belongsTo(Media::class);
+    }
+
+    /**
+     * Get the media for this item.
+     *
+     * @return null|Media The media model.
+     */
+    public function getMediaAttribute(): ?Media
+    {
+        $mediaId = '0';
+        $media = null;
+
+        if (Cache::has("gallery:{$this->id}:media") === true) {
+            $mediaId = Cache::get("gallery:{$this->id}:media");
+        } else {
+            $media = $this->media()->first();
+            if ($media === null) {
+                return null;
+            }
+
+            $mediaId = $media->id;
+            Cache::put("gallery:{$this->id}:media", $mediaId, now()->addDays(28));
+        }
+
+        return Cache::remember("media:{$mediaId}", now()->addDays(28), function () use ($media) {
+            if ($media !== null) {
+                return $media;
+            }
+
+            return $this->media()->first();
+        });
+    }
+
+    /**
+     * Set the media for this item.
+     *
+     * @param Media $media The media model.
+     * @return void
+     */
+    public function setMediaAttribute(Media $media): void
+    {
+        $this->media()->associate($media)->save();
+        Cache::put("gallery:{$this->id}:media", $media->id, now()->addDays(28));
+    }
+}