From e489d4dee17a5e4eba44cf17e28b30da95bd40bd Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Tue, 28 Nov 2023 05:41:27 -0600
Subject: [PATCH 01/28] Fix various UI issues

---
 resources/views/cruds/fields/colour.blade.php               | 2 +-
 resources/views/entities/components/_post.blade.php         | 2 +-
 resources/views/entities/components/_post_layouts.blade.php | 2 +-
 resources/views/entities/headers/_character.blade.php       | 2 +-
 resources/views/entities/pages/image/focus.blade.php        | 4 +++-
 resources/views/timelines/_element.blade.php                | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/views/cruds/fields/colour.blade.php b/resources/views/cruds/fields/colour.blade.php
index 0bb6311527..a3c45bf69f 100644
--- a/resources/views/cruds/fields/colour.blade.php
+++ b/resources/views/cruds/fields/colour.blade.php
@@ -1,3 +1,3 @@
 <x-forms.field field="colour" :required="true" :label="__('crud.fields.colour')">
-    {!! Form::select('colour', FormCopy::colours(), FormCopy::field('colour')->string(), ['class' => 'w-full select2-colour']) !!}
+    {!! Form::select('colour', FormCopy::colours(), FormCopy::field('colour')->string(), ['class' => 'w-full select2-colour', 'style' => 'width: 100%']) !!}
 </x-forms.field>
diff --git a/resources/views/entities/components/_post.blade.php b/resources/views/entities/components/_post.blade.php
index 660816c9ed..b44f6bf14a 100644
--- a/resources/views/entities/components/_post.blade.php
+++ b/resources/views/entities/components/_post.blade.php
@@ -25,7 +25,7 @@
                 <div class="dropdown">
                     <a role="button" class="btn2 btn-ghost btn-sm" data-dropdown aria-expanded="false" data-placement="right" data-tree="escape">
                         <x-icon class="fa-solid fa-ellipsis-v"></x-icon>
-                        <span class="sr-only">{{__('crud.actions.actions') }}'</span>
+                        <span class="sr-only">{{__('crud.actions.actions') }}</span>
                     </a>
                     <div class="dropdown-menu hidden" role="menu">
                         @include('entities.pages.posts._actions')
diff --git a/resources/views/entities/components/_post_layouts.blade.php b/resources/views/entities/components/_post_layouts.blade.php
index ee4606d73b..797289fd5e 100644
--- a/resources/views/entities/components/_post_layouts.blade.php
+++ b/resources/views/entities/components/_post_layouts.blade.php
@@ -19,7 +19,7 @@
                 <div class="dropdown">
                     <a role="button" class="btn2 btn-ghost btn-sm" data-dropdown aria-expanded="false" data-tree="escape">
                         <x-icon class="fa-solid fa-ellipsis-v" />
-                        <span class="sr-only">{{__('crud.actions.actions') }}'</span>
+                        <span class="sr-only">{{__('crud.actions.actions') }}</span>
                     </a>
                     <div class="dropdown-menu hidden" role="menu">
                         @include('entities.pages.posts._actions')
diff --git a/resources/views/entities/headers/_character.blade.php b/resources/views/entities/headers/_character.blade.php
index e1a861699c..1ad65cace6 100644
--- a/resources/views/entities/headers/_character.blade.php
+++ b/resources/views/entities/headers/_character.blade.php
@@ -8,7 +8,7 @@
 
 <div class="entity-header-sub entity-header-line">
     <div class="entity-header-sub-element">
-        <x-icon entity="character" />
+        <x-icon :class="\App\Facades\Module::duoIcon('location')" :title="__('entities.location')" />
 
         @if ($model->location->location)
             {!! __('crud.fields.locations', [
diff --git a/resources/views/entities/pages/image/focus.blade.php b/resources/views/entities/pages/image/focus.blade.php
index 3e8dc04ef7..5f0d7f33b0 100644
--- a/resources/views/entities/pages/image/focus.blade.php
+++ b/resources/views/entities/pages/image/focus.blade.php
@@ -19,7 +19,7 @@
     @if ($campaign->boosted())
         @if($campaign->superboosted() && empty($entity->image_path) && !empty($entity->image_uuid))
             <x-alert type="warning">
-                {!! __('entities/image.focus.warning_v2', ['gallery' => link_to_route('campaign.gallery.index', __('sidebar.gallery'), $campaign)]) !!}
+                <p>{!! __('entities/image.focus.warning_v2', ['gallery' => link_to_route('campaign.gallery.index', __('sidebar.gallery'), $campaign)]) !!}</p>
             </x-alert>
             <p>
                 <a href="{{ $model->getLink() }}">
@@ -57,9 +57,11 @@
 
     @else
         <x-alert type="warning">
+            <p>
             {!! __('entities/image.focus.unboosted', [
     'boosted-campaigns' => link_to('https://' . config('domains.front') . '/pricing', __('concept.premium-campaigns'), ['#premium'])
 ]) !!}
+            </p>
         </x-alert>
         <a href="{{ $model->getLink() }}">
             <x-icon class="fa-regular fa-arrow-left"></x-icon>
diff --git a/resources/views/timelines/_element.blade.php b/resources/views/timelines/_element.blade.php
index 5958dfaff1..08113d7b6d 100644
--- a/resources/views/timelines/_element.blade.php
+++ b/resources/views/timelines/_element.blade.php
@@ -30,7 +30,7 @@
                         <div class="dropdown inline">
                             <a class="btn2 btn-xs btn-ghost" data-dropdown aria-expanded="false" data-placement="right" data-tree="escape">
                                 <i class="fa-solid fa-ellipsis-v" aria-hidden="true"></i>
-                                <span class="sr-only">{{__('crud.actions.actions') }}'</span>
+                                <span class="sr-only">{{__('crud.actions.actions') }}</span>
                             </a>
                             <div class="dropdown-menu hidden" role="menu">
                                 <x-dropdowns.item

From efaf33268d44b3cd95aea27989374eedcbe4f080 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Tue, 28 Nov 2023 05:45:19 -0600
Subject: [PATCH 02/28] Calendar dashboard: fix tooltips

---
 ...oard-cb1e1518.js => dashboard-b75543d4.js} |  2 +-
 public/build/manifest.json                    |  2 +-
 resources/js/dashboard.js                     | 19 +++++++++----------
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename public/build/assets/{dashboard-cb1e1518.js => dashboard-b75543d4.js} (50%)

diff --git a/public/build/assets/dashboard-cb1e1518.js b/public/build/assets/dashboard-b75543d4.js
similarity index 50%
rename from public/build/assets/dashboard-cb1e1518.js
rename to public/build/assets/dashboard-b75543d4.js
index 03280a2a89..df3aaec55b 100644
--- a/public/build/assets/dashboard-cb1e1518.js
+++ b/public/build/assets/dashboard-b75543d4.js
@@ -1 +1 @@
-import{S as l}from"./sortable.esm-be94e56d.js";var d=new IntersectionObserver(function(t){t.forEach(e=>{e.isIntersecting&&f(t[0].target)})},{threshold:[0]});$(document).ready(function(){$("[data-render]").length>0&&document.querySelectorAll("[data-render]").forEach(t=>{t&&d.observe(t)}),$(".preview-switch").click(function(t){t.preventDefault();var e=$("#widget-preview-body-"+$(this).data("widget"));e.hasClass("max-h-52")?(e.removeClass("max-h-52"),$(this).html('<i class="fa-solid fa-chevron-up"></i>'),$(this).parent().find(".gradient-to-base-100").hide()):(e.addClass("max-h-52"),$(this).html('<i class="fa-solid fa-chevron-down"></i>'),$(this).parent().find(".gradient-to-base-100").show())}),$(".campaign-dashboard-widgets").length===1&&r(),s(),o(),h(),u(),w()});const r=()=>{let t=document.getElementById("widgets");new l(t,{handle:".handle",onEnd:function(e){$.post({url:$("#widgets").data("url"),dataType:"json",data:$('input[name="widgets[]"]').serialize()}).done(function(n){n.success&&n.message&&window.showToast(n.message)})}}),$(document).on("shown.bs.modal",function(){$("#summernote-config").length>0&&window.initSummernote(),$.each($('[data-img="delete"]'),function(){$(this).click(function(n){n.preventDefault(),$("input[name="+$(this).data("target")+"]")[0].value=1,$(this).parent().parent().hide()})})})},s=()=>{document.querySelectorAll(".widget-recent-more").forEach(e=>{e.addEventListener("click",c)})};function c(t){t.preventDefault(),$(this).find(".spinner").show(),$(this).find("span").hide(),$.ajax({url:$(this).data("url"),context:this}).done(function(e){$(this).closest(".widget-recent-list").append(e),$(this).remove(),s(),window.ajaxTooltip()})}const o=()=>{$(".widget-calendar-switch").unbind("click").click(function(t){t.preventDefault();let e=$(this).data("url"),n=$(this).data("widget");$("#widget-body-"+n).hide(),$("#widget-loading-"+n).show(),$.ajax({url:e,method:"POST",context:this}).done(function(i){if(i){let a=$(this).data("widget");$("#widget-loading-"+a).hide(),$("#widget-body-"+a).html(i).show(),window.ajaxTooltip(),o()}})})},h=()=>{const t=$("#campaign-follow"),e=$("#campaign-follow-text");if(t.length!==1)return;t.data("following")?e.html(t.data("unfollow")):e.html(t.data("follow")),t.show(),t.click(function(i){i.preventDefault(),$.post({url:$(this).data("url"),method:"POST"}).done(function(a){a.following?e.html(t.data("unfollow")):e.html(t.data("follow"))})})},u=()=>{$.each($('[data-toggle="preview"]'),function(){$(this).height()===parseInt($(this).css("max-height"))?$(this).next().removeClass("hidden"):$(this).removeClass("pinned-entity preview")})};function f(t){t=$(t),$.ajax({url:t.data("render"),context:this}).done(function(e){let n=t.data("id");$("#widget-loading-"+n).hide(),$("#widget-body-"+n).html(e).show(),window.ajaxTooltip(),o()})}function w(){document.querySelectorAll("[data-pulse]").forEach(t=>{t.addEventListener("click",m)})}function m(t){t.preventDefault();let e=document.querySelector(this.dataset.pulse),n=this.dataset.content;window.showTooltip(e,{content:n,theme:"kanka",placement:"bottom",allowHTML:!0,arrow:!0,interactive:!0,trigger:"manual"})}
+import{S as d}from"./sortable.esm-be94e56d.js";var l=new IntersectionObserver(function(t){t.forEach(e=>{e.isIntersecting&&f(t[0].target)})},{threshold:[0]});$(document).ready(function(){$("[data-render]").length>0&&document.querySelectorAll("[data-render]").forEach(t=>{t&&l.observe(t)}),$(".preview-switch").click(function(t){t.preventDefault();var e=$("#widget-preview-body-"+$(this).data("widget"));e.hasClass("max-h-52")?(e.removeClass("max-h-52"),$(this).html('<i class="fa-solid fa-chevron-up"></i>'),$(this).parent().find(".gradient-to-base-100").hide()):(e.addClass("max-h-52"),$(this).html('<i class="fa-solid fa-chevron-down"></i>'),$(this).parent().find(".gradient-to-base-100").show())}),$(".campaign-dashboard-widgets").length===1&&r(),s(),a(),h(),u(),m()});const r=()=>{let t=document.getElementById("widgets");new d(t,{handle:".handle",onEnd:function(e){$.post({url:$("#widgets").data("url"),dataType:"json",data:$('input[name="widgets[]"]').serialize()}).done(function(n){n.success&&n.message&&window.showToast(n.message)})}}),$(document).on("shown.bs.modal",function(){$("#summernote-config").length>0&&window.initSummernote(),$.each($('[data-img="delete"]'),function(){$(this).click(function(n){n.preventDefault(),$("input[name="+$(this).data("target")+"]")[0].value=1,$(this).parent().parent().hide()})})})},s=()=>{document.querySelectorAll(".widget-recent-more").forEach(e=>{e.addEventListener("click",c)})};function c(t){t.preventDefault(),$(this).find(".spinner").show(),$(this).find("span").hide(),$.ajax({url:$(this).data("url"),context:this}).done(function(e){$(this).closest(".widget-recent-list").append(e),$(this).remove(),s(),window.ajaxTooltip()})}const a=()=>{$(".widget-calendar-switch").unbind("click").click(function(t){t.preventDefault();let e=$(this).data("url"),n=$(this).data("widget");$("#widget-body-"+n).hide(),$("#widget-loading-"+n).show(),$.ajax({url:e,method:"POST",context:this}).done(function(i){if(!i)return;let o=$(this).data("widget");$("#widget-loading-"+o).hide(),$("#widget-body-"+o).html(i).show(),$(document).trigger("shown.bs.modal"),a()})})},h=()=>{const t=$("#campaign-follow"),e=$("#campaign-follow-text");if(t.length!==1)return;t.data("following")?e.html(t.data("unfollow")):e.html(t.data("follow")),t.show(),t.click(function(i){i.preventDefault(),$.post({url:$(this).data("url"),method:"POST"}).done(function(o){o.following?e.html(t.data("unfollow")):e.html(t.data("follow"))})})},u=()=>{$.each($('[data-toggle="preview"]'),function(){$(this).height()===parseInt($(this).css("max-height"))?$(this).next().removeClass("hidden"):$(this).removeClass("pinned-entity preview")})};function f(t){t=$(t),$.ajax({url:t.data("render"),context:this}).done(function(e){let n=t.data("id");$("#widget-loading-"+n).hide(),$("#widget-body-"+n).html(e).show(),$(document).trigger("shown.bs.modal"),a()})}function m(){document.querySelectorAll("[data-pulse]").forEach(t=>{t.addEventListener("click",w)})}function w(t){t.preventDefault();let e=document.querySelector(this.dataset.pulse),n=this.dataset.content;window.showTooltip(e,{content:n,theme:"kanka",placement:"bottom",allowHTML:!0,arrow:!0,interactive:!0,trigger:"manual"})}
diff --git a/public/build/manifest.json b/public/build/manifest.json
index 9ea3e3369f..eec809131a 100644
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@@ -140,7 +140,7 @@
     "src": "resources/js/cookieconsent.js"
   },
   "resources/js/dashboard.js": {
-    "file": "assets/dashboard-cb1e1518.js",
+    "file": "assets/dashboard-b75543d4.js",
     "imports": [
       "_sortable.esm-be94e56d.js"
     ],
diff --git a/resources/js/dashboard.js b/resources/js/dashboard.js
index f0ab26855a..c5f5303438 100644
--- a/resources/js/dashboard.js
+++ b/resources/js/dashboard.js
@@ -129,15 +129,15 @@ const initDashboardCalendars = () => {
             method: 'POST',
             context: this
         }).done(function(data) {
-            if (data) {
-                // Redirect page
-                let widget = $(this).data('widget');
-                $('#widget-loading-' + widget).hide();
-                $('#widget-body-' + widget).html(data).show();
-                /*$('[data-toggle="tooltip"]').tooltip();*/
-                window.ajaxTooltip();
-                initDashboardCalendars();
+            if (!data) {
+                return;
             }
+            // Redirect page
+            let widget = $(this).data('widget');
+            $('#widget-loading-' + widget).hide();
+            $('#widget-body-' + widget).html(data).show();
+            $(document).trigger('shown.bs.modal');
+            initDashboardCalendars();
         });
     });
 };
@@ -204,8 +204,7 @@ function renderWidget(widget) {
         $('#widget-loading-' + id).hide();
         $('#widget-body-' + id).html(res).show();
 
-        /*$('[data-toggle="tooltip"]').tooltip();*/
-        window.ajaxTooltip();
+        $(document).trigger('shown.bs.modal');
         initDashboardCalendars();
     });
 }

From 38768b4c71d8bc5fc3186faf6eb190f5a7fa7dbc Mon Sep 17 00:00:00 2001
From: Spitfire <itza305@gmail.com>
Date: Thu, 30 Nov 2023 22:11:20 -0600
Subject: [PATCH 03/28] Add multiple Abilities

---
 .../Abilities/EntityController.php            |  9 ++--
 app/Http/Requests/StoreAbilityEntity.php      |  5 +-
 app/Models/Ability.php                        | 36 +++++++-------
 lang/en/abilities.php                         |  6 +--
 resources/views/abilities/entities.blade.php  |  2 +-
 .../views/abilities/entities/_form.blade.php  | 10 ++--
 .../views/abilities/entities/create.blade.php | 12 +++--
 .../views/components/form/entities.blade.php  | 49 +++++++++++++++++++
 8 files changed, 94 insertions(+), 35 deletions(-)
 create mode 100644 resources/views/components/form/entities.blade.php

diff --git a/app/Http/Controllers/Abilities/EntityController.php b/app/Http/Controllers/Abilities/EntityController.php
index e69431623e..0f698fcad6 100644
--- a/app/Http/Controllers/Abilities/EntityController.php
+++ b/app/Http/Controllers/Abilities/EntityController.php
@@ -65,8 +65,11 @@ public function store(StoreAbilityEntity $request, Campaign $campaign, Ability $
             $redirectUrlOptions['ability_id'] = $ability->id;
         }
 
-        $ability->attachEntity($request->only('entity_id', 'visibility_id'));
+        $count = $ability->attachEntity($request->only('entities', 'visibility_id'));
+
         return redirect()->route('abilities.entities', [$campaign, 'ability' => $ability->id])
-            ->with('success', __('abilities.children.create.success', ['name' => $ability->name]));
-    }
+            //->with('success', __('abilities.children.create.success', ['name' => $ability->name]));
+            ->with('success', trans_choice('abilities.children.create.attach_success', $count, ['count' => $count, 'name' => $ability->name]));
+
+        }
 }
diff --git a/app/Http/Requests/StoreAbilityEntity.php b/app/Http/Requests/StoreAbilityEntity.php
index 4707ad0b0f..7ffebae0dc 100644
--- a/app/Http/Requests/StoreAbilityEntity.php
+++ b/app/Http/Requests/StoreAbilityEntity.php
@@ -25,8 +25,11 @@ public function rules()
     {
         return [
             'ability_id' => 'required|exists:entities,id',
-            'entity_id' => 'required|exists:entities,id|different:ability_id',
             'visibility_id' => 'required|exists:visibilities,id',
+            'entities' => 'required',
+            'entities' => [
+                '*' => 'different:ability_id|exists:entities,id',
+            ],
         ];
     }
 }
diff --git a/app/Models/Ability.php b/app/Models/Ability.php
index d9e0ef456f..f072bafcca 100644
--- a/app/Models/Ability.php
+++ b/app/Models/Ability.php
@@ -205,27 +205,29 @@ public function entryWithAttributes()
     }
 
     /**
-     * Attach an entity to the tag
+     * Attach an entity to the ability
      */
-    public function attachEntity(array $request): bool
+    public function attachEntity(array $request): int
     {
-        $entityId = Arr::get($request, 'entity_id');
-        $entity = Entity::with('abilities')->findOrFail($entityId);
-
-        // Make sure the tag isn't already attached to the entity
-        foreach ($entity->abilities as $ability) {
-            if ($ability->ability_id == $this->id) {
-                return true;
+        $entityIds = Arr::get($request, 'entities');
+        $entities = Entity::with('abilities')->findOrFail($entityIds);
+        $count = 0;
+        foreach ($entities as $entity) {
+            // Make sure the tag isn't already attached to the entity
+            foreach ($entity->abilities as $ability) {
+                if ($ability->ability_id == $this->id) {
+                    continue;
+                }
             }
-        }
 
-        $entityAbility = EntityAbility::create([
-            'ability_id' => $this->id,
-            'entity_id' => $entityId,
-            'visibility_id' => Arr::get($request, 'visibility_id', \App\Enums\Visibility::All),
-        ]);
-
-        return $entityAbility !== false;
+            EntityAbility::create([
+                'ability_id' => $this->id,
+                'entity_id' => $entity->id,
+                'visibility_id' => Arr::get($request, 'visibility_id', \App\Enums\Visibility::All),
+            ]);
+            $count++;
+        }
+        return $count;
     }
 
     /**
diff --git a/lang/en/abilities.php b/lang/en/abilities.php
index 3d175b6711..1ac86c1cae 100644
--- a/lang/en/abilities.php
+++ b/lang/en/abilities.php
@@ -3,11 +3,11 @@
 return [
     'children'      => [
         'actions'       => [
-            'add'   => 'Attach entity',
+            'attach'   => 'Attach to entities',
         ],
         'create'        => [
-            'success'   => 'Attached the ability :name to the entity.',
-            'title'     => 'Attach :name to an entity',
+            'attach_success'   => '{1} Attached the ability :name to :count entity.|[2,*] Attached the ability :name to :count entities.',
+            'modal'            => 'Attach :name to entities',
         ],
         'description'   => 'Entities having the ability',
         'title'         => 'Ability :name Entities',
diff --git a/resources/views/abilities/entities.blade.php b/resources/views/abilities/entities.blade.php
index 0cc838d83c..dcad0a94cf 100644
--- a/resources/views/abilities/entities.blade.php
+++ b/resources/views/abilities/entities.blade.php
@@ -11,7 +11,7 @@
         <div class="header-buttons inline-block ml-auto">
             <a href="{{ route('abilities.entity-add', [$campaign, $model]) }}" class="btn2 btn-sm"
                data-toggle="dialog" data-target="primary-dialog" data-url="{{ route('abilities.entity-add', [$campaign, $model]) }}">
-                <x-icon class="plus"></x-icon> <span class="hidden md:inline">{{ __('abilities.children.actions.add') }}</span>
+                <x-icon class="plus"></x-icon> <span class="hidden md:inline">{{ __('abilities.children.actions.attach') }}</span>
             </a>
         </div>
     @endcan
diff --git a/resources/views/abilities/entities/_form.blade.php b/resources/views/abilities/entities/_form.blade.php
index 166862d725..1d8668babb 100644
--- a/resources/views/abilities/entities/_form.blade.php
+++ b/resources/views/abilities/entities/_form.blade.php
@@ -2,13 +2,9 @@
 {{ csrf_field() }}
 
 <x-grid type="1/1">
-    @include('cruds.fields.entity', [
-        'required' => true,
-        'route' => 'search.ability-entities',
-        'placeholder' => __('entities/relations.placeholders.target'),
-        'preset' => false,
-        'dropdownParent' => request()->ajax() ? '#primary-dialog' : null,
-    ])
+    <x-forms.field field="entities" :required="true" >
+        @include('components.form.entities', ['options' => ['exclude-entity' => $model->entity->id]])
+    </x-forms.field>
 
     @include('cruds.fields.visibility_id', ['model' => null])
 </x-grid>
diff --git a/resources/views/abilities/entities/create.blade.php b/resources/views/abilities/entities/create.blade.php
index 0abc234738..f4151998dd 100644
--- a/resources/views/abilities/entities/create.blade.php
+++ b/resources/views/abilities/entities/create.blade.php
@@ -1,6 +1,6 @@
 <?php /** @var \App\Models\Ability $model */ ?>
 @extends('layouts.' . (request()->ajax() ? 'ajax' : 'app'), [
-    'title' => __('abilities.children.create.title', ['name' => $model->name]),
+    'title' => __('abilities.children.create.modal', ['name' => $model->name]),
     'breadcrumbs' => [
         Breadcrumb::entity($model->entity)->list(),
         Breadcrumb::show($model),
@@ -9,9 +9,15 @@
 ])
 
 @section('content')
-    {!! Form::open(['route' => $formOptions, 'method' => 'POST']) !!}
+    {!! Form::open([
+        'route' => $formOptions, 
+        'method' => 'POST',
+        'data-shortcut' => 1,
+        'class' => 'ajax-subform',
+    ]) !!}
+
     @include('partials.forms.form', [
-        'title' => __('abilities.children.create.title', ['name' => $model->name]),
+        'title' => __('abilities.children.create.modal', ['name' => $model->name]),
         'content' => 'abilities.entities._form',
         'dialog' => true,
     ])
diff --git a/resources/views/components/form/entities.blade.php b/resources/views/components/form/entities.blade.php
new file mode 100644
index 0000000000..d31ee32a14
--- /dev/null
+++ b/resources/views/components/form/entities.blade.php
@@ -0,0 +1,49 @@
+<?php
+use Illuminate\Support\Arr;
+/**
+ * We want to pre-load the data from the model, or what has been sent with the form.
+ * @var \App\Models\MiscModel $model
+ */
+$selectedOption = [];
+
+$model = Arr::get($options, 'model', null);
+$enableNew = Arr::get($options, 'enableNew', true);
+$label = Arr::get($options, 'label', true);
+
+// From source to exclude duplicates
+$searchParams = [$campaign];
+if (Arr::has($options, 'exclude', false)) {
+    $searchParams['exclude'] = Arr::get($options, 'exclude');
+} elseif (Arr::has($options, 'exclude-entity', false)) {    
+    $searchParams['exclude-entity'] = Arr::get($options, 'exclude-entity');
+}
+
+// Try to load what was sent with the form first, in case there was a form validation error
+$previous = old('entities[]');
+if (!empty($previous)) {
+    //dd($previous);
+}
+?>
+@if ($label)
+<label>
+   {{ __('abilities.show.tabs.entities') }}
+</label>
+@endif
+
+<select
+    multiple="multiple"
+    name="entities[]"
+    id="{{ Arr::get($options, 'id', 'entities[]') }}"
+    class="w-full form-tags form-entities"
+    style="width: 100%"
+    data-url="{{ route('search.ability-entities', $searchParams) }}"
+    data-allow-new="{{ $enableNew ? 'true' : 'false' }}"
+    data-allow-clear="{{ Arr::get($options, 'allowClear', 'true') }}"
+    data-new-tag="{{ __('entities.new_entity') }}"
+    data-placeholder="{{ __('entities/relations.placeholders.target') }}"
+    :dropdownParent="$dropdownParent ?? (request()->ajax() ? '#primary-dialog' : null)"
+>
+    @foreach ($selectedOption as $key => $entity)
+        <option value="{{ $key }}" class="select2-entity" selected="selected">{{ $entity->name }}</option>
+    @endforeach
+</select>

From a84a628142e4b7ebfe302770b0ff83b21b67281e Mon Sep 17 00:00:00 2001
From: spitfire305 <spitfire305@users.noreply.github.com>
Date: Fri, 1 Dec 2023 04:13:45 +0000
Subject: [PATCH 04/28] Fix styling

---
 app/Http/Controllers/Abilities/EntityController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Abilities/EntityController.php b/app/Http/Controllers/Abilities/EntityController.php
index 0f698fcad6..61fdb43ba3 100644
--- a/app/Http/Controllers/Abilities/EntityController.php
+++ b/app/Http/Controllers/Abilities/EntityController.php
@@ -71,5 +71,5 @@ public function store(StoreAbilityEntity $request, Campaign $campaign, Ability $
             //->with('success', __('abilities.children.create.success', ['name' => $ability->name]));
             ->with('success', trans_choice('abilities.children.create.attach_success', $count, ['count' => $count, 'name' => $ability->name]));
 
-        }
+    }
 }

From dce5e635fc7247295f736f14a103592a0231797f Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Fri, 1 Dec 2023 09:39:44 -0600
Subject: [PATCH 05/28] API: fix search crashing

---
 app/Http/Resources/Entity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Resources/Entity.php b/app/Http/Resources/Entity.php
index 678bd1f71c..a7ff689a6e 100644
--- a/app/Http/Resources/Entity.php
+++ b/app/Http/Resources/Entity.php
@@ -29,7 +29,7 @@ public function toArray($request)
             'id' => $model->child->id,
             'entity_id' => $model->id,
             'name' => $model->name,
-            'image' => Avatar::entity($model)->thumbnail(),
+            'image' => Avatar::entity($model)->original(),
             'image_thumb' => Avatar::entity($model)->size(40)->thumbnail(),
             'has_custom_image' => !empty($model->image_path) && !empty($model->image),
 

From ce23fa33e5e6c92e61112177e84950ab4ade1060 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Fri, 1 Dec 2023 10:06:19 -0600
Subject: [PATCH 06/28] Fix legacy editor to work in Kanka 2.0

---
 resources/views/editors/tinymce.blade.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/resources/views/editors/tinymce.blade.php b/resources/views/editors/tinymce.blade.php
index 2603938aac..6d13a16339 100644
--- a/resources/views/editors/tinymce.blade.php
+++ b/resources/views/editors/tinymce.blade.php
@@ -1,3 +1,12 @@
+
+@section('styles')
+    @parent
+    @if (config('app.asset_url'))
+        <link href="{{ config('app.asset_url') }}/vendor/bootstrap/bootstrap-summernote.css?v={{ config('app.version') }}" rel="stylesheet">
+    @else
+        <link href="/css/bootstrap-summernote.css?v={{ config('app.version') }}" rel="stylesheet">
+    @endif
+@endsection
 @section('scripts')
     @parent
     <script src="{{ '/js/tinymce/tinymce.min.js' }}"></script>
@@ -12,7 +21,7 @@
                 "searchreplace code fullscreen",
                 "insertdatetime media nonbreaking table directionality",
                 "emoticons paste textcolor colorpicker textpattern",
-                "fullpage mention media"
+                "fullpage @if(!empty($campaign)) mention @endif media"
             ],
             toolbar: "undo redo | styleselect | bold italic underline strikethrough forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | hr | link image table media | code fullscreen",
             nanospell_server: "php",

From a0e40e4be3ca5c96b67d5acc90d2d54600f81eb1 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Fri, 1 Dec 2023 10:06:38 -0600
Subject: [PATCH 07/28] Fix legacy editor to work in Kanka 2.0

---
 resources/views/editors/tinymce.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/editors/tinymce.blade.php b/resources/views/editors/tinymce.blade.php
index 6d13a16339..9652e668de 100644
--- a/resources/views/editors/tinymce.blade.php
+++ b/resources/views/editors/tinymce.blade.php
@@ -33,6 +33,7 @@
             menubar: false,
             content_css: '{{ Vite::asset('resources/sass/tinymce.scss') }}',
             extended_valid_elements: "+@[data-mention]",
+            @if (!empty($campaign))
             mentions: {
                 delimiter: ['@', '#', '['@if(!empty($model) && method_exists($model, 'hasEntity') && $model->hasEntity()), '{'@endif],
                 delay: 250,
@@ -97,6 +98,7 @@
                         '</li>';
                 }
             },
+            @endif
             save_onsavecallback: function () {
                 // Set the global dirty check off
                 window.entityFormHasUnsavedChanges = false;

From 1ef9b98cc3574706305f22a992bfbaa94bd321da Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Fri, 1 Dec 2023 10:10:32 -0600
Subject: [PATCH 08/28] Fix new default thumb button visible

---
 resources/views/campaigns/default-images/index.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/campaigns/default-images/index.blade.php b/resources/views/campaigns/default-images/index.blade.php
index af90dd4153..9f560a44b1 100644
--- a/resources/views/campaigns/default-images/index.blade.php
+++ b/resources/views/campaigns/default-images/index.blade.php
@@ -35,6 +35,7 @@
         </div>
         @if ($campaign->boosted())
             @if (empty($campaign->defaultImages()))
+                @can('recover', $campaign)
                 <x-box>
                     <a href="{{ route('campaign.default-images.create', $campaign) }}" class="btn2 btn-primary"
                        data-toggle="dialog-ajax" data-target="new-thumbnail"
@@ -43,6 +44,7 @@
                         {{ __('campaigns/default-images.actions.add') }}
                     </a>
                 </x-box>
+                @endcan
             @endif
             <div class="grid grid-cols-2 sm:grid-cols-1 gap-4 md:grid-cols-2 md:gap-5">
 

From d17e22d7c36849897b6872cefe638e374b15289c Mon Sep 17 00:00:00 2001
From: Spitfire <itza305@gmail.com>
Date: Fri, 1 Dec 2023 12:58:26 -0600
Subject: [PATCH 09/28] Implemented requested changes

---
 app/Models/Ability.php                        | 21 +++++++------------
 .../views/abilities/entities/_form.blade.php  |  7 ++++++-
 .../views/components/form/entities.blade.php  |  7 ++-----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/Models/Ability.php b/app/Models/Ability.php
index f072bafcca..c554f6b75c 100644
--- a/app/Models/Ability.php
+++ b/app/Models/Ability.php
@@ -210,23 +210,16 @@ public function entryWithAttributes()
     public function attachEntity(array $request): int
     {
         $entityIds = Arr::get($request, 'entities');
-        $entities = Entity::with('abilities')->findOrFail($entityIds);
         $count = 0;
-        foreach ($entities as $entity) {
-            // Make sure the tag isn't already attached to the entity
-            foreach ($entity->abilities as $ability) {
-                if ($ability->ability_id == $this->id) {
-                    continue;
-                }
-            }
+        $visibility = Arr::get($request, 'visibility_id', \App\Enums\Visibility::All);
+        $sync = [];
 
-            EntityAbility::create([
-                'ability_id' => $this->id,
-                'entity_id' => $entity->id,
-                'visibility_id' => Arr::get($request, 'visibility_id', \App\Enums\Visibility::All),
-            ]);
-            $count++;
+        foreach ($entityIds as $entity) {
+           $sync[$entity] = ['visibility_id' => $visibility];
+           $count++;
         }
+        $this->entities()->syncWithoutDetaching($sync);
+
         return $count;
     }
 
diff --git a/resources/views/abilities/entities/_form.blade.php b/resources/views/abilities/entities/_form.blade.php
index 1d8668babb..164c446ca8 100644
--- a/resources/views/abilities/entities/_form.blade.php
+++ b/resources/views/abilities/entities/_form.blade.php
@@ -3,7 +3,12 @@
 
 <x-grid type="1/1">
     <x-forms.field field="entities" :required="true" >
-        @include('components.form.entities', ['options' => ['exclude-entity' => $model->entity->id]])
+        <x-form.entities 
+            :options="['exclude-entity' => $model->entity->id, 'route' => 'search.ability-entities']" 
+            :campaign="$campaign"
+            :ajax="request()->ajax()"
+        >
+        </x-form.entities>
     </x-forms.field>
 
     @include('cruds.fields.visibility_id', ['model' => null])
diff --git a/resources/views/components/form/entities.blade.php b/resources/views/components/form/entities.blade.php
index d31ee32a14..c5dcaf034a 100644
--- a/resources/views/components/form/entities.blade.php
+++ b/resources/views/components/form/entities.blade.php
@@ -5,11 +5,9 @@
  * @var \App\Models\MiscModel $model
  */
 $selectedOption = [];
-
 $model = Arr::get($options, 'model', null);
 $enableNew = Arr::get($options, 'enableNew', true);
 $label = Arr::get($options, 'label', true);
-
 // From source to exclude duplicates
 $searchParams = [$campaign];
 if (Arr::has($options, 'exclude', false)) {
@@ -17,7 +15,6 @@
 } elseif (Arr::has($options, 'exclude-entity', false)) {    
     $searchParams['exclude-entity'] = Arr::get($options, 'exclude-entity');
 }
-
 // Try to load what was sent with the form first, in case there was a form validation error
 $previous = old('entities[]');
 if (!empty($previous)) {
@@ -36,12 +33,12 @@
     id="{{ Arr::get($options, 'id', 'entities[]') }}"
     class="w-full form-tags form-entities"
     style="width: 100%"
-    data-url="{{ route('search.ability-entities', $searchParams) }}"
+    data-url="{{ route(Arr::get($options, 'route', 'search.ability-entities'), $searchParams) }}"
     data-allow-new="{{ $enableNew ? 'true' : 'false' }}"
     data-allow-clear="{{ Arr::get($options, 'allowClear', 'true') }}"
     data-new-tag="{{ __('entities.new_entity') }}"
     data-placeholder="{{ __('entities/relations.placeholders.target') }}"
-    :dropdownParent="$dropdownParent ?? (request()->ajax() ? '#primary-dialog' : null)"
+    :dropdownParent="$dropdownParent ?? ($ajax ? '#primary-dialog' : null)"
 >
     @foreach ($selectedOption as $key => $entity)
         <option value="{{ $key }}" class="select2-entity" selected="selected">{{ $entity->name }}</option>

From 15ec7a249e13ba8a861a0499e053612691ee81fb Mon Sep 17 00:00:00 2001
From: spitfire305 <spitfire305@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:59:36 +0000
Subject: [PATCH 10/28] Fix styling

---
 app/Models/Ability.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Ability.php b/app/Models/Ability.php
index c554f6b75c..87e67b12dc 100644
--- a/app/Models/Ability.php
+++ b/app/Models/Ability.php
@@ -215,8 +215,8 @@ public function attachEntity(array $request): int
         $sync = [];
 
         foreach ($entityIds as $entity) {
-           $sync[$entity] = ['visibility_id' => $visibility];
-           $count++;
+            $sync[$entity] = ['visibility_id' => $visibility];
+            $count++;
         }
         $this->entities()->syncWithoutDetaching($sync);
 

From a5eec1ceedd4033dc7906cbb3bba9f32e28f8cad Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 06:31:56 -0600
Subject: [PATCH 11/28] Fix vanity rule not triggering

---
 app/Models/Campaign.php | 1 +
 app/Rules/Vanity.php    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php
index 49bbb4f999..862ee1a166 100644
--- a/app/Models/Campaign.php
+++ b/app/Models/Campaign.php
@@ -24,6 +24,7 @@
  *
  * @property int $id
  * @property string $name
+ * @property string $slug
  * @property string $locale
  * @property string $entry
  * @property string $image
diff --git a/app/Rules/Vanity.php b/app/Rules/Vanity.php
index f624d06396..2700d60650 100644
--- a/app/Rules/Vanity.php
+++ b/app/Rules/Vanity.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Str;
 
 class Vanity implements ValidationRule
 {
@@ -15,7 +16,7 @@ class Vanity implements ValidationRule
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
         $value = trim($value);
-        if (mb_strpos($value, '/')) {
+        if (Str::contains($value, '/')) {
             $fail(__('campaigns/vanity.rule2', ['field' => $attribute]));
         }
 

From e656fccf69d6b83e206d3628cafa24151610148a Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 07:57:13 -0600
Subject: [PATCH 12/28] Update docs

---
 app/Console/Commands/InstallCommand.php       |  46 ++++++
 ...0_30_010002_create_real_entities_table.php |   2 +-
 .../2023_06_10_220139_create_api_logs.php     |   3 +
 ...23_06_15_210220_create_user_logs_table.php |   3 +
 docs/contributing.md                          |   3 +-
 docs/debugging.md                             |  18 ++
 docs/running.md                               | 156 ++++++------------
 docs/updating.md                              |  38 +++++
 8 files changed, 159 insertions(+), 110 deletions(-)
 create mode 100644 app/Console/Commands/InstallCommand.php
 create mode 100644 docs/debugging.md
 create mode 100644 docs/updating.md

diff --git a/app/Console/Commands/InstallCommand.php b/app/Console/Commands/InstallCommand.php
new file mode 100644
index 0000000000..074d7ed7fe
--- /dev/null
+++ b/app/Console/Commands/InstallCommand.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\EntityType;
+use Illuminate\Console\Command;
+use Exception;
+
+class InstallCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'kanka:install';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Set up Kanka\'s boilerplate';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        try {
+            if (EntityType::find(1)) {
+                $this->error('Kanka has already been installed.');
+                return;
+            }
+        } catch (Exception) {
+            //
+        }
+        $this->call('key:generate');
+        $this->call('migrate');
+        $this->call('db:seed');
+        $this->call('passport:install');
+
+        $this->info('Kanka successfully installed.');
+        $this->info('Check it out at ' . config('app.url'));
+    }
+}
diff --git a/database/migrations/2017_10_30_010002_create_real_entities_table.php b/database/migrations/2017_10_30_010002_create_real_entities_table.php
index b997fc48ee..0c6b9012ee 100644
--- a/database/migrations/2017_10_30_010002_create_real_entities_table.php
+++ b/database/migrations/2017_10_30_010002_create_real_entities_table.php
@@ -53,7 +53,7 @@ public function up()
                 ->references('id')->on('users')
                 ->nullOnDelete();
 
-            $table->index(['type', 'name', 'is_private', 'is_template']);
+            $table->index(['name', 'is_private', 'is_template']);
             $table->index('updated_at');
         });
     }
diff --git a/database/migrations/2023_06_10_220139_create_api_logs.php b/database/migrations/2023_06_10_220139_create_api_logs.php
index 49f04eb4b0..d023d42d94 100644
--- a/database/migrations/2023_06_10_220139_create_api_logs.php
+++ b/database/migrations/2023_06_10_220139_create_api_logs.php
@@ -13,6 +13,9 @@ public function up(): void
         if (!config('logging.enabled')) {
             return;
         }
+        if (Schema::connection('logs')->hasTable('api_logs')) {
+            return;
+        }
         Schema::connection('logs')->create('api_logs', function (Blueprint $table) {
             $table->id();
             $table->timestamps();
diff --git a/database/migrations/2023_06_15_210220_create_user_logs_table.php b/database/migrations/2023_06_15_210220_create_user_logs_table.php
index b194bc6454..5ac8b91121 100644
--- a/database/migrations/2023_06_15_210220_create_user_logs_table.php
+++ b/database/migrations/2023_06_15_210220_create_user_logs_table.php
@@ -13,6 +13,9 @@ public function up(): void
         if (!config('logging.enabled')) {
             return;
         }
+        if (Schema::connection('logs')->hasTable('user_logs')) {
+            return;
+        }
         Schema::connection('logs')->create('user_logs', function (Blueprint $table) {
             $table->id();
             $table->integer('user_id')->unsigned();
diff --git a/docs/contributing.md b/docs/contributing.md
index 6f1537a343..84d5e0c810 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -1,6 +1,6 @@
 # Contributing to Kanka
 
-If you want to help out with Kanka development, contact us in #general` on the official [Kanka Discord](http://kanka.io/go/discord) server.
+If you want to help out with Kanka's development, contact us in #general` on the official [Kanka Discord](http://kanka.io/go/discord) server.
 
 We're always excited to have people help out with our weak areas like:
 
@@ -8,4 +8,3 @@ We're always excited to have people help out with our weak areas like:
 * UI/UX
 * Onboarding
 * Quality assurance
-  
diff --git a/docs/debugging.md b/docs/debugging.md
new file mode 100644
index 0000000000..bb6fcd6fe5
--- /dev/null
+++ b/docs/debugging.md
@@ -0,0 +1,18 @@
+# Debugging
+
+If you're having issues with your local instance, these two methods are your best bet.
+
+## Debug mode
+
+If you're having 500 errors any of the app's URLs, try the following.
+
+Enable debug mode by editing the `.env` file and replacing `APP_DEBUG=false` with `APP_DEBUG=true`. This will now show the error in the browser, which can give you a hint as to what went wrong.
+
+## Error logs
+
+If you want access to the detailed error logs, execute the following commands.
+
+```bash
+sail shell
+tail -f storage/logs/laravel.log
+```
diff --git a/docs/running.md b/docs/running.md
index 193026f4ee..f8c2e8bbf8 100644
--- a/docs/running.md
+++ b/docs/running.md
@@ -2,33 +2,57 @@
 
 ## Preface
 
-Kanka is built to run on an Nginx and MariaDB stack with the help of Docker. If you have troubles or issues, contact us on the Kanka [Discord](https://discord.gg/rhsyZJ4) #development-talk channel.
+Kanka is a dockerized self-hosted PHP application.
 
 > :warning: **Warning**
 >
-> This docker setup is meant for developers working on Kanka. **Do not use** this docker setup to host Kanka on the web! It come with 0 security (no root password and all ports open). It is also slower than the normal Kanka as it doesn't include any performance improvements and advanced caching.
+> This docker setup is meant for developers working on Kanka. **Do not use** this docker setup to host Kanka on the web! It comes with 0 security (no root password and all ports open).
 >
-> This setup works as is for our team running with Docker on Linux and MacOS. We only provide limited support for helping people host Kanka locally on Discord from Monday to Friday 9am-4pm (GMT-5).
+> This setup works as is for our team running with Docker on Linux and MacOS. We only provide limited support for helping people host Kanka locally on Discord from Monday to Friday 9am-4pm (GMT-5). We currently do not provide any paid support for helping people self-host Kanka.
+
+## Differences compared to kanka.io
+
+These developer docker instances are quite different from [kanka.io](https://kanka.io/) that we've listed below.
+
+* No security, no automatic backups.
+* No support for premium campaigns and subscriber bonuses.
+* No advanced caching, meaning that as the data grows, the app will become much slower.
+* No third-party setup like discord, google/meta/twitter logins, stripe, or analytics.
+* No emails and no campaign exports are generated.
+* No access to the third party tools Kanka pays for like FontAwesome PRO, meaning some icons in the app won't work.
+* And lastly, **limited support from the Kanka team to debug your local setup**.
 
 
 ## Docker
 
-Kanka is setup to run with Docket and [Laravel Sail](https://laravel.com/10.x/sail). It comes with four machines.
-* Kanka for running the Kanka PHP application
+Kanka is set up to run with Docker and [Laravel Sail](https://laravel.com/10.x/sail). It comes with several machines.
+* Laravel Sail for running the Kanka PHP application
 * Mariadb for the database
 * Redis for the cache
 * Minio for file storage
+* Thumbor for thumbnails
 
 ### Prerequisite
-You need [docker](https://www.docker.com/) installed on your machine.
 
-This Github repository needs to be installed (`git clone`) on your local machine. All commands are to be executed in the kanka folder.
+Kanka has minimal hardware requirements and can run adequately on a €4/month Hetzner virtual machine. The machine will need the following software to run Kanka:
+* [Docker](https://www.docker.com/)
+* Github CLI
+
+This Github repository needs to be installed (`git clone`) on your local machine. All commands are to be executed in the Kanka folder.
+
+When on Linux, Docker needs to run with your user and not with sudo! This is important for file permissions to properly work. To set up docker to run with your user, [follow these instructions](https://docs.docker.com/engine/install/linux-postinstall/).
+
+## Installing
+
+### 1. Checkout the prokect
 
-When on Linux, Docker needs to run with your user and not with sudo! This is important for file permissions to properly work. To setup docker to run with your user, [follow these instructions](https://docs.docker.com/engine/install/linux-postinstall/).
+Checkout Kanka on your local machine
 
-### Set up your config
+> gh repo clone owlchester/kanka
 
-The first step is to copy `.env.example` to `.env`. This will set up Kanka's default config to run with docker.
+### 2. Configure the database
+
+Once the project has finished downloading, copy the `.env.example` file and save it under `.env` at the root of your new Kanka installation. This file contains all the configuration settings to run Kanka, like the database details, the project's name, options for max file upload sizes, etc.
 
 > **Hidden by default**
 >
@@ -36,9 +60,9 @@ The first step is to copy `.env.example` to `.env`. This will set up Kanka's def
 
 Optionally, if you want to change some configs, edit the new `.env` file. In most cases, you don't need to touch anything.
 
-### Installing dependencies
+### 3. Installing dependencies
 
-Run the following command to install all the depenencies to run Kanka needs to run. This command will start up a small docker to install everthing through [composer](https://getcomposer.org).
+Run the following command to install all the dependencies needed by Kanka. This command will start up a small docker to install everthing through [composer](https://getcomposer.org).
 
 ```bash
 docker run --rm \
@@ -58,7 +82,7 @@ alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
 
 Otherwise, whenever this setup mentions a sail command, replace it with `./vendor/bin/sail`.
 
-### Running Kanka
+### 4. Run docker
 
 Everything should now be ready to run all those docker images. Passing the `-d` parameter starts it in the background.
 
@@ -66,7 +90,7 @@ Everything should now be ready to run all those docker images. Passing the `-d`
 sail up -d
 ```
 
-#### Bucket setup
+### 5. Bucket setup
 
 Image uploading in the app is stored on a *minio* service. This mimics the amazon S3 storage, and makes it easier to handle images rather than hosting them directly in the docker responsible for PHP.
 
@@ -76,38 +100,25 @@ Create a new bucket called `kanka`. This will redirect you to the new `kanka` bu
 
 Next up, create a second bucket called `thumbnails`. Same as before, go back and set it's `Access Policy` from `private` to `public`. This bucket will contain your thumbnails.
 
-#### Database setup
+### 6. Run the installer
 
-Now that the bucket is set up, go back to your console run the following commands. The first will set up your security key used to encode session cookies.
+Now that the bucket is set up, go back to your console run the following commands. The will take care of setting up Kanka's database with all the boilerplate content to make it work.
 
 ```bash
-sail artisan key:generate
+sail artisan kanka:install
 ```
 
-Next is creating the whole database. This database is persistant and survives each time the docker image is restarted.
-
-```bash
-sail artisan migrate
-```
+## Next up
 
-Next up is setting up the application boilerplates.
-
-```bash
-sail artisan db:seed
-```
-
-Last optional command is to allow your local env to generate API tokens.
-
-```bash
-sail artisan passport:install
-```
-
-### Testing
-
-You're now ready to test your app. Navigate to (localhost:8081)[http://localhost:8081] and you should see the Kanka application.
+Your local development instance of Kanka is now ready to go! Navigate to [localhost:8081](http://localhost:8081) and you should see the Kanka application and be able to create an account.
 
 We recommend making an alias in your `/etc/hosts` file to point `kanka.test` to your localhost, so what (kanka.test:8081)[http://kanka.test:8081] also works.
 
+Here are a few extra resources:
+* Our [documentation](https://docs.kanka.io) covers how to use Kanka.
+* Having trouble? Check out the [debugging](/docs/debugging.md).
+* Learn how to [update](/docs/updating.md) your version of Kanka.
+
 
 ### Shutting down
 
@@ -117,77 +128,8 @@ To stop the docker images, run the following command from your Kanka folder.
 sail down
 ```
 
-## Debugging
-
-If you're having issues with your local instance, these two methods are your best bet.
-
-### Debug mode
-
-If you're having 500 errors on (localhost:8081)[http://localhost:8081], try the following.
-
-Enable debug mode by editing the `.env` file and replacing `APP_DEBUG=false` with `APP_DEBUG=true`. This will now show the error in the browser.
-
-### Error logs
-
-If you want access to the detailed error logs, execute the following commands.
-
-```bash
-sail shell
-tail -f storage/logs/laravel.log
-```
-
-## Sharing your local Kanka
+### Sharing your local Kanka
 
 Do not make your Kanka instance accessible to the web! To share your Kanka instance with your friends, use the `sail share` command. Follow the [official documentation](https://laravel.com/docs/10.x/sail#sharing-your-site), or set up a reverse proxy in front of it.
 
-## Differences compared to kanka.io
-
-These developer docker instances are quite different from [kanka.io](https://kanka.io/en-US) that we've listed below.
-
-* No security, no backups
-* No support for premium campaigns and subscriber bonuses
-* No advanced caching, meaning that as the data grows, the app will become much slower
-* No image server that creates thumbnails, meaning the images you uploaded are used by default
-* No third-party setup like discord, google/meta/twitter logins, stripe, or analytics
-* No emails and no campaign exports are generated
-* No access to the third party tools Kanka pays for like FontAwesome PRO, meaning some icons in the app won't work
-* And lastly, **limited support from the Kanka team to debug your local setup**
-
-## Updating
-
-We recommend always running from a release tag rather than the `main` branch. You can check which branch you are on by going `git branch` in the kanka root folder on your machine (not in docker).
-
-When a new version of kanka is released, from your host machine you want to do `git pull` to get the newest updates. Updates usually include changes to the database, so run the following to run the migrations:
-
-When updating your local installation, we recommend checkout out each tag chronologically in order to safely update your data.
-
-> :warning: **Warning**
-> Never ever checkout the `@develop` branch as it is unstable and will break your installation.
-
-### Backup
-
-We **strongly** recommend backing up your database data before running any upgrade. You can create a backup of your data by running the following command. Note that this backup command is only available from version 1.44 and onward.
-
-```bash
-sail artisan backup:run
-```
-
-This will create a gzip file in `storage/app/{app_name}/{date}.zip`
-
-### Checkout out a specific tag
-
-In your project's root folder, run the following command to checkout a specific tag, in this example version 1.42.
-
-```bash
-git checkout tags/1.42 -b 1.42
-```
-
-Then run the update instructions of version 1.42. These updates are found in the project's "Releases" on GitHub.
-
-Once that's done, checkout version 1.43 by running:
-
-```bash
-git checkout tags/1.43 -b 1.43
-```
 
-And run the update instructions of version 1.43. Repeat until you are running the latest version.
diff --git a/docs/updating.md b/docs/updating.md
new file mode 100644
index 0000000000..78c89e1d89
--- /dev/null
+++ b/docs/updating.md
@@ -0,0 +1,38 @@
+# Updating
+
+We recommend always running from a release tag rather than the `main` branch. You can check which branch you are on by going `git branch` in the Kanka root folder on your machine (not in docker).
+
+When a new version of Kanka is released, from your host machine you want to do `git pull` to get the newest updates. Updates usually include changes to the database, so run the following to run the migrations:
+
+When updating your local installation, we recommend checkout out each tag chronologically in order to safely update your data.
+
+> :warning: **Warning**
+> Never ever checkout the `@develop` branch as it is unstable and will break your installation.
+
+### Backup
+
+We **strongly** recommend backing up your database data before running any upgrade. You can create a backup of your data by running the following command. Note that this backup command is only available from version 1.44 and onward.
+
+```bash
+sail artisan backup:run
+```
+
+This will create a gzip file in `storage/app/{app_name}/{date}.zip`
+
+### Checkout out a specific tag
+
+In your project's root folder, run the following command to checkout a specific tag, in this example version 1.42.
+
+```bash
+git checkout tags/2.0 -b 2.0
+```
+
+Then run the update instructions of version 1.42. These updates are found in the project's "Releases" on GitHub.
+
+Once that's done, checkout version 1.43 by running:
+
+```bash
+git checkout tags/2.0 -b 2.0
+```
+
+And run the update instructions of version 1.43. Repeat until you are running the latest version.

From 6fc8e2661da3d8b30feed92dbef312dd45f63ea4 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 08:05:59 -0600
Subject: [PATCH 13/28] Fix parent abilities not showing their image

---
 app/Services/Abilities/AbilityService.php |  2 +-
 app/Services/Images/AvatarService.php     | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/Services/Abilities/AbilityService.php b/app/Services/Abilities/AbilityService.php
index c9c4e24da2..9fa08b5ac2 100644
--- a/app/Services/Abilities/AbilityService.php
+++ b/app/Services/Abilities/AbilityService.php
@@ -90,7 +90,7 @@ protected function add(EntityAbility $entityAbility): void
                 'name' => $parent->name,
                 'type' => $parent->type,
                 'image' => Avatar::entity($parent->entity)->size(120)->thumbnail(),
-                'has_image' => !empty($parent->entity->image_path) && !empty($parent->entity->image),
+                'has_image' => !empty($parent->entity->image_path) || !empty($parent->entity->image),
                 'entry' => $parent->entry(),
                 'parent' => true,
                 'abilities' => [],
diff --git a/app/Services/Images/AvatarService.php b/app/Services/Images/AvatarService.php
index e48f9d99e1..acee960aee 100644
--- a/app/Services/Images/AvatarService.php
+++ b/app/Services/Images/AvatarService.php
@@ -163,24 +163,9 @@ protected function getChild(): MiscModel
 
     protected function childThumbnailPath(): string|null
     {
-        if ($this->withCache) {
-            return $this->cachedChildThumbnailPath();
-        }
         return $this->entity->image_path;
     }
 
-    protected function cachedChildThumbnailPath(): string|null
-    {
-        $cached = Cache::get($this->cacheKey());
-        if (!empty($cached)) {
-            return $cached;
-        }
-
-        $cached = $this->entity->image_path;
-        Cache::put($this->cacheKey(), $cached, 3600 * 24);
-        return $cached;
-    }
-
     public function forget(): void
     {
         Cache::forget($this->cacheKey());

From f1fb16fc95508a335c516f16e5b0e4aa23ea3b0e Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 09:50:12 -0600
Subject: [PATCH 14/28] Replace nested trees with common table expressions

---
 app/Console/Commands/GenerateTrees.php        |   78 -
 app/Http/Controllers/CrudController.php       |    2 +-
 .../Locations/CharacterController.php         |    1 +
 .../Locations/LocationController.php          |    2 +-
 app/Models/Ability.php                        |   17 +-
 app/Models/AttributeTemplate.php              |   14 +-
 app/Models/Calendar.php                       |    2 +-
 app/Models/Concerns/HasFilters.php            |    2 +-
 app/Models/Concerns/Nested.php                | 1262 -----------------
 app/Models/Creature.php                       |   16 +-
 app/Models/Event.php                          |   40 +-
 app/Models/Family.php                         |   14 +-
 app/Models/Item.php                           |    2 +-
 app/Models/Journal.php                        |   14 +-
 app/Models/Location.php                       |   18 +-
 app/Models/Map.php                            |   13 +-
 app/Models/MiscModel.php                      |    2 -
 app/Models/Note.php                           |   14 +-
 app/Models/Organisation.php                   |   16 +-
 app/Models/Quest.php                          |   14 +-
 app/Models/Race.php                           |   18 +-
 app/Models/Tag.php                            |   26 +-
 app/Models/Timeline.php                       |   30 +-
 app/Observers/AbilityObserver.php             |    2 -
 app/Observers/AttributeTemplateObserver.php   |    2 -
 app/Observers/CreatureObserver.php            |    2 -
 app/Observers/EventObserver.php               |    2 -
 app/Observers/FamilyObserver.php              |    2 -
 app/Observers/JournalObserver.php             |    2 -
 app/Observers/LocationObserver.php            |    2 -
 app/Observers/MapObserver.php                 |    2 -
 app/Observers/MiscObserver.php                |   31 -
 app/Observers/NoteObserver.php                |    2 -
 app/Observers/OrganisationObserver.php        |    5 +-
 app/Observers/RaceObserver.php                |    2 -
 app/Observers/TagObserver.php                 |    4 +-
 app/Observers/TimelineObserver.php            |    2 -
 .../Campaign/Import/ImportService.php         |    2 +-
 .../Campaign/Import/Mappers/EntityMapper.php  |   11 -
 app/Services/Entity/EntityRelationService.php |    2 +-
 app/Services/Entity/MoveService.php           |    4 -
 app/Services/Entity/TransformService.php      |    7 -
 app/Services/RecoveryService.php              |   10 +-
 app/Traits/CanFixTree.php                     |   45 -
 app/Traits/ExportableTrait.php                |    4 +-
 app/Traits/TreeControllerTrait.php            |    2 +-
 composer.json                                 |    2 +
 composer.lock                                 |  165 ++-
 .../2023_12_02_154727_remove_old_trees.php    |   51 +
 49 files changed, 287 insertions(+), 1697 deletions(-)
 delete mode 100644 app/Console/Commands/GenerateTrees.php
 delete mode 100644 app/Models/Concerns/Nested.php
 delete mode 100644 app/Traits/CanFixTree.php
 create mode 100644 database/migrations/2023_12_02_154727_remove_old_trees.php

diff --git a/app/Console/Commands/GenerateTrees.php b/app/Console/Commands/GenerateTrees.php
deleted file mode 100644
index 2bd692edb8..0000000000
--- a/app/Console/Commands/GenerateTrees.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Carbon\Carbon;
-use Exception;
-use Illuminate\Console\Command;
-
-class GenerateTrees extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'trees {models=all,timeline,journal}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create the trees';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $this->out('Start fixing trees');
-        $models = explode(',', $this->argument('models'));
-
-        if ($this->argument('models') === 'all') {
-            $this->fixAll();
-            $this->info('Finished');
-            return 1;
-        }
-
-        $classes = config('entities.classes');
-        foreach ($models as $model) {
-            $class = new $classes[$model]();
-            if ($class === false || !method_exists($class, 'recalculateTreeBounds')) {
-                $this->warn('Skipping ' . $model);
-                continue;
-            }
-            $start = Carbon::now();
-            $this->out("Model {$model}");
-            $class::fixTree();
-            $end = Carbon::now();
-            $this->out('Fixed in ' . $start->diffInMinutes($end) . ' minutes');
-        }
-        $this->out('Finished fixing trees');
-    }
-
-    /**
-     *
-     */
-    protected function fixAll(): void
-    {
-        $models = config('entities.classes');
-        foreach ($models as $model => $class) {
-            $new = new $class();
-            try {
-                $this->info("Fixing {$model}");
-                $class::fixTree();
-            } catch (Exception $e) {
-                $this->warn('Skipping ' . $model);
-            }
-        }
-    }
-
-    protected function out(string $text): self
-    {
-        $now = Carbon::now();
-        $this->info($now->format('H:i:s') . ': ' . $text);
-        return $this;
-    }
-}
diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php
index 5f2eb8d657..0500a135c6 100644
--- a/app/Http/Controllers/CrudController.php
+++ b/app/Http/Controllers/CrudController.php
@@ -144,7 +144,7 @@ public function crudIndex(Request $request)
         $parent = null;
         if (request()->has('parent_id')) {
             // @phpstan-ignore-next-line
-            $parentKey = $model->getParentIdName();
+            $parentKey = $model->getParentKeyName();
             $base->where([$model->getTable() . '.' . $parentKey => request()->get('parent_id')]);
 
             $parent = $model->where('id', request()->get('parent_id'))->first();
diff --git a/app/Http/Controllers/Locations/CharacterController.php b/app/Http/Controllers/Locations/CharacterController.php
index dc98a679e1..ee2d55152b 100644
--- a/app/Http/Controllers/Locations/CharacterController.php
+++ b/app/Http/Controllers/Locations/CharacterController.php
@@ -38,6 +38,7 @@ public function index(Campaign $campaign, Location $location)
                 'location', 'location.entity',
                 'races', 'families',
             ])
+            ->filter($filters)
             ->filteredCharacters()
             ->paginate();
 
diff --git a/app/Http/Controllers/Locations/LocationController.php b/app/Http/Controllers/Locations/LocationController.php
index 6e36808181..3ec7a128df 100644
--- a/app/Http/Controllers/Locations/LocationController.php
+++ b/app/Http/Controllers/Locations/LocationController.php
@@ -34,7 +34,7 @@ public function index(Campaign $campaign, Location $location)
         // @phpstan-ignore-next-line
         $this->rows = $location
             ->descendants()
-            ->select(['id', 'image', 'name', 'type', 'location_id', 'is_private'])
+            ->select(['id', 'name', 'type', 'location_id', 'is_private'])
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
             ->filter($filters)
             ->with([
diff --git a/app/Models/Ability.php b/app/Models/Ability.php
index d9e0ef456f..82f59c1518 100644
--- a/app/Models/Ability.php
+++ b/app/Models/Ability.php
@@ -14,6 +14,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Arr;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Ability
@@ -34,10 +35,9 @@ class Ability extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
-    use SortableTrait
-    ;
+    use SortableTrait;
 
     /** @var string[]  */
     protected $fillable = [
@@ -86,20 +86,11 @@ class Ability extends MiscModel
      * Parent ID used for the Node Trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'ability_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setAbilityIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Performance with for datagrids
      */
diff --git a/app/Models/AttributeTemplate.php b/app/Models/AttributeTemplate.php
index 1f89e39559..9f7edbf859 100644
--- a/app/Models/AttributeTemplate.php
+++ b/app/Models/AttributeTemplate.php
@@ -8,6 +8,7 @@
 use App\Traits\CampaignTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class AttributeTemplate
@@ -23,7 +24,7 @@ class AttributeTemplate extends MiscModel
 {
     use Acl;
     use CampaignTrait;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
 
     /**
@@ -96,20 +97,11 @@ public function attributeTemplates()
      * Parent ID field for the Node trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'attribute_template_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setAttributeTemplateIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Performance with for datagrids
      */
diff --git a/app/Models/Calendar.php b/app/Models/Calendar.php
index 20256e1ac8..3fc5d261fc 100644
--- a/app/Models/Calendar.php
+++ b/app/Models/Calendar.php
@@ -134,7 +134,7 @@ public function datagridSelectFields(): array
         return ['calendar_id', 'date'];
     }
 
-    public function getParentIdName(): string
+    public function getParentKeyName(): string
     {
         return 'calendar_id';
     }
diff --git a/app/Models/Concerns/HasFilters.php b/app/Models/Concerns/HasFilters.php
index accba884f0..c0a9eaf12c 100644
--- a/app/Models/Concerns/HasFilters.php
+++ b/app/Models/Concerns/HasFilters.php
@@ -650,6 +650,6 @@ protected function getFilterOption(): FilterOption
 
     protected function filterParent(Builder $query): void
     {
-        $query->where($this->getTable() . '.' . $this->getParentIdName(), $this->filterValue);
+        $query->where($this->getTable() . '.' . $this->getParentKeyName(), $this->filterValue);
     }
 }
diff --git a/app/Models/Concerns/Nested.php b/app/Models/Concerns/Nested.php
deleted file mode 100644
index e5aa018827..0000000000
--- a/app/Models/Concerns/Nested.php
+++ /dev/null
@@ -1,1262 +0,0 @@
-<?php
-
-namespace App\Models\Concerns;
-
-use Exception;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Log;
-use Kalnoy\Nestedset\AncestorsRelation;
-use Kalnoy\Nestedset\Collection;
-use Kalnoy\Nestedset\DescendantsRelation;
-use Kalnoy\Nestedset\NestedSet;
-use LogicException;
-
-/**
- * Trait Nested
- * @package App\Models\Concerns
- *
- * We simply copy-pasted the Kalnoy trait, but removed the static deleted method because it doesn't work for Kanka
- * We don't want descendants to be deleted when a parent is deleted, simply detached. We have a bug somewhere else
- * breaking trees (might be due to permissions when editing children) but to simplify our first step is to make
- * sure children don't get deleted on the cleanup process.
- *
- * @property int $_lft
- * @property int $_rgt
- * @property \Illuminate\Database\Eloquent\Collection $descendants
- * @property \Illuminate\Database\Eloquent\Collection $children
- */
-trait Nested
-{
-    /**
-     * Pending operation.
-     *
-     */
-    protected $pending;
-
-    /**
-     * Whether the node has moved since last save.
-     *
-     */
-    protected bool $moved = false;
-
-    /**
-     * @var \Carbon\Carbon
-     */
-    public static $deletedAt;
-
-    /**
-     * Keep track of the number of performed operations.
-     *
-     */
-    public static int $actionsPerformed = 0;
-
-    /**
-     * Sign on model events.
-     */
-    public static function bootNested()
-    {
-        static::saving(function ($model) {
-            return $model->callPendingAction();
-        });
-
-        static::deleting(function ($model) {
-            // We will need fresh data to delete node safely
-            $model->refreshNode();
-        });
-
-        static::deleted(function ($model) {
-            // We don't want this feature of the nested plugin, so we just ignore it :)
-            //$model->deleteDescendants();
-        });
-
-        if (static::usesSoftDelete()) {
-            static::restoring(function ($model) {
-                static::$deletedAt = $model->{$model->getDeletedAtColumn()};
-            });
-
-            static::restored(function ($model) {
-                //$model->restoreDescendants(static::$deletedAt);
-            });
-        }
-    }
-
-    /**
-     * Set an action.
-     *
-     * @param string $action
-     *
-     * @return $this
-     */
-    protected function setNodeAction($action)
-    {
-        $this->pending = func_get_args();
-
-        return $this;
-    }
-
-    public function forcePendingAction()
-    {
-        $this->callPendingAction();
-    }
-
-    /**
-     * Call pending action.
-     */
-    protected function callPendingAction()
-    {
-        $this->moved = false;
-
-        if (!$this->pending && !$this->exists) {
-            $this->makeRoot();
-        }
-
-        if (!$this->pending) {
-            return;
-        }
-
-        $method = 'action' . ucfirst(array_shift($this->pending));
-        //dump($method);
-        $parameters = $this->pending;
-
-        $this->pending = null;
-
-        $this->moved = call_user_func_array([$this, $method], $parameters);
-    }
-
-    /**
-     * Force this element to recalculate the tree bounds if it's being created
-     */
-    public function recalculateTreeBounds()
-    {
-        // No need if this entity exists
-        //dump('recalculate Tree Bounds');
-        if ($this->exists) {
-            return;
-        }
-
-        $value = $this->getParentId();
-        if ($value) {
-            $this->appendToNode($this->newScopedQuery()->findOrFail($value));
-        } else {
-            $this->actionRoot();
-        }
-    }
-
-    /**
-     * Force a node as root. Useful when moving an entity to another campaign
-     */
-    public function forceAsRoot(): void
-    {
-        if (!$this->exists) {
-            Log::warning('Trying to force a non-existing model as a tree root.');
-        }
-        $this->actionRoot();
-    }
-
-    /**
-     * @return bool
-     */
-    public static function usesSoftDelete()
-    {
-        static $softDelete;
-
-        if (null === $softDelete) {
-            $instance = new static();
-
-            return $softDelete = method_exists($instance, 'bootSoftDeletes');
-        }
-
-        return $softDelete;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function actionRaw()
-    {
-        return true;
-    }
-
-    /**
-     * Make a root node.
-     */
-    protected function actionRoot()
-    {
-        // Simplest case that do not affect other nodes.
-        if (!$this->exists) {
-            $cut = $this->getLowerBound() + 1;
-
-            $this->setLft($cut);
-            $this->setRgt($cut + 1);
-
-            //dump($this->getBounds());
-            return true;
-        }
-        //dump('exists');
-        //dump($this->getLowerBound() + 1);
-
-        return $this->insertAt($this->getLowerBound() + 1);
-    }
-
-    /**
-     * Get the lower bound.
-     *
-     * @return int
-     */
-    protected function getLowerBound()
-    {
-        // @phpstan-ignore-next-line
-        return (int)$this->newNestedSetQuery()->max($this->getRgtName());
-    }
-
-    /**
-     * Append or prepend a node to the parent.
-     *
-     * @param bool $prepend
-     *
-     * @return bool
-     */
-    protected function actionAppendOrPrepend(self $parent, $prepend = false)
-    {
-        $parent->refreshNode();
-
-        $cut = $prepend ? $parent->getLft() + 1 : $parent->getRgt();
-
-        if (!$this->insertAt($cut)) {
-            return false;
-        }
-
-        $parent->refreshNode();
-
-        return true;
-    }
-
-    /**
-     * Apply parent model.
-     *
-     * @param Model|null $value
-     *
-     * @return $this
-     */
-    protected function setParent($value)
-    {
-        $this->setParentId($value ? $value->getKey() : null)
-            ->setRelation('parent', $value);
-
-        return $this;
-    }
-
-    /**
-     * Insert node before or after another node.
-     *
-     * @param bool $after
-     *
-     * @return bool
-     */
-    protected function actionBeforeOrAfter(self $node, $after = false)
-    {
-        $node->refreshNode();
-
-        return $this->insertAt($after ? $node->getRgt() + 1 : $node->getLft());
-    }
-
-    /**
-     * Refresh node's crucial attributes.
-     */
-    public function refreshNode()
-    {
-        if (!$this->exists || static::$actionsPerformed === 0) {
-            return;
-        }
-
-        $attributes = $this->newNestedSetQuery()->getNodeData($this->getKey());
-
-        $this->attributes = array_merge($this->attributes, $attributes);
-        //        $this->original = array_merge($this->original, $attributes);
-    }
-
-    /**
-     * Relation to the parent.
-     *
-     * @return BelongsTo
-     */
-    public function parent()
-    {
-        return $this->belongsTo(get_class($this), $this->getParentIdName())
-            ->setModel($this);
-    }
-
-    /**
-     * Relation to children.
-     *
-     * @return HasMany
-     */
-    public function children()
-    {
-        return $this->hasMany(get_class($this), $this->getParentIdName())
-            ->setModel($this);
-    }
-
-    /**
-     * Get query for descendants of the node.
-     *
-     * @return DescendantsRelation|Builder
-     */
-    public function descendants()
-    {
-        // @phpstan-ignore-next-line
-        return new DescendantsRelation($this->newQuery(), $this);
-    }
-
-    /**
-     * Get query for siblings of the node.
-     *
-     * @return QueryBuilder
-     */
-    public function siblings()
-    {
-        return $this->newScopedQuery()
-            ->where($this->getKeyName(), '<>', $this->getKey())
-            ->where($this->getParentIdName(), '=', $this->getParentId());
-    }
-
-    /**
-     * Get the node siblings and the node itself.
-     *
-     * @return \Kalnoy\Nestedset\QueryBuilder
-     */
-    public function siblingsAndSelf()
-    {
-        return $this->newScopedQuery()
-            ->where($this->getParentIdName(), '=', $this->getParentId());
-    }
-
-    /**
-     * Get query for the node siblings and the node itself.
-     *
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getSiblingsAndSelf(array $columns = ['*'])
-    {
-        return $this->siblingsAndSelf()->get($columns);
-    }
-
-    /**
-     * Get query for siblings after the node.
-     *
-     * @return QueryBuilder
-     */
-    public function nextSiblings()
-    {
-        return $this->nextNodes()
-            ->where($this->getParentIdName(), '=', $this->getParentId());
-    }
-
-    /**
-     * Get query for siblings before the node.
-     *
-     * @return QueryBuilder
-     */
-    public function prevSiblings()
-    {
-        return $this->prevNodes()
-            ->where($this->getParentIdName(), '=', $this->getParentId());
-    }
-
-    /**
-     * Get query for nodes after current node.
-     *
-     * @return QueryBuilder
-     */
-    public function nextNodes()
-    {
-        return $this->newScopedQuery()
-            ->where($this->getLftName(), '>', $this->getLft());
-    }
-
-    /**
-     * Get query for nodes before current node in reversed order.
-     *
-     * @return QueryBuilder
-     */
-    public function prevNodes()
-    {
-        return $this->newScopedQuery()
-            ->where($this->getLftName(), '<', $this->getLft());
-    }
-
-    /**
-     * Get query ancestors of the node.
-     *
-     * @return  AncestorsRelation|Builder
-     */
-    public function ancestors()
-    {
-        // @phpstan-ignore-next-line
-        return new AncestorsRelation($this->newQuery(), $this);
-    }
-
-    /**
-     * Make this node a root node.
-     *
-     * @return $this
-     */
-    public function makeRoot()
-    {
-        $this->setParent(null)->dirtyBounds();
-
-        return $this->setNodeAction('root');
-    }
-
-    /**
-     * Save node as root.
-     *
-     * @return bool
-     */
-    public function saveAsRoot()
-    {
-        if ($this->exists && $this->isRoot()) {
-            return $this->save();
-        }
-
-        return $this->makeRoot()->save();
-    }
-
-    /**
-     * Append and save a node.
-     *
-     *
-     * @return bool
-     */
-    public function appendNode(self $node)
-    {
-        return $node->appendToNode($this)->save();
-    }
-
-    /**
-     * Prepend and save a node.
-     *
-     *
-     * @return bool
-     */
-    public function prependNode(self $node)
-    {
-        return $node->prependToNode($this)->save();
-    }
-
-    /**
-     * Append a node to the new parent.
-     *
-     *
-     * @return $this
-     */
-    public function appendToNode(self $parent)
-    {
-        // @phpstan-ignore-next-line
-        return $this->appendOrPrependTo($parent);
-    }
-
-    /**
-     * Prepend a node to the new parent.
-     *
-     *
-     * @return $this
-     */
-    public function prependToNode(self $parent)
-    {
-        // @phpstan-ignore-next-line
-        return $this->appendOrPrependTo($parent, true);
-    }
-
-    /**
-     *
-     * @return self
-     */
-    public function appendOrPrependTo(self $parent, bool $prepend = false)
-    {
-        $this->assertNodeExists($parent)
-            ->assertNotDescendant($parent)
-            ->assertSameScope($parent);
-
-        $this->setParent($parent)->dirtyBounds();
-
-        return $this->setNodeAction('appendOrPrepend', $parent, $prepend);
-    }
-
-    /**
-     * Insert self after a node.
-     *
-     *
-     * @return self
-     */
-    public function afterNode(self $node)
-    {
-        return $this->beforeOrAfterNode($node, true);
-    }
-
-    /**
-     * Insert self before node.
-     *
-     *
-     * @return self
-     */
-    public function beforeNode(self $node)
-    {
-        return $this->beforeOrAfterNode($node);
-    }
-
-    /**
-     * @param bool $after
-     *
-     * @return self
-     */
-    public function beforeOrAfterNode(self $node, $after = false)
-    {
-        $this->assertNodeExists($node)
-            ->assertNotDescendant($node)
-            ->assertSameScope($node);
-
-        if (!$this->isSiblingOf($node)) {
-            $this->setParent($node->getRelationValue('parent'));
-        }
-
-        $this->dirtyBounds();
-
-        return $this->setNodeAction('beforeOrAfter', $node, $after);
-    }
-
-    /**
-     * Insert self after a node and save.
-     *
-     *
-     * @return bool
-     */
-    public function insertAfterNode(self $node)
-    {
-        return $this->afterNode($node)->save();
-    }
-
-    /**
-     * Insert self before a node and save.
-     *
-     *
-     * @return bool
-     */
-    public function insertBeforeNode(self $node)
-    {
-        if (!$this->beforeNode($node)->save()) {
-            return false;
-        }
-
-        // We'll update the target node since it will be moved
-        $node->refreshNode();
-
-        return true;
-    }
-
-    /**
-     *
-     * @return $this
-     */
-    public function rawNode(mixed $lft, mixed $rgt, mixed $parentId)
-    {
-        $this->setLft($lft)->setRgt($rgt)->setParentId($parentId);
-
-        return $this->setNodeAction('raw');
-    }
-
-    /**
-     * Move node up given amount of positions.
-     *
-     * @param int $amount
-     *
-     * @return bool
-     */
-    public function up($amount = 1)
-    {
-        // @phpstan-ignore-next-line
-        $sibling = $this->prevSiblings()
-            ->defaultOrder('desc')
-            ->skip($amount - 1)
-            ->first();
-
-        if (!$sibling) {
-            return false;
-        }
-
-        return $this->insertBeforeNode($sibling);
-    }
-
-    /**
-     * Move node down given amount of positions.
-     *
-     * @param int $amount
-     *
-     * @return bool
-     */
-    public function down($amount = 1)
-    {
-        // @phpstan-ignore-next-line
-        $sibling = $this->nextSiblings()
-            ->defaultOrder()
-            ->skip($amount - 1)
-            ->first();
-
-        if (!$sibling) {
-            return false;
-        }
-
-        return $this->insertAfterNode($sibling);
-    }
-
-    /**
-     * Insert node at specific position.
-     *
-     * @param  int $position
-     *
-     * @return bool
-     */
-    protected function insertAt($position)
-    {
-        ++static::$actionsPerformed;
-
-        $result = $this->exists
-            ? $this->moveNode($position)
-            : $this->insertNode($position);
-
-        return $result;
-    }
-
-    /**
-     * Move a node to the new position.
-     *
-     * @since 2.0
-     *
-     * @param int $position
-     */
-    protected function moveNode($position)
-    {
-        $updated = $this->newNestedSetQuery()
-            ->moveNode($this->getKey(), $position) > 0;
-
-        if ($updated) {
-            $this->refreshNode();
-        }
-
-        return $updated;
-    }
-
-    /**
-     * Insert new node at specified position.
-     *
-     * @since 2.0
-     *
-     * @param int $position
-     *
-     * @return bool
-     */
-    protected function insertNode($position)
-    {
-        $this->newNestedSetQuery()->makeGap($position, 2);
-
-        $height = $this->getNodeHeight();
-
-        $this->setLft($position);
-        $this->setRgt($position + $height - 1);
-
-        return true;
-    }
-
-    /**
-     * Update the tree when the node is removed physically.
-     */
-    protected function deleteDescendants()
-    {
-        $lft = $this->getLft();
-        $rgt = $this->getRgt();
-
-        $method = $this->usesSoftDelete() && $this->forceDeleting
-            ? 'forceDelete'
-            : 'delete';
-
-        $this->descendants()->{$method}();
-
-        if ($this->hardDeleting()) {
-            $height = $rgt - $lft + 1;
-
-            $this->newNestedSetQuery()->makeGap($rgt + 1, -$height);
-
-            // In case if user wants to re-create the node
-            $this->makeRoot();
-
-            static::$actionsPerformed++;
-        }
-    }
-
-    /**
-     * Restore the descendants.
-     *
-     */
-    protected function restoreDescendants(string $deletedAt)
-    {
-        // @phpstan-ignore-next-line
-        $this->descendants()
-            ->where($this->getDeletedAtColumn(), '>=', $deletedAt)
-            ->restore();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @since 2.0
-     */
-    public function newEloquentBuilder($query)
-    {
-        return new TreeQueryBuilder($query);
-    }
-
-    /**
-     * Get a new base query that includes deleted nodes.
-     *
-     * @since 1.1
-     *
-     * @return QueryBuilder
-     */
-    public function newNestedSetQuery($table = null)
-    {
-        $builder = $this->usesSoftDelete()
-            ? $this->withTrashed()
-            : $this->newQuery();
-
-        return $this->applyNestedSetScope($builder, $table);
-    }
-
-    /**
-     */
-    public function newScopedQuery(string $table = null)
-    {
-        return $this->applyNestedSetScope($this->newQuery(), $table);
-    }
-
-    /**
-     * @param string $table
-     *
-     */
-    public function applyNestedSetScope($query, $table = null)
-    {
-        // @phpstan-ignore-next-line
-        if (!$scoped = $this->getScopeAttributes()) {
-            return $query;
-        }
-
-        // @phpstan-ignore-next-line
-        if (!$table) {
-            $table = $this->getTable();
-        }
-
-        foreach ($scoped as $attribute) {
-            $query->where(
-                $table . '.' . $attribute,
-                '=',
-                $this->getAttributeValue($attribute)
-            );
-        }
-
-        return $query;
-    }
-
-    /**
-     */
-    protected function getScopeAttributes()
-    {
-        return null;
-    }
-
-    /**
-     *
-     * @return self
-     */
-    public static function scoped(array $attributes)
-    {
-        $instance = new static();
-
-        $instance->setRawAttributes($attributes);
-
-        return $instance->newScopedQuery();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function newCollection(array $models = [])
-    {
-        return new Collection($models);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Use `children` key on `$attributes` to create child nodes.
-     *
-     */
-    public static function create(array $attributes = [], self $parent = null)
-    {
-        $children = Arr::pull($attributes, 'children');
-
-        $instance = new static($attributes);
-
-        if ($parent) {
-            $instance->appendToNode($parent);
-        }
-
-        $instance->save();
-
-        // Now create children
-        $relation = new EloquentCollection();
-
-        foreach ((array)$children as $child) {
-            $relation->add($child = static::create($child, $instance));
-
-            $child->setRelation('parent', $instance);
-        }
-
-        $instance->refreshNode();
-
-        return $instance->setRelation('children', $relation);
-    }
-
-    /**
-     * Get node height (rgt - lft + 1).
-     *
-     * @return int
-     */
-    public function getNodeHeight()
-    {
-        if (!$this->exists) {
-            return 2;
-        }
-
-        return $this->getRgt() - $this->getLft() + 1;
-    }
-
-    /**
-     * Get number of descendant nodes.
-     *
-     * @return int|float
-     */
-    public function getDescendantCount()
-    {
-        return ceil($this->getNodeHeight() / 2) - 1;
-    }
-
-    /**
-     * Set the value of model's parent id key.
-     *
-     * Behind the scenes node is appended to found parent node.
-     *
-     * @param int $value
-     *
-     * @throws Exception If parent node doesn't exists
-     */
-    public function setParentIdAttribute($value)
-    {
-        if ($this->getParentId() == $value) {
-            return;
-        }
-
-        if ($value) {
-            $this->appendToNode($this->newScopedQuery()->findOrFail($value));
-        } else {
-            $this->makeRoot();
-        }
-    }
-
-    /**
-     * Get whether node is root.
-     *
-     * @return boolean
-     */
-    public function isRoot()
-    {
-        // @phpstan-ignore-next-line
-        return null === $this->getParentId();
-    }
-
-    /**
-     * @return bool
-     */
-    public function isLeaf()
-    {
-        return $this->getLft() + 1 == $this->getRgt();
-    }
-
-    /**
-     * Get the lft key name.
-     *
-     * @return  string
-     */
-    public function getLftName()
-    {
-        return NestedSet::LFT;
-    }
-
-    /**
-     * Get the rgt key name.
-     *
-     * @return  string
-     */
-    public function getRgtName()
-    {
-        return NestedSet::RGT;
-    }
-
-    /**
-     * Get the parent id key name.
-     *
-     * @return  string
-     */
-    public function getParentIdName()
-    {
-        return NestedSet::PARENT_ID;
-    }
-
-    /**
-     * Get the value of the model's lft key.
-     *
-     * @return  integer
-     */
-    public function getLft()
-    {
-        return $this->getAttributeValue($this->getLftName());
-    }
-
-    /**
-     * Get the value of the model's rgt key.
-     *
-     * @return  integer
-     */
-    public function getRgt()
-    {
-        return $this->getAttributeValue($this->getRgtName());
-    }
-
-    /**
-     * Get the value of the model's parent id key.
-     *
-     * @return  integer
-     */
-    public function getParentId()
-    {
-        return $this->getAttributeValue($this->getParentIdName());
-    }
-
-    /**
-     * Returns node that is next to current node without constraining to siblings.
-     *
-     * This can be either a next sibling or a next sibling of the parent node.
-     *
-     *
-     * @return Model|null
-     */
-    public function getNextNode(array $columns = ['*'])
-    {
-        return $this->nextNodes()->defaultOrder()->first($columns);
-    }
-
-    /**
-     * Returns node that is before current node without constraining to siblings.
-     *
-     * This can be either a prev sibling or parent node.
-     *
-     *
-     * @return Model|null
-     */
-    public function getPrevNode(array $columns = ['*'])
-    {
-        return $this->prevNodes()->defaultOrder('desc')->first($columns);
-    }
-
-    /**
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getAncestors(array $columns = ['*'])
-    {
-        return $this->ancestors()->get($columns);
-    }
-
-    /**
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getDescendants(array $columns = ['*'])
-    {
-        return $this->descendants()->get($columns);
-    }
-
-    /**
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getSiblings(array $columns = ['*'])
-    {
-        return $this->siblings()->get($columns);
-    }
-
-    /**
-     */
-    public function getNextSiblings(array $columns = ['*'])
-    {
-        return $this->nextSiblings()->get($columns);
-    }
-
-    /**
-     */
-    public function getPrevSiblings(array $columns = ['*'])
-    {
-        return $this->prevSiblings()->get($columns);
-    }
-
-    /**
-     * @return Model|QueryBuilder|object|null
-     */
-    public function getNextSibling(array $columns = ['*'])
-    {
-        return $this->nextSiblings()->defaultOrder()->first($columns);
-    }
-
-    /**
-     * @return Model|QueryBuilder|object|null
-     */
-    public function getPrevSibling(array $columns = ['*'])
-    {
-        return $this->prevSiblings()->defaultOrder('desc')->first($columns);
-    }
-
-    /**
-     * Get whether a node is a descendant of other node.
-     *
-     *
-     * @return bool
-     */
-    public function isDescendantOf(self $other)
-    {
-        return $this->getLft() > $other->getLft() &&
-            $this->getLft() < $other->getRgt();
-    }
-
-    /**
-     * Get whether a node is itself or a descendant of other node.
-     *
-     *
-     * @return bool
-     */
-    public function isSelfOrDescendantOf(self $other)
-    {
-        return $this->getLft() >= $other->getLft() &&
-            $this->getLft() < $other->getRgt();
-    }
-
-    /**
-     * Get whether the node is immediate children of other node.
-     *
-     *
-     * @return bool
-     */
-    public function isChildOf(self $other)
-    {
-        return $this->getParentId() == $other->getKey();
-    }
-
-    /**
-     * Get whether the node is a sibling of another node.
-     *
-     *
-     * @return bool
-     */
-    public function isSiblingOf(self $other)
-    {
-        return $this->getParentId() == $other->getParentId();
-    }
-
-    /**
-     * Get whether the node is an ancestor of other node, including immediate parent.
-     *
-     *
-     * @return bool
-     */
-    public function isAncestorOf(self $other)
-    {
-        return $other->isDescendantOf($this);
-    }
-
-    /**
-     * Get whether the node is itself or an ancestor of other node, including immediate parent.
-     *
-     *
-     * @return bool
-     */
-    public function isSelfOrAncestorOf(self $other)
-    {
-        return $other->isSelfOrDescendantOf($this);
-    }
-
-    /**
-     * Get whether the node has moved since last save.
-     *
-     * @return bool
-     */
-    public function hasMoved()
-    {
-        return $this->moved;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getArrayableRelations()
-    {
-        $result = parent::getArrayableRelations();
-
-        // To fix #17 when converting tree to json falling to infinite recursion.
-        unset($result['parent']);
-
-        return $result;
-    }
-
-    /**
-     * Get whether user is intended to delete the model from database entirely.
-     *
-     * @return bool
-     */
-    protected function hardDeleting()
-    {
-        return !$this->usesSoftDelete() || $this->forceDeleting;
-    }
-
-    /**
-     * @return array
-     */
-    public function getBounds()
-    {
-        return [$this->getLft(), $this->getRgt()];
-    }
-
-    /**
-     *
-     * @return $this
-     */
-    public function setLft(int $value)
-    {
-        $this->attributes[$this->getLftName()] = $value;
-
-        return $this;
-    }
-
-    /**
-     *
-     * @return $this
-     */
-    public function setRgt(int $value)
-    {
-        $this->attributes[$this->getRgtName()] = $value;
-
-        return $this;
-    }
-
-    /**
-     *
-     * @return $this
-     */
-    public function setParentId(int|null $value)
-    {
-        $this->attributes[$this->getParentIdName()] = $value;
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    protected function dirtyBounds()
-    {
-        $this->original[$this->getLftName()] = null;
-        $this->original[$this->getRgtName()] = null;
-
-        return $this;
-    }
-
-    /**
-     *
-     * @return $this
-     */
-    protected function assertNotDescendant(self $node)
-    {
-        if ($node == $this || $node->isDescendantOf($this)) {
-            $field = $node->getParentIdName();
-            $error = \Illuminate\Validation\ValidationException::withMessages([
-                $field => [__('crud.errors.node_must_not_be_a_descendant')]
-            ]);
-            throw $error;
-            //throw new LogicException('Node must not be a descendant.');
-        }
-
-        return $this;
-    }
-
-    /**
-     *
-     * @return $this
-     */
-    protected function assertNodeExists(self $node)
-    {
-        if (!$node->getLft() || !$node->getRgt()) {
-            $field = $node->getParentIdName();
-            $error = \Illuminate\Validation\ValidationException::withMessages([
-                $field => [__('crud.errors.invalid_node')]
-            ]);
-            throw $error;
-        }
-
-        return $this;
-    }
-
-    /**
-     */
-    protected function assertSameScope(self $node)
-    {
-        return;
-        /*if ( ! $scoped = $this->getScopeAttributes()) {
-            return;
-        }
-
-        foreach ($scoped as $attr) {
-            if ($this->getAttribute($attr) != $node->getAttribute($attr)) {
-                throw new LogicException('Nodes must be in the same scope');
-            }
-        }*/
-    }
-
-    /**
-     *
-     * @return \Illuminate\Database\Eloquent\Model
-     */
-    public function replicate(array $except = null)
-    {
-        $defaults = [
-            $this->getParentIdName(),
-            $this->getLftName(),
-            $this->getRgtName(),
-        ];
-
-        $except = $except ? array_unique(array_merge($except, $defaults)) : $defaults;
-
-        return parent::replicate($except);
-    }
-}
diff --git a/app/Models/Creature.php b/app/Models/Creature.php
index 11940b587c..9bda585818 100644
--- a/app/Models/Creature.php
+++ b/app/Models/Creature.php
@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Creature
@@ -32,7 +33,7 @@ class Creature extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -80,22 +81,11 @@ class Creature extends MiscModel
     /**
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'creature_id';
     }
 
-
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     * @throws \Exception
-     */
-    public function setCreatureIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Performance with for datagrids
      */
diff --git a/app/Models/Event.php b/app/Models/Event.php
index 4a02b87cf8..22794ffe42 100644
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -4,7 +4,6 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -12,6 +11,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Event
@@ -27,13 +27,12 @@
  */
 class Event extends MiscModel
 {
-    use Acl
-    ;
+    use Acl;
     use CalendarDateTrait;
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -57,6 +56,8 @@ class Event extends MiscModel
         'event.name',
     ];
 
+    protected string $entityType = 'event';
+
     /**
      * Fields that can be sorted on
      */
@@ -104,9 +105,7 @@ public function scopePreparedWith(Builder $query): Builder
             'event.entity' => function ($sub) {
                 $sub->select('id', 'name', 'entity_id', 'type_id');
             },
-            'descendants' => function ($sub) {
-                $sub->select('id', 'name', 'event_id');
-            },
+            'descendants',
             'events' => function ($sub) {
                 $sub->select('id', 'name', 'event_id');
             },
@@ -125,19 +124,6 @@ public function datagridSelectFields(): array
         return ['location_id', 'event_id', 'date'];
     }
 
-    /**
-     * Entity type
-     */
-    protected string $entityType = 'event';
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function campaign()
-    {
-        return $this->belongsTo('App\Models\Campaign', 'campaign_id', 'id');
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -170,23 +156,11 @@ public function entityTypeId(): int
         return (int) config('entities.ids.event');
     }
 
-    /**
-     * @return string
-     */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'event_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setEventIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      */
     public function menuItems(array $items = []): array
diff --git a/app/Models/Family.php b/app/Models/Family.php
index 2a7198099a..f61a2d06a9 100644
--- a/app/Models/Family.php
+++ b/app/Models/Family.php
@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Family
@@ -31,7 +32,7 @@ class Family extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -93,20 +94,11 @@ class Family extends MiscModel
      * Parent ID used for the Node Trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'family_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setFamilyIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Performance with for datagrids
      */
diff --git a/app/Models/Item.php b/app/Models/Item.php
index d0b0928e77..357614e7f9 100644
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -129,7 +129,7 @@ public function tooltipSubtitle(): string
     }
 
 
-    public function getParentIdName(): string
+    public function getParentKeyName(): string
     {
         return 'item_id';
     }
diff --git a/app/Models/Journal.php b/app/Models/Journal.php
index 75b78d6082..c92496ddab 100644
--- a/app/Models/Journal.php
+++ b/app/Models/Journal.php
@@ -12,6 +12,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Builder;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Journal
@@ -35,7 +36,7 @@ class Journal extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -216,20 +217,11 @@ public function entityTypeId(): int
      * Parent ID field for the Node trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'journal_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setJournalIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Determine if the model has profile data to be displayed
      */
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 6c2a1eda17..efa8e9ceca 100644
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -6,13 +6,13 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Location
@@ -39,7 +39,7 @@ class Location extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -83,10 +83,7 @@ class Location extends MiscModel
         'base',
     ];
 
-    /**
-     * @return string
-     */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'location_id';
     }
@@ -267,15 +264,6 @@ public function allOrganisations()
         return Organisation::whereIn('location_id', $locationIds)->with('location');
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setLocationIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Detach children when moving this entity from one campaign to another
      */
diff --git a/app/Models/Map.php b/app/Models/Map.php
index 6c4c3c7ecb..1b940b46ca 100644
--- a/app/Models/Map.php
+++ b/app/Models/Map.php
@@ -15,6 +15,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Ability
@@ -49,7 +50,7 @@ class Map extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -149,19 +150,11 @@ class Map extends MiscModel
      * Parent ID used for the Node Trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'map_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setMapIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
 
     /**
      * Performance with for datagrids
diff --git a/app/Models/MiscModel.php b/app/Models/MiscModel.php
index 34018ef98c..dc6284f3fd 100644
--- a/app/Models/MiscModel.php
+++ b/app/Models/MiscModel.php
@@ -478,8 +478,6 @@ public function ignoredLogAttributes(): array
             'campaign_id',
             'updated_at',
             'deleted_at',
-            '_lft',
-            '_rgt',
         ];
     }
 
diff --git a/app/Models/Note.php b/app/Models/Note.php
index f7ff85a3e8..589619c927 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Note
@@ -25,7 +26,7 @@ class Note extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
 
     /** @var string[]  */
@@ -121,20 +122,11 @@ public function notes()
      * Parent ID field for the Node trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'note_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setNoteIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Define the fields unique to this model that can be used on filters
      * @return string[]
diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
index b0699cfa23..5a6aee4fcb 100644
--- a/app/Models/Organisation.php
+++ b/app/Models/Organisation.php
@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Organisation
@@ -32,7 +33,7 @@ class Organisation extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -106,6 +107,7 @@ public function scopePreparedWith(Builder $query): Builder
                 'location',
                 'location.entity',
                 'organisation',
+                'organisation.entity',
                 'members',
                 'organisations',
                 'children' => function ($sub) {
@@ -184,21 +186,11 @@ public function organisations()
     /**
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'organisation_id';
     }
 
-
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setOrganisationIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
diff --git a/app/Models/Quest.php b/app/Models/Quest.php
index f8ad0f9a70..2b1d13abec 100644
--- a/app/Models/Quest.php
+++ b/app/Models/Quest.php
@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Collection;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Quest
@@ -35,7 +36,7 @@ class Quest extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -206,20 +207,11 @@ public function quests()
         return $this->hasMany(Quest::class);
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setQuestIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Parent ID field for the Node trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'quest_id';
     }
diff --git a/app/Models/Race.php b/app/Models/Race.php
index b801133a5b..ebfe2e6d55 100644
--- a/app/Models/Race.php
+++ b/app/Models/Race.php
@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Race
@@ -32,7 +33,7 @@ class Race extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -80,22 +81,11 @@ class Race extends MiscModel
     /**
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'race_id';
     }
 
-
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     * @throws \Exception
-     */
-    public function setRaceIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Performance with for datagrids
      */
@@ -108,6 +98,8 @@ public function scopePreparedWith(Builder $query): Builder
             'entity.image' => function ($sub) {
                 $sub->select('campaign_id', 'id', 'ext', 'focus_x', 'focus_y');
             },
+            'race',
+            'race.entity',
             'races' => function ($sub) {
                 $sub->select('id', 'name', 'race_id');
             },
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 470673667c..aac9086598 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -14,6 +14,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Tag
@@ -36,7 +37,7 @@ class Tag extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
     use TagScopes;
@@ -111,29 +112,12 @@ public function tags()
     {
         return $this->hasMany('App\Models\Tag', 'tag_id', 'id');
     }
-    public function children()
-    {
-        return $this->tags();
-    }
 
-    /**
-     * @return string
-     */
-    public function getParentIdName()
+    public function getParentKeyName(): string
     {
         return 'tag_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     * @throws \Exception
-     */
-    public function setTagIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      */
     public function scopePreparedWith(Builder $query): Builder
@@ -154,9 +138,7 @@ public function scopePreparedWith(Builder $query): Builder
             'tags' => function ($sub) {
                 $sub->select('id', 'tag_id', 'name');
             },
-            'descendants' => function ($sub) {
-                $sub->select('id', 'tag_id');
-            },
+            'descendants',
             'descendants.entities' => function ($sub) {
                 $sub->select('entities.id', 'entities.name', 'entities.entity_id', 'entities.type_id');
             },
diff --git a/app/Models/Timeline.php b/app/Models/Timeline.php
index f23b18b10f..02e4cca4df 100644
--- a/app/Models/Timeline.php
+++ b/app/Models/Timeline.php
@@ -8,10 +8,12 @@
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Collection;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * @property TimelineEra[]|Collection $eras
@@ -26,7 +28,7 @@ class Timeline extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
 
@@ -131,10 +133,7 @@ public function calendar()
         return $this->belongsTo('App\Models\Calendar', 'calendar_id', 'id');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function timelines()
+    public function timelines(): HasMany
     {
         return $this->hasMany('App\Models\Timeline', 'timeline_id', 'id');
     }
@@ -147,18 +146,12 @@ public function timeline()
         return $this->belongsTo('App\Models\Timeline', 'timeline_id', 'id');
     }
 
-    /**
-     *
-     */
-    public function eras()
+    public function eras(): HasMany
     {
         return $this->hasMany('App\Models\TimelineEra');
     }
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function elements()
+    public function elements(): HasMany
     {
         return $this->hasMany(
             'App\Models\TimelineElement',
@@ -168,20 +161,11 @@ public function elements()
     /**
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'timeline_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int|null $value
-     */
-    public function setTimelineIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      */
     public function menuItems(array $items = []): array
diff --git a/app/Observers/AbilityObserver.php b/app/Observers/AbilityObserver.php
index 9d4c801588..760a2e267f 100644
--- a/app/Observers/AbilityObserver.php
+++ b/app/Observers/AbilityObserver.php
@@ -21,7 +21,5 @@ public function deleting(MiscModel $model)
             $sub->ability_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($model, 'ability_id');
     }
 }
diff --git a/app/Observers/AttributeTemplateObserver.php b/app/Observers/AttributeTemplateObserver.php
index eed5a31f49..2434282aba 100644
--- a/app/Observers/AttributeTemplateObserver.php
+++ b/app/Observers/AttributeTemplateObserver.php
@@ -20,7 +20,5 @@ public function deleting(MiscModel $attributeTemplate)
             $sub->attribute_template_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($attributeTemplate, 'attribute_template_id');
     }
 }
diff --git a/app/Observers/CreatureObserver.php b/app/Observers/CreatureObserver.php
index 1026b7977a..17c78c661a 100644
--- a/app/Observers/CreatureObserver.php
+++ b/app/Observers/CreatureObserver.php
@@ -31,7 +31,5 @@ public function deleting(Creature $creature)
             $sub->creature_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($creature, 'creature_id');
     }
 }
diff --git a/app/Observers/EventObserver.php b/app/Observers/EventObserver.php
index 04f8fe2bd7..09828b7522 100644
--- a/app/Observers/EventObserver.php
+++ b/app/Observers/EventObserver.php
@@ -16,7 +16,5 @@ public function deleting(Event $event)
             $sub->event_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($event, 'event_id');
     }
 }
diff --git a/app/Observers/FamilyObserver.php b/app/Observers/FamilyObserver.php
index 7b434327c9..a8a45b1467 100644
--- a/app/Observers/FamilyObserver.php
+++ b/app/Observers/FamilyObserver.php
@@ -73,7 +73,5 @@ public function deleting(Family $family)
             $sub->family_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($family, 'family_id');
     }
 }
diff --git a/app/Observers/JournalObserver.php b/app/Observers/JournalObserver.php
index b3a35c7adb..0ef1f71e93 100644
--- a/app/Observers/JournalObserver.php
+++ b/app/Observers/JournalObserver.php
@@ -20,7 +20,5 @@ public function deleting(MiscModel $journal)
             $sub->journal_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($journal, 'journal_id');
     }
 }
diff --git a/app/Observers/LocationObserver.php b/app/Observers/LocationObserver.php
index d6fba3a8ca..1754fa1dc9 100644
--- a/app/Observers/LocationObserver.php
+++ b/app/Observers/LocationObserver.php
@@ -19,8 +19,6 @@ public function deleting(Location $location)
             $sub->location_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($location, 'location_id');
     }
 
     /**
diff --git a/app/Observers/MapObserver.php b/app/Observers/MapObserver.php
index f2f4c48523..67d2db062f 100644
--- a/app/Observers/MapObserver.php
+++ b/app/Observers/MapObserver.php
@@ -39,8 +39,6 @@ public function deleting(MiscModel $model)
             $sub->map_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($model, 'map_id');
     }
 
     /**
diff --git a/app/Observers/MiscObserver.php b/app/Observers/MiscObserver.php
index 1be6dc50f0..02a96bef47 100644
--- a/app/Observers/MiscObserver.php
+++ b/app/Observers/MiscObserver.php
@@ -165,35 +165,4 @@ protected function syncMentions(MiscModel $model, Entity $entity)
             $this->entityMappingService->silent()->mapEntity($entity);
         }
     }
-
-
-
-    /**
-     * @param MiscModel|Location $model
-     */
-    protected function cleanupTree(MiscModel $model, string $field = 'parent_id')
-    {
-        // Warning: we probably don't need this anymore, since we've removed the deleted() listened
-        // in the Nested trait.
-
-        // We need to refresh our foreign relations to avoid deleting our children nodes again
-        $model->refresh();
-
-        // Check that we have no descendants anymore.
-        /** @var Location $model */
-        if ($model->descendants()->count() === 0) {
-            return;
-        }
-
-        foreach ($model->descendants as $sub) {
-            if (!empty($sub->$field)) {
-                continue;
-            }
-
-            // Got a descendant with the parent id null. Let's get them out of the tree
-            $sub->{$sub->getLftName()} = null;
-            $sub->{$sub->getRgtName()} = null;
-            $sub->save();
-        }
-    }
 }
diff --git a/app/Observers/NoteObserver.php b/app/Observers/NoteObserver.php
index d5c3ef1356..1cd2c9580f 100644
--- a/app/Observers/NoteObserver.php
+++ b/app/Observers/NoteObserver.php
@@ -20,7 +20,5 @@ public function deleting(MiscModel $note)
             $sub->note_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($note, 'note_id');
     }
 }
diff --git a/app/Observers/OrganisationObserver.php b/app/Observers/OrganisationObserver.php
index 5dc40a60f9..843b062a4b 100644
--- a/app/Observers/OrganisationObserver.php
+++ b/app/Observers/OrganisationObserver.php
@@ -30,11 +30,8 @@ public function deleting(Organisation $organisation)
          */
         foreach ($organisation->organisations as $child) {
             $child->organisation_id = null;
-            $child->save();
+            $child->saveQuietly();
         }
-
-        // We need to refresh our foreign relations to avoid deleting our children nodes again
-        $this->cleanupTree($organisation, 'organisation_id');
     }
 
     /**
diff --git a/app/Observers/RaceObserver.php b/app/Observers/RaceObserver.php
index 691cbe9329..f7e5949c89 100644
--- a/app/Observers/RaceObserver.php
+++ b/app/Observers/RaceObserver.php
@@ -33,7 +33,5 @@ public function deleting(Race $race)
             $sub->race_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($race, 'race_id');
     }
 }
diff --git a/app/Observers/TagObserver.php b/app/Observers/TagObserver.php
index 1a9fd989a9..9d70c2a2f4 100644
--- a/app/Observers/TagObserver.php
+++ b/app/Observers/TagObserver.php
@@ -13,9 +13,7 @@ public function deleting(Tag $model)
         // Update sub tags to clean them up
         foreach ($model->tags as $child) {
             $child->tag_id = null;
-            $child->save();
+            $child->saveQuietly();
         }
-
-        $this->cleanupTree($model, 'tag_id');
     }
 }
diff --git a/app/Observers/TimelineObserver.php b/app/Observers/TimelineObserver.php
index 3b206d0726..461dfe9d4f 100644
--- a/app/Observers/TimelineObserver.php
+++ b/app/Observers/TimelineObserver.php
@@ -53,7 +53,5 @@ public function deleting(MiscModel $timeline)
             $sub->timeline_id = null;
             $sub->saveQuietly();
         }
-
-        $this->cleanupTree($timeline, 'timeline_id');
     }
 }
diff --git a/app/Services/Campaign/Import/ImportService.php b/app/Services/Campaign/Import/ImportService.php
index c89ba74460..aa1034280f 100644
--- a/app/Services/Campaign/Import/ImportService.php
+++ b/app/Services/Campaign/Import/ImportService.php
@@ -265,7 +265,7 @@ protected function entities(): self
                 unset($data);
             }
             $this->logs[] = $count;
-            $mapper->tree()->fixTree()->clear();
+            $mapper->tree()->clear();
         }
 
         // Second parse
diff --git a/app/Services/Campaign/Import/Mappers/EntityMapper.php b/app/Services/Campaign/Import/Mappers/EntityMapper.php
index c4597d9bd0..5077fe6171 100644
--- a/app/Services/Campaign/Import/Mappers/EntityMapper.php
+++ b/app/Services/Campaign/Import/Mappers/EntityMapper.php
@@ -495,15 +495,4 @@ protected function foreignMentions(): self
         }
         return $this;
     }
-
-    public function fixTree(): self
-    {
-        $base = app()->make($this->className);
-        if (!method_exists($base, 'recalculateTreeBounds')) {
-            return $this;
-        }
-        // @phpstan-ignore-next-line
-        $base->fixCampaignTree($this->campaign->id);
-        return $this;
-    }
 }
diff --git a/app/Services/Entity/EntityRelationService.php b/app/Services/Entity/EntityRelationService.php
index 698b685ada..41ffffe8aa 100644
--- a/app/Services/Entity/EntityRelationService.php
+++ b/app/Services/Entity/EntityRelationService.php
@@ -669,7 +669,7 @@ protected function addLocation(): self
      */
     protected function addParent()
     {
-        if (!method_exists($this->entity->child, 'getParentIdName')) {
+        if (!method_exists($this->entity->child, 'getParentKeyName')) {
             // If not part of the node model, check for the {self}_id attribute
             // @phpstan-ignore-next-line
             if (!array_key_exists($this->entity->type() . '_id', $this->entity->child->getAttributes())) {
diff --git a/app/Services/Entity/MoveService.php b/app/Services/Entity/MoveService.php
index b2a9788168..a2c2bf23e9 100644
--- a/app/Services/Entity/MoveService.php
+++ b/app/Services/Entity/MoveService.php
@@ -13,7 +13,6 @@
 use App\Models\Timeline;
 use App\Models\TimelineEra;
 use App\Traits\CampaignAware;
-use App\Traits\CanFixTree;
 use App\Traits\EntityAware;
 use App\Traits\UserAware;
 use Illuminate\Support\Facades\DB;
@@ -24,7 +23,6 @@
 class MoveService
 {
     use CampaignAware;
-    use CanFixTree;
     use EntityAware;
     use UserAware;
 
@@ -113,7 +111,6 @@ protected function copyEntity(): bool
             }
 
             CampaignLocalization::forceCampaign($this->to);
-            $this->fixTree($newModel);
 
             // The model is ready to be saved.
             $newModel->saveQuietly();
@@ -216,7 +213,6 @@ protected function moveEntity(): bool
             }
             $this->entity->saveQuietly();
 
-            $this->fixTree($child);
             // Update child second. We do this otherwise we'll have an old entity and a new one
             $child->campaign_id = $this->to->id;
             if (empty($child->slug)) {
diff --git a/app/Services/Entity/TransformService.php b/app/Services/Entity/TransformService.php
index 1223ca82be..282ea65cc0 100644
--- a/app/Services/Entity/TransformService.php
+++ b/app/Services/Entity/TransformService.php
@@ -6,19 +6,14 @@
 use App\Models\Character;
 use App\Models\Entity;
 use App\Models\Post;
-use App\Models\Family;
-use App\Models\Location;
 use App\Models\MiscModel;
-use App\Models\Organisation;
 use App\Models\OrganisationMember;
-use App\Traits\CanFixTree;
 use App\Traits\EntityAware;
 use Illuminate\Support\Str;
 use Exception;
 
 class TransformService
 {
-    use CanFixTree;
     use EntityAware;
 
     protected MiscModel $child;
@@ -46,8 +41,6 @@ public function transform(string $target): Entity
             ->removePosts()
         ;
 
-        $this->fixTree($this->new);
-
         // Finally, we can save. Should be all good.
         $this->new->campaign_id = $this->child->campaign_id;
         $this->new->saveQuietly();
diff --git a/app/Services/RecoveryService.php b/app/Services/RecoveryService.php
index d6d321284a..1b1ce99630 100644
--- a/app/Services/RecoveryService.php
+++ b/app/Services/RecoveryService.php
@@ -127,8 +127,8 @@ protected function trashChild(Entity $entity, MiscModel $child = null)
         \App\Facades\CampaignLocalization::setConsoleCampaign($entity->campaign_id);
 
         // Update the parent_id / tree before
-        if (method_exists($child, 'getParentIdName')) {
-            $parentField = $child->getParentIdName();
+        if (method_exists($child, 'getParentKeyName')) {
+            $parentField = $child->getParentKeyName();
 
             // Detach children of this entity. Usually this is already done in the model observer, because
             // if the parent is deleted in a node, the children aren't available.
@@ -151,11 +151,6 @@ protected function trashChild(Entity $entity, MiscModel $child = null)
 
             // Clean up the parent and tree to avoid the nested plugin to delete every child
             $child->$parentField = null;
-            if (method_exists($child, 'getRgtName')) {
-                $child->_lft = null; // @phpstan-ignore-line
-                $child->_rgt = null; // @phpstan-ignore-line
-            }
-
             $child->timestamps = false;
             $child->saveQuietly();
             $child->refresh();
@@ -173,7 +168,6 @@ protected function trashChild(Entity $entity, MiscModel $child = null)
 
         $child->forceDelete();
 
-
         // Unset the campaign id limitation again
         \App\Facades\CampaignLocalization::setConsoleCampaign(0);
 
diff --git a/app/Traits/CanFixTree.php b/app/Traits/CanFixTree.php
deleted file mode 100644
index 15f975592e..0000000000
--- a/app/Traits/CanFixTree.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Traits;
-
-use App\Models\Location;
-use App\Models\MiscModel;
-
-trait CanFixTree
-{
-    /**
-     * When transforming or moving an entity, we need to fix its tree
-     */
-    protected function fixTree(MiscModel $model): void
-    {
-        /** @var Location $model */
-        // When transforming to a nested model, we need to recalculate the tree bounds to
-        // place it correctly in the overall campaign tree.
-        if (!method_exists($model, 'recalculateTreeBounds')) {
-            // If it's not nested with a full tree, but still has a parent id, set that to null
-            if (method_exists($model, 'getParentIdName')) {
-                $model->{$model->getParentIdName()} = null;
-            }
-            return;
-        }
-        $isLocationWithParent = in_array('location_id', $model->getFillable()) && !empty($model->getParentId());
-        // If it's not a location or the parent location is empty, force the parent to be properly empty
-        if (!$isLocationWithParent) {
-            /** @var Location $model */
-            $model->setParentId(null);
-        }
-        $model->{$model->getRgtName()} = 0;
-        $model->{$model->getLftName()} = 0;
-        if ($model->exists) {
-            $model->exists = false;
-            $model->recalculateTreeBounds();
-            $model->exists = true;
-        } else {
-            $model->recalculateTreeBounds();
-        }
-        // For a location with a parent, place it inside the tree
-        if ($isLocationWithParent) {
-            $model->forcePendingAction();
-        }
-    }
-}
diff --git a/app/Traits/ExportableTrait.php b/app/Traits/ExportableTrait.php
index e554d95a75..bbec4d54d3 100644
--- a/app/Traits/ExportableTrait.php
+++ b/app/Traits/ExportableTrait.php
@@ -47,8 +47,8 @@ protected function baseExportData(): self
                 $this->exportData[$baseField] = $this->$baseField;
             }
         }
-        if (method_exists($this, 'getParentIdName')) {
-            $this->exportData[$this->getParentIdName()] = $this->getAttribute($this->getParentIdName());
+        if (method_exists($this, 'getParentKeyName')) {
+            $this->exportData[$this->getParentKeyName()] = $this->getAttribute($this->getParentKeyName());
         }
 
         return $this;
diff --git a/app/Traits/TreeControllerTrait.php b/app/Traits/TreeControllerTrait.php
index bf97f4fd31..18453a6a77 100644
--- a/app/Traits/TreeControllerTrait.php
+++ b/app/Traits/TreeControllerTrait.php
@@ -70,7 +70,7 @@ public function tree(Request $request, Campaign $campaign)
             ->distinct();
 
         /** @var Tag $model **/
-        $parentKey = $model->getParentIdName();
+        $parentKey = $model->getParentKeyName();
         $parent = null;
         if (request()->has('parent_id')) {
             $base->where([$model->getTable() . '.' . $parentKey => request()->get('parent_id')]);
diff --git a/composer.json b/composer.json
index a236df48a7..d4b73d8049 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,8 @@
         "sergej-kurakin/diceroller": "^2.0",
         "spatie/laravel-backup": "^8.0",
         "srmklive/paypal": "^3.0",
+        "staudenmeir/laravel-adjacency-list": "^1.0",
+        "staudenmeir/laravel-cte": "^1.0",
         "stechstudio/laravel-zipstream": "^4.13",
         "stevebauman/purify": "5.1.*",
         "symfony/http-client": "^6.2",
diff --git a/composer.lock b/composer.lock
index e4ee4f72af..1e92137cc0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a8633acb841bbc3315fac40289477004",
+    "content-hash": "9920ed83b12c85baa70f8510ca1130cc",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -7895,6 +7895,169 @@
             },
             "time": "2023-11-09T22:02:55+00:00"
         },
+        {
+            "name": "staudenmeir/eloquent-has-many-deep-contracts",
+            "version": "v1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/staudenmeir/eloquent-has-many-deep-contracts.git",
+                "reference": "c39317b839d6123be126b9980e4a3d38310f5939"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/staudenmeir/eloquent-has-many-deep-contracts/zipball/c39317b839d6123be126b9980e4a3d38310f5939",
+                "reference": "c39317b839d6123be126b9980e4a3d38310f5939",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/database": "^10.0",
+                "php": "^8.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Staudenmeir\\EloquentHasManyDeepContracts\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonas Staudenmeir",
+                    "email": "mail@jonas-staudenmeir.de"
+                }
+            ],
+            "description": "Contracts for staudenmeir/eloquent-has-many-deep",
+            "support": {
+                "issues": "https://github.com/staudenmeir/eloquent-has-many-deep-contracts/issues",
+                "source": "https://github.com/staudenmeir/eloquent-has-many-deep-contracts/tree/v1.1"
+            },
+            "time": "2023-01-18T12:43:26+00:00"
+        },
+        {
+            "name": "staudenmeir/laravel-adjacency-list",
+            "version": "v1.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/staudenmeir/laravel-adjacency-list.git",
+                "reference": "051f35cf6a54c8950fb0669b71c1ea2943a25af2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/051f35cf6a54c8950fb0669b71c1ea2943a25af2",
+                "reference": "051f35cf6a54c8950fb0669b71c1ea2943a25af2",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/database": "^10.0",
+                "php": "^8.1",
+                "staudenmeir/eloquent-has-many-deep-contracts": "^1.1",
+                "staudenmeir/laravel-cte": "^1.8"
+            },
+            "require-dev": {
+                "barryvdh/laravel-ide-helper": "^2.13",
+                "doctrine/dbal": "^3.5.2",
+                "mockery/mockery": "^1.5.1",
+                "nunomaduro/larastan": "^2.0",
+                "orchestra/testbench": "^8.15",
+                "phpunit/phpunit": "^10.1",
+                "singlestoredb/singlestoredb-laravel": "^1.5.1",
+                "staudenmeir/eloquent-has-many-deep": "^1.18.1"
+            },
+            "suggest": {
+                "barryvdh/laravel-ide-helper": "Provide type hints for attributes and relations."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Staudenmeir\\LaravelAdjacencyList\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonas Staudenmeir",
+                    "email": "mail@jonas-staudenmeir.de"
+                }
+            ],
+            "description": "Recursive Laravel Eloquent relationships with CTEs",
+            "support": {
+                "issues": "https://github.com/staudenmeir/laravel-adjacency-list/issues",
+                "source": "https://github.com/staudenmeir/laravel-adjacency-list/tree/v1.14"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/JonasStaudenmeir",
+                    "type": "custom"
+                }
+            ],
+            "time": "2023-11-30T13:36:43+00:00"
+        },
+        {
+            "name": "staudenmeir/laravel-cte",
+            "version": "v1.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/staudenmeir/laravel-cte.git",
+                "reference": "87f4447829a0f6a6268f52f875c468915cab4909"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/staudenmeir/laravel-cte/zipball/87f4447829a0f6a6268f52f875c468915cab4909",
+                "reference": "87f4447829a0f6a6268f52f875c468915cab4909",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/database": "^10.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^8.0",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^10.1",
+                "singlestoredb/singlestoredb-laravel": "^1.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Staudenmeir\\LaravelCte\\DatabaseServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Staudenmeir\\LaravelCte\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonas Staudenmeir",
+                    "email": "mail@jonas-staudenmeir.de"
+                }
+            ],
+            "description": "Laravel queries with common table expressions",
+            "support": {
+                "issues": "https://github.com/staudenmeir/laravel-cte/issues",
+                "source": "https://github.com/staudenmeir/laravel-cte/tree/v1.9"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/JonasStaudenmeir",
+                    "type": "custom"
+                }
+            ],
+            "time": "2023-09-01T17:22:23+00:00"
+        },
         {
             "name": "stechstudio/laravel-zipstream",
             "version": "4.13",
diff --git a/database/migrations/2023_12_02_154727_remove_old_trees.php b/database/migrations/2023_12_02_154727_remove_old_trees.php
new file mode 100644
index 0000000000..270ca9cea9
--- /dev/null
+++ b/database/migrations/2023_12_02_154727_remove_old_trees.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $tables = [
+            'abilities',
+            'attribute_templates',
+            'calendars',
+            'creatures',
+            'events',
+            'events',
+            'families',
+            'items',
+            'journals',
+            'locations',
+            'maps',
+            'notes',
+            'organisations',
+            'quests',
+            'races',
+            'tags',
+            'timelines',
+        ];
+        foreach ($tables as $tableName) {
+            if (!Schema::hasColumn($tableName, '_lft')) {
+                continue;
+            }
+            Schema::table($tableName, function (Blueprint $table) {
+                $table->dropColumn('_lft');
+                $table->dropColumn('_rgt');
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};

From 6340a9f3d6388f9e2e4950bfab0216c3e877a5af Mon Sep 17 00:00:00 2001
From: ilestis <ilestis@users.noreply.github.com>
Date: Sat, 2 Dec 2023 15:51:37 +0000
Subject: [PATCH 15/28] Fix styling

---
 app/Console/Commands/InstallCommand.php                    | 2 +-
 app/Models/Ability.php                                     | 1 -
 app/Models/AttributeTemplate.php                           | 1 -
 app/Models/Creature.php                                    | 1 -
 app/Models/Family.php                                      | 1 -
 app/Models/Journal.php                                     | 1 -
 app/Models/Map.php                                         | 1 -
 app/Models/Note.php                                        | 1 -
 app/Models/Organisation.php                                | 1 -
 app/Models/Quest.php                                       | 1 -
 app/Models/Race.php                                        | 1 -
 app/Models/Tag.php                                         | 1 -
 app/Models/Timeline.php                                    | 1 -
 app/Observers/MiscObserver.php                             | 1 -
 database/migrations/2023_12_02_154727_remove_old_trees.php | 5 ++---
 15 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/Console/Commands/InstallCommand.php b/app/Console/Commands/InstallCommand.php
index 074d7ed7fe..0bc03d3eff 100644
--- a/app/Console/Commands/InstallCommand.php
+++ b/app/Console/Commands/InstallCommand.php
@@ -33,7 +33,7 @@ public function handle()
                 return;
             }
         } catch (Exception) {
-            //
+
         }
         $this->call('key:generate');
         $this->call('migrate');
diff --git a/app/Models/Ability.php b/app/Models/Ability.php
index 82f59c1518..67c65ef2ce 100644
--- a/app/Models/Ability.php
+++ b/app/Models/Ability.php
@@ -5,7 +5,6 @@
 use App\Facades\Mentions;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
diff --git a/app/Models/AttributeTemplate.php b/app/Models/AttributeTemplate.php
index 9f7edbf859..378d8450d3 100644
--- a/app/Models/AttributeTemplate.php
+++ b/app/Models/AttributeTemplate.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Services\Attributes\RandomService;
 use App\Traits\CampaignTrait;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/app/Models/Creature.php b/app/Models/Creature.php
index 9bda585818..c4cd63b452 100644
--- a/app/Models/Creature.php
+++ b/app/Models/Creature.php
@@ -5,7 +5,6 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
diff --git a/app/Models/Family.php b/app/Models/Family.php
index f61a2d06a9..8c25b01106 100644
--- a/app/Models/Family.php
+++ b/app/Models/Family.php
@@ -5,7 +5,6 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
diff --git a/app/Models/Journal.php b/app/Models/Journal.php
index c92496ddab..c2c1d9b772 100644
--- a/app/Models/Journal.php
+++ b/app/Models/Journal.php
@@ -4,7 +4,6 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CalendarDateTrait;
 use App\Traits\CampaignTrait;
diff --git a/app/Models/Map.php b/app/Models/Map.php
index 1b940b46ca..28d0806bc8 100644
--- a/app/Models/Map.php
+++ b/app/Models/Map.php
@@ -5,7 +5,6 @@
 use App\Facades\CampaignLocalization;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
diff --git a/app/Models/Note.php b/app/Models/Note.php
index 589619c927..8e04a5355e 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
index 5a6aee4fcb..11b30a07aa 100644
--- a/app/Models/Organisation.php
+++ b/app/Models/Organisation.php
@@ -5,7 +5,6 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
diff --git a/app/Models/Quest.php b/app/Models/Quest.php
index 2b1d13abec..9db728ac1d 100644
--- a/app/Models/Quest.php
+++ b/app/Models/Quest.php
@@ -4,7 +4,6 @@
 
 use App\Enums\FilterOption;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CalendarDateTrait;
 use App\Traits\CampaignTrait;
diff --git a/app/Models/Race.php b/app/Models/Race.php
index ebfe2e6d55..3873d4f317 100644
--- a/app/Models/Race.php
+++ b/app/Models/Race.php
@@ -5,7 +5,6 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index aac9086598..af63ed6920 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -4,7 +4,6 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Models\Scopes\TagScopes;
 use App\Traits\CampaignTrait;
diff --git a/app/Models/Timeline.php b/app/Models/Timeline.php
index 02e4cca4df..fe06cda927 100644
--- a/app/Models/Timeline.php
+++ b/app/Models/Timeline.php
@@ -4,7 +4,6 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
-use App\Models\Concerns\Nested;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
diff --git a/app/Observers/MiscObserver.php b/app/Observers/MiscObserver.php
index 02a96bef47..ba451f6ca4 100644
--- a/app/Observers/MiscObserver.php
+++ b/app/Observers/MiscObserver.php
@@ -6,7 +6,6 @@
 use App\Facades\EntityCache;
 use App\Facades\Mentions;
 use App\Models\Entity;
-use App\Models\Location;
 use App\Models\MiscModel;
 use App\Observers\Concerns\Copiable;
 use App\Services\Entity\LogService;
diff --git a/database/migrations/2023_12_02_154727_remove_old_trees.php b/database/migrations/2023_12_02_154727_remove_old_trees.php
index 270ca9cea9..ff4e0ce657 100644
--- a/database/migrations/2023_12_02_154727_remove_old_trees.php
+++ b/database/migrations/2023_12_02_154727_remove_old_trees.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
@@ -46,6 +45,6 @@ public function up(): void
      */
     public function down(): void
     {
-        //
+
     }
 };

From 9d23ba90cdcc7748364dd5863f2099904bc3bd1f Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 09:57:40 -0600
Subject: [PATCH 16/28] Cleanup old migrations

---
 .../2017_10_27_091755_create_families.php     |  4 ---
 .../2017_10_27_102246_create_locations.php    |  4 ---
 ...2017_10_30_160256_create_journal_table.php |  4 ---
 .../2017_11_01_222903_create_organisation.php |  4 ---
 .../2017_11_03_181958_create_notes.php        |  3 --
 .../2017_11_16_145219_create_events.php       |  4 ---
 ...02_14_102646_create_attribute_template.php |  4 ---
 ...018_04_24_193803_create_sections_table.php |  3 --
 .../2018_09_25_134530_create_race.php         |  3 --
 ...20_03_05_174449_create_abilities_table.php |  5 ---
 .../2020_06_06_084917_create_maps_table.php   |  5 ---
 ...20_08_03_155441_create_timelines_table.php |  3 --
 ...22_10_20_192238_create_creatures_table.php |  4 ---
 ...03_28_182318_update_quests_add_nesting.php | 35 -------------------
 14 files changed, 85 deletions(-)
 delete mode 100644 database/migrations/2023_03_28_182318_update_quests_add_nesting.php

diff --git a/database/migrations/2017_10_27_091755_create_families.php b/database/migrations/2017_10_27_091755_create_families.php
index d99aa857fe..ed4e8eac3d 100644
--- a/database/migrations/2017_10_27_091755_create_families.php
+++ b/database/migrations/2017_10_27_091755_create_families.php
@@ -22,8 +22,6 @@ public function up()
             $table->integer('campaign_id')->unsigned()->notNull();
 
             $table->integer('family_id')->unsigned()->nullable();
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
 
             $table->string('type', 45)->nullable();
             $table->longText('entry')->nullable();
@@ -34,8 +32,6 @@ public function up()
             $table->boolean('is_private')->default(false);
             $table->index(['is_private']);
 
-            $table->index(['_lft', '_rgt', 'family_id']);
-
             // Foreign
             $table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
             $table->foreign('family_id')->references('id')->on('families')->onDelete('set null');
diff --git a/database/migrations/2017_10_27_102246_create_locations.php b/database/migrations/2017_10_27_102246_create_locations.php
index 2f9591c655..c743981b9c 100644
--- a/database/migrations/2017_10_27_102246_create_locations.php
+++ b/database/migrations/2017_10_27_102246_create_locations.php
@@ -35,13 +35,9 @@ public function up()
 
             $table->boolean('is_map_private')->default(0);
 
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-
             // Index
             $table->index(['name', 'slug', 'type']);
             $table->index(['is_private']);
-            $table->index(['_lft', '_rgt', 'parent_location_id']);
 
             // Foreign
             $table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
diff --git a/database/migrations/2017_10_30_160256_create_journal_table.php b/database/migrations/2017_10_30_160256_create_journal_table.php
index 00a2d4ff76..2577bef8fd 100644
--- a/database/migrations/2017_10_30_160256_create_journal_table.php
+++ b/database/migrations/2017_10_30_160256_create_journal_table.php
@@ -26,10 +26,6 @@ public function up()
             $table->unsignedInteger('author_id')->nullable();
             $table->unsignedInteger('location_id')->nullable();
 
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-            $table->index(['_lft', '_rgt']);
-
             // Overview
             $table->longText('entry')->nullable();
 
diff --git a/database/migrations/2017_11_01_222903_create_organisation.php b/database/migrations/2017_11_01_222903_create_organisation.php
index c274c34e4a..14b0970a4d 100644
--- a/database/migrations/2017_11_01_222903_create_organisation.php
+++ b/database/migrations/2017_11_01_222903_create_organisation.php
@@ -26,9 +26,6 @@ public function up()
 
             $table->longText('entry')->nullable();
 
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-
             $table->boolean('is_private')->default(false);
             $table->boolean('is_defunct')->default(0);
             $table->timestamps();
@@ -43,7 +40,6 @@ public function up()
 
             // Index
             $table->index(['name', 'slug', 'type']);
-            $table->index(['_lft', '_rgt', 'organisation_id']);
         });
 
         Schema::create('organisation_member', function (Blueprint $table) {
diff --git a/database/migrations/2017_11_03_181958_create_notes.php b/database/migrations/2017_11_03_181958_create_notes.php
index 1611b6dcf6..f2df595a26 100644
--- a/database/migrations/2017_11_03_181958_create_notes.php
+++ b/database/migrations/2017_11_03_181958_create_notes.php
@@ -22,8 +22,6 @@ public function up()
 
             $table->integer('campaign_id')->unsigned()->notNull();
             $table->unsignedInteger('note_id')->nullable();
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
 
 
             // Overview
@@ -41,7 +39,6 @@ public function up()
 
             // Index
             $table->index(['name', 'slug', 'type']);
-            $table->index(['_lft', '_rgt', 'note_id']);
         });
     }
 
diff --git a/database/migrations/2017_11_16_145219_create_events.php b/database/migrations/2017_11_16_145219_create_events.php
index e2e4cde1f2..0dde580c84 100644
--- a/database/migrations/2017_11_16_145219_create_events.php
+++ b/database/migrations/2017_11_16_145219_create_events.php
@@ -27,9 +27,6 @@ public function up()
             $table->unsignedInteger('event_id')->nullable();
 
             $table->longText('entry')->nullable();
-
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
             $table->timestamps();
 
             // Foreign
@@ -38,7 +35,6 @@ public function up()
 
             // Index
             $table->index(['name', 'slug', 'type', 'date', 'is_private']);
-            $table->index(['_lft', '_rgt']);
         });
     }
 
diff --git a/database/migrations/2018_02_14_102646_create_attribute_template.php b/database/migrations/2018_02_14_102646_create_attribute_template.php
index 49373335ff..375182d512 100644
--- a/database/migrations/2018_02_14_102646_create_attribute_template.php
+++ b/database/migrations/2018_02_14_102646_create_attribute_template.php
@@ -23,9 +23,6 @@ public function up()
             $table->string('name')->notNull();
             $table->boolean('is_private')->default(false)->notNull();
 
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-
             $table->timestamps();
 
             // Foreign
@@ -34,7 +31,6 @@ public function up()
 
             // Indexes
             $table->index(['name', 'is_private']);
-            $table->index(['_lft', '_rgt', 'attribute_template_id']);
         });
     }
 
diff --git a/database/migrations/2018_04_24_193803_create_sections_table.php b/database/migrations/2018_04_24_193803_create_sections_table.php
index 99a8210205..78448152cc 100644
--- a/database/migrations/2018_04_24_193803_create_sections_table.php
+++ b/database/migrations/2018_04_24_193803_create_sections_table.php
@@ -25,15 +25,12 @@ public function up()
             $table->string('colour', 20)->nullable();
 
             $table->unsignedInteger('tag_id')->nullable();
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
             $table->boolean('is_hidden')->default(false);
             $table->boolean('is_auto_applied')->default(0);
 
             $table->timestamps();
 
             $table->index(['name', 'type', 'is_private', 'is_hidden', 'is_auto_applied']);
-            $table->index(['tag_id', '_lft', '_rgt']);
 
             // Foreign
             $table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
diff --git a/database/migrations/2018_09_25_134530_create_race.php b/database/migrations/2018_09_25_134530_create_race.php
index 834dce22cf..16c709dae8 100644
--- a/database/migrations/2018_09_25_134530_create_race.php
+++ b/database/migrations/2018_09_25_134530_create_race.php
@@ -20,8 +20,6 @@ public function up()
             $table->unsignedInteger('campaign_id');
             $table->string('name', 191);
             $table->unsignedInteger('race_id')->nullable();
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
             $table->string('image', 255)->nullable();
             $table->string('type', 45)->nullable();
             $table->string('slug')->nullable();
@@ -33,7 +31,6 @@ public function up()
             $table->unsignedInteger('updated_by')->nullable();
 
             $table->index(['name', 'type', 'is_private']);
-            $table->index(['_lft', '_rgt', 'race_id']);
 
             $table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
             $table->foreign('created_by')->references('id')->on('users')->onDelete('set null');
diff --git a/database/migrations/2020_03_05_174449_create_abilities_table.php b/database/migrations/2020_03_05_174449_create_abilities_table.php
index 2db6855601..ed95128ed0 100644
--- a/database/migrations/2020_03_05_174449_create_abilities_table.php
+++ b/database/migrations/2020_03_05_174449_create_abilities_table.php
@@ -27,11 +27,6 @@ public function up()
             $table->unsignedInteger('ability_id')->nullable();
             $table->boolean('is_private')->default(false);
 
-            // Tree
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-            $table->index(['_lft', '_rgt', 'ability_id']);
-
             // Overview
             $table->longText('entry')->nullable();
             $table->string('charges', 120)->nullable();
diff --git a/database/migrations/2020_06_06_084917_create_maps_table.php b/database/migrations/2020_06_06_084917_create_maps_table.php
index 9116ce2cd2..fb26c95c89 100644
--- a/database/migrations/2020_06_06_084917_create_maps_table.php
+++ b/database/migrations/2020_06_06_084917_create_maps_table.php
@@ -28,11 +28,6 @@ public function up()
             $table->boolean('is_private')->default(false);
             $table->boolean('is_real')->default(false);
 
-            // Tree
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-            $table->index(['_lft', '_rgt', 'map_id']);
-
             // Overview
             $table->longText('entry')->nullable();
 
diff --git a/database/migrations/2020_08_03_155441_create_timelines_table.php b/database/migrations/2020_08_03_155441_create_timelines_table.php
index 3fb5fd45b3..e769fe058c 100644
--- a/database/migrations/2020_08_03_155441_create_timelines_table.php
+++ b/database/migrations/2020_08_03_155441_create_timelines_table.php
@@ -32,8 +32,6 @@ public function up()
             $table->longText('entry')->nullable();
 
             $table->boolean('revert_order')->default(false);
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
 
             $table->timestamps();
             $table->softDeletes();
@@ -45,7 +43,6 @@ public function up()
 
             // Index
             $table->index(['name', 'slug', 'type']);
-            $table->index(['_lft', '_rgt']);
         });
 
         Schema::create('timeline_eras', function (Blueprint $table) {
diff --git a/database/migrations/2022_10_20_192238_create_creatures_table.php b/database/migrations/2022_10_20_192238_create_creatures_table.php
index 583dd96fdc..eb6dcf5577 100644
--- a/database/migrations/2022_10_20_192238_create_creatures_table.php
+++ b/database/migrations/2022_10_20_192238_create_creatures_table.php
@@ -30,11 +30,7 @@ public function up()
             $table->unsignedInteger('created_by')->nullable();
             $table->unsignedInteger('updated_by')->nullable();
 
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-
             $table->index(['name', 'type', 'is_private']);
-            $table->index(['_lft', '_rgt']);
 
             $table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade');
             $table->foreign('created_by')->references('id')->on('users')->onDelete('set null');
diff --git a/database/migrations/2023_03_28_182318_update_quests_add_nesting.php b/database/migrations/2023_03_28_182318_update_quests_add_nesting.php
deleted file mode 100644
index 2eef19c054..0000000000
--- a/database/migrations/2023_03_28_182318_update_quests_add_nesting.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class () extends Migration {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('quests', function (Blueprint $table) {
-            $table->unsignedInteger('_lft')->default(0);
-            $table->unsignedInteger('_rgt')->default(0);
-            $table->index(['_lft', '_rgt']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('quests', function (Blueprint $table) {
-            $table->dropIndex(['lft', 'rgt']);
-            $table->dropColumn('lft');
-            $table->dropColumn('rgt');
-        });
-    }
-};

From eae5ffd1d2825b483f480fbf9ffb2602488ed8a0 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 10:02:03 -0600
Subject: [PATCH 17/28] Cleanup old migrations

---
 .gitignore                       |    1 +
 .phpstorm.meta.php               | 2931 ------------------------------
 app/Models/MiscModel.php         |    2 -
 app/Services/RecoveryService.php |    4 -
 4 files changed, 1 insertion(+), 2937 deletions(-)
 delete mode 100644 .phpstorm.meta.php

diff --git a/.gitignore b/.gitignore
index a30f4ce6a3..ce38e5a8b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ yarn-error.log
 .phpunit.result.cache
 *.sql
 package-lock.json
+.phpstorm.meta.php
 
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
deleted file mode 100644
index 1301cd2c3c..0000000000
--- a/.phpstorm.meta.php
+++ /dev/null
@@ -1,2931 +0,0 @@
-<?php
-// @formatter:off
-
-namespace PHPSTORM_META {
-
-   /**
-    * PhpStorm Meta file, to provide autocomplete information for PhpStorm
-    *
-    * @author Barry vd. Heuvel <barryvdh@gmail.com>
-    * @see https://github.com/barryvdh/laravel-ide-helper
-    */
-    override(new \Illuminate\Contracts\Container\Container, map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\Illuminate\Container\Container::makeWith(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\Illuminate\Contracts\Container\Container::get(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\Illuminate\Contracts\Container\Container::make(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\Illuminate\Contracts\Container\Container::makeWith(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\App::get(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\App::make(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\App::makeWith(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\app(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\resolve(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-    override(\Psr\Container\ContainerInterface::get(0), map([
-        '' => '@',
-            'App\Renderers\DatagridRenderer2' => \App\Renderers\DatagridRenderer2::class,
-            'App\Services\AttributeMentionService' => \App\Services\AttributeMentionService::class,
-            'App\Services\BreadcrumbService' => \App\Services\BreadcrumbService::class,
-            'App\Services\Caches\CampaignCacheService' => \App\Services\Caches\CampaignCacheService::class,
-            'App\Services\Caches\CharacterCacheService' => \App\Services\Caches\CharacterCacheService::class,
-            'App\Services\Caches\EntityCacheService' => \App\Services\Caches\EntityCacheService::class,
-            'App\Services\Caches\MapMarkerCacheService' => \App\Services\Caches\MapMarkerCacheService::class,
-            'App\Services\Caches\MarketplaceCacheService' => \App\Services\Caches\MarketplaceCacheService::class,
-            'App\Services\Caches\PostCacheService' => \App\Services\Caches\PostCacheService::class,
-            'App\Services\Caches\QuestCacheService' => \App\Services\Caches\QuestCacheService::class,
-            'App\Services\Caches\SingleUserCacheService' => \App\Services\Caches\SingleUserCacheService::class,
-            'App\Services\Caches\TimelineElementCacheService' => \App\Services\Caches\TimelineElementCacheService::class,
-            'App\Services\Caches\UserCacheService' => \App\Services\Caches\UserCacheService::class,
-            'App\Services\Campaign\LocalisationService' => \App\Services\Campaign\LocalisationService::class,
-            'App\Services\Campaign\ModuleService' => \App\Services\Campaign\ModuleService::class,
-            'App\Services\DashboardService' => \App\Services\DashboardService::class,
-            'App\Services\DomainService' => \App\Services\DomainService::class,
-            'App\Services\Entity\SetupService' => \App\Services\Entity\SetupService::class,
-            'App\Services\ImgService' => \App\Services\ImgService::class,
-            'App\Services\LimitService' => \App\Services\LimitService::class,
-            'App\Services\Logs\ApiLogService' => \App\Services\Logs\ApiLogService::class,
-            'App\Services\MentionsService' => \App\Services\MentionsService::class,
-            'App\Services\Permissions\EntityPermission' => \App\Services\Permissions\EntityPermission::class,
-            'App\Services\Permissions\PermissionService' => \App\Services\Permissions\PermissionService::class,
-            'App\Services\Permissions\RolePermission' => \App\Services\Permissions\RolePermission::class,
-            'App\Services\Users\DateService' => \App\Services\Users\DateService::class,
-            'Barryvdh\Debugbar\LaravelDebugbar' => \Barryvdh\Debugbar\LaravelDebugbar::class,
-            'BinaryTorch\LaRecipe\Contracts\MarkdownParser' => \BinaryTorch\LaRecipe\Services\ParseDownMarkdownParser::class,
-            'Illuminate\Auth\Console\ClearResetsCommand' => \Illuminate\Auth\Console\ClearResetsCommand::class,
-            'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
-            'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
-            'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\DatabaseBatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
-            'Illuminate\Bus\Dispatcher' => \Illuminate\Bus\Dispatcher::class,
-            'Illuminate\Cache\Console\CacheTableCommand' => \Illuminate\Cache\Console\CacheTableCommand::class,
-            'Illuminate\Cache\Console\ClearCommand' => \Illuminate\Cache\Console\ClearCommand::class,
-            'Illuminate\Cache\Console\ForgetCommand' => \Illuminate\Cache\Console\ForgetCommand::class,
-            'Illuminate\Cache\Console\PruneStaleTagsCommand' => \Illuminate\Cache\Console\PruneStaleTagsCommand::class,
-            'Illuminate\Cache\RateLimiter' => \Illuminate\Cache\RateLimiter::class,
-            'Illuminate\Console\Scheduling\Schedule' => \Illuminate\Console\Scheduling\Schedule::class,
-            'Illuminate\Console\Scheduling\ScheduleClearCacheCommand' => \Illuminate\Console\Scheduling\ScheduleClearCacheCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleFinishCommand' => \Illuminate\Console\Scheduling\ScheduleFinishCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleInterruptCommand' => \Illuminate\Console\Scheduling\ScheduleInterruptCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleListCommand' => \Illuminate\Console\Scheduling\ScheduleListCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleRunCommand' => \Illuminate\Console\Scheduling\ScheduleRunCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleTestCommand' => \Illuminate\Console\Scheduling\ScheduleTestCommand::class,
-            'Illuminate\Console\Scheduling\ScheduleWorkCommand' => \Illuminate\Console\Scheduling\ScheduleWorkCommand::class,
-            'Illuminate\Contracts\Auth\Access\Gate' => \Illuminate\Auth\Access\Gate::class,
-            'Illuminate\Contracts\Broadcasting\Broadcaster' => \Illuminate\Broadcasting\Broadcasters\LogBroadcaster::class,
-            'Illuminate\Contracts\Console\Kernel' => \App\Console\Kernel::class,
-            'Illuminate\Contracts\Debug\ExceptionHandler' => \NunoMaduro\Collision\Adapters\Laravel\ExceptionHandler::class,
-            'Illuminate\Contracts\Foundation\ExceptionRenderer' => \Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer::class,
-            'Illuminate\Contracts\Foundation\MaintenanceMode' => \Illuminate\Foundation\FileBasedMaintenanceMode::class,
-            'Illuminate\Contracts\Http\Kernel' => \App\Http\Kernel::class,
-            'Illuminate\Contracts\Pipeline\Hub' => \Illuminate\Pipeline\Hub::class,
-            'Illuminate\Contracts\Queue\EntityResolver' => \Illuminate\Database\Eloquent\QueueEntityResolver::class,
-            'Illuminate\Contracts\Routing\ResponseFactory' => \Illuminate\Routing\ResponseFactory::class,
-            'Illuminate\Contracts\Validation\UncompromisedVerifier' => \Illuminate\Validation\NotPwnedVerifier::class,
-            'Illuminate\Database\Console\DbCommand' => \Illuminate\Database\Console\DbCommand::class,
-            'Illuminate\Database\Console\DumpCommand' => \Illuminate\Database\Console\DumpCommand::class,
-            'Illuminate\Database\Console\Factories\FactoryMakeCommand' => \Illuminate\Database\Console\Factories\FactoryMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\FreshCommand' => \Illuminate\Database\Console\Migrations\FreshCommand::class,
-            'Illuminate\Database\Console\Migrations\InstallCommand' => \Illuminate\Database\Console\Migrations\InstallCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateCommand' => \Illuminate\Database\Console\Migrations\MigrateCommand::class,
-            'Illuminate\Database\Console\Migrations\MigrateMakeCommand' => \Illuminate\Database\Console\Migrations\MigrateMakeCommand::class,
-            'Illuminate\Database\Console\Migrations\RefreshCommand' => \Illuminate\Database\Console\Migrations\RefreshCommand::class,
-            'Illuminate\Database\Console\Migrations\ResetCommand' => \Illuminate\Database\Console\Migrations\ResetCommand::class,
-            'Illuminate\Database\Console\Migrations\RollbackCommand' => \Illuminate\Database\Console\Migrations\RollbackCommand::class,
-            'Illuminate\Database\Console\Migrations\StatusCommand' => \Illuminate\Database\Console\Migrations\StatusCommand::class,
-            'Illuminate\Database\Console\MonitorCommand' => \Illuminate\Database\Console\MonitorCommand::class,
-            'Illuminate\Database\Console\PruneCommand' => \Illuminate\Database\Console\PruneCommand::class,
-            'Illuminate\Database\Console\Seeds\SeedCommand' => \Illuminate\Database\Console\Seeds\SeedCommand::class,
-            'Illuminate\Database\Console\Seeds\SeederMakeCommand' => \Illuminate\Database\Console\Seeds\SeederMakeCommand::class,
-            'Illuminate\Database\Console\ShowCommand' => \Illuminate\Database\Console\ShowCommand::class,
-            'Illuminate\Database\Console\ShowModelCommand' => \Illuminate\Database\Console\ShowModelCommand::class,
-            'Illuminate\Database\Console\TableCommand' => \Illuminate\Database\Console\TableCommand::class,
-            'Illuminate\Database\Console\WipeCommand' => \Illuminate\Database\Console\WipeCommand::class,
-            'Illuminate\Foundation\Console\AboutCommand' => \Illuminate\Foundation\Console\AboutCommand::class,
-            'Illuminate\Foundation\Console\CastMakeCommand' => \Illuminate\Foundation\Console\CastMakeCommand::class,
-            'Illuminate\Foundation\Console\ChannelListCommand' => \Illuminate\Foundation\Console\ChannelListCommand::class,
-            'Illuminate\Foundation\Console\ChannelMakeCommand' => \Illuminate\Foundation\Console\ChannelMakeCommand::class,
-            'Illuminate\Foundation\Console\ClearCompiledCommand' => \Illuminate\Foundation\Console\ClearCompiledCommand::class,
-            'Illuminate\Foundation\Console\ComponentMakeCommand' => \Illuminate\Foundation\Console\ComponentMakeCommand::class,
-            'Illuminate\Foundation\Console\ConfigCacheCommand' => \Illuminate\Foundation\Console\ConfigCacheCommand::class,
-            'Illuminate\Foundation\Console\ConfigClearCommand' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
-            'Illuminate\Foundation\Console\ConfigShowCommand' => \Illuminate\Foundation\Console\ConfigShowCommand::class,
-            'Illuminate\Foundation\Console\ConsoleMakeCommand' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
-            'Illuminate\Foundation\Console\DocsCommand' => \Illuminate\Foundation\Console\DocsCommand::class,
-            'Illuminate\Foundation\Console\DownCommand' => \Illuminate\Foundation\Console\DownCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentCommand' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentDecryptCommand' => \Illuminate\Foundation\Console\EnvironmentDecryptCommand::class,
-            'Illuminate\Foundation\Console\EnvironmentEncryptCommand' => \Illuminate\Foundation\Console\EnvironmentEncryptCommand::class,
-            'Illuminate\Foundation\Console\EventCacheCommand' => \Illuminate\Foundation\Console\EventCacheCommand::class,
-            'Illuminate\Foundation\Console\EventClearCommand' => \Illuminate\Foundation\Console\EventClearCommand::class,
-            'Illuminate\Foundation\Console\EventGenerateCommand' => \Illuminate\Foundation\Console\EventGenerateCommand::class,
-            'Illuminate\Foundation\Console\EventListCommand' => \Illuminate\Foundation\Console\EventListCommand::class,
-            'Illuminate\Foundation\Console\EventMakeCommand' => \Illuminate\Foundation\Console\EventMakeCommand::class,
-            'Illuminate\Foundation\Console\ExceptionMakeCommand' => \Illuminate\Foundation\Console\ExceptionMakeCommand::class,
-            'Illuminate\Foundation\Console\JobMakeCommand' => \Illuminate\Foundation\Console\JobMakeCommand::class,
-            'Illuminate\Foundation\Console\KeyGenerateCommand' => \Illuminate\Foundation\Console\KeyGenerateCommand::class,
-            'Illuminate\Foundation\Console\LangPublishCommand' => \Illuminate\Foundation\Console\LangPublishCommand::class,
-            'Illuminate\Foundation\Console\ListenerMakeCommand' => \Illuminate\Foundation\Console\ListenerMakeCommand::class,
-            'Illuminate\Foundation\Console\MailMakeCommand' => \Illuminate\Foundation\Console\MailMakeCommand::class,
-            'Illuminate\Foundation\Console\ModelMakeCommand' => \Illuminate\Foundation\Console\ModelMakeCommand::class,
-            'Illuminate\Foundation\Console\NotificationMakeCommand' => \Illuminate\Foundation\Console\NotificationMakeCommand::class,
-            'Illuminate\Foundation\Console\ObserverMakeCommand' => \Illuminate\Foundation\Console\ObserverMakeCommand::class,
-            'Illuminate\Foundation\Console\OptimizeClearCommand' => \Illuminate\Foundation\Console\OptimizeClearCommand::class,
-            'Illuminate\Foundation\Console\OptimizeCommand' => \Illuminate\Foundation\Console\OptimizeCommand::class,
-            'Illuminate\Foundation\Console\PackageDiscoverCommand' => \Illuminate\Foundation\Console\PackageDiscoverCommand::class,
-            'Illuminate\Foundation\Console\PolicyMakeCommand' => \Illuminate\Foundation\Console\PolicyMakeCommand::class,
-            'Illuminate\Foundation\Console\ProviderMakeCommand' => \Illuminate\Foundation\Console\ProviderMakeCommand::class,
-            'Illuminate\Foundation\Console\RequestMakeCommand' => \Illuminate\Foundation\Console\RequestMakeCommand::class,
-            'Illuminate\Foundation\Console\ResourceMakeCommand' => \Illuminate\Foundation\Console\ResourceMakeCommand::class,
-            'Illuminate\Foundation\Console\RouteCacheCommand' => \Illuminate\Foundation\Console\RouteCacheCommand::class,
-            'Illuminate\Foundation\Console\RouteClearCommand' => \Illuminate\Foundation\Console\RouteClearCommand::class,
-            'Illuminate\Foundation\Console\RouteListCommand' => \Illuminate\Foundation\Console\RouteListCommand::class,
-            'Illuminate\Foundation\Console\RuleMakeCommand' => \Illuminate\Foundation\Console\RuleMakeCommand::class,
-            'Illuminate\Foundation\Console\ScopeMakeCommand' => \Illuminate\Foundation\Console\ScopeMakeCommand::class,
-            'Illuminate\Foundation\Console\ServeCommand' => \Illuminate\Foundation\Console\ServeCommand::class,
-            'Illuminate\Foundation\Console\StorageLinkCommand' => \Illuminate\Foundation\Console\StorageLinkCommand::class,
-            'Illuminate\Foundation\Console\StubPublishCommand' => \Illuminate\Foundation\Console\StubPublishCommand::class,
-            'Illuminate\Foundation\Console\TestMakeCommand' => \Illuminate\Foundation\Console\TestMakeCommand::class,
-            'Illuminate\Foundation\Console\UpCommand' => \Illuminate\Foundation\Console\UpCommand::class,
-            'Illuminate\Foundation\Console\VendorPublishCommand' => \Illuminate\Foundation\Console\VendorPublishCommand::class,
-            'Illuminate\Foundation\Console\ViewCacheCommand' => \Illuminate\Foundation\Console\ViewCacheCommand::class,
-            'Illuminate\Foundation\Console\ViewClearCommand' => \Illuminate\Foundation\Console\ViewClearCommand::class,
-            'Illuminate\Foundation\MaintenanceModeManager' => \Illuminate\Foundation\MaintenanceModeManager::class,
-            'Illuminate\Foundation\Mix' => \Illuminate\Foundation\Mix::class,
-            'Illuminate\Foundation\PackageManifest' => \Illuminate\Foundation\PackageManifest::class,
-            'Illuminate\Foundation\Vite' => \Illuminate\Foundation\Vite::class,
-            'Illuminate\Http\Client\Factory' => \Illuminate\Http\Client\Factory::class,
-            'Illuminate\Mail\Markdown' => \Illuminate\Mail\Markdown::class,
-            'Illuminate\Notifications\ChannelManager' => \Illuminate\Notifications\ChannelManager::class,
-            'Illuminate\Notifications\Console\NotificationTableCommand' => \Illuminate\Notifications\Console\NotificationTableCommand::class,
-            'Illuminate\Queue\Console\BatchesTableCommand' => \Illuminate\Queue\Console\BatchesTableCommand::class,
-            'Illuminate\Queue\Console\ClearCommand' => \Illuminate\Queue\Console\ClearCommand::class,
-            'Illuminate\Queue\Console\FailedTableCommand' => \Illuminate\Queue\Console\FailedTableCommand::class,
-            'Illuminate\Queue\Console\FlushFailedCommand' => \Illuminate\Queue\Console\FlushFailedCommand::class,
-            'Illuminate\Queue\Console\ForgetFailedCommand' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
-            'Illuminate\Queue\Console\ListFailedCommand' => \Illuminate\Queue\Console\ListFailedCommand::class,
-            'Illuminate\Queue\Console\ListenCommand' => \Illuminate\Queue\Console\ListenCommand::class,
-            'Illuminate\Queue\Console\MonitorCommand' => \Illuminate\Queue\Console\MonitorCommand::class,
-            'Illuminate\Queue\Console\PruneBatchesCommand' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
-            'Illuminate\Queue\Console\PruneFailedJobsCommand' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
-            'Illuminate\Queue\Console\RestartCommand' => \Illuminate\Queue\Console\RestartCommand::class,
-            'Illuminate\Queue\Console\RetryBatchCommand' => \Illuminate\Queue\Console\RetryBatchCommand::class,
-            'Illuminate\Queue\Console\RetryCommand' => \Illuminate\Queue\Console\RetryCommand::class,
-            'Illuminate\Queue\Console\TableCommand' => \Illuminate\Queue\Console\TableCommand::class,
-            'Illuminate\Queue\Console\WorkCommand' => \Illuminate\Queue\Console\WorkCommand::class,
-            'Illuminate\Routing\Console\ControllerMakeCommand' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
-            'Illuminate\Routing\Console\MiddlewareMakeCommand' => \Illuminate\Routing\Console\MiddlewareMakeCommand::class,
-            'Illuminate\Routing\Contracts\CallableDispatcher' => \Illuminate\Routing\CallableDispatcher::class,
-            'Illuminate\Routing\Contracts\ControllerDispatcher' => \Illuminate\Routing\ControllerDispatcher::class,
-            'Illuminate\Session\Console\SessionTableCommand' => \Illuminate\Session\Console\SessionTableCommand::class,
-            'Illuminate\Session\Middleware\StartSession' => \Illuminate\Session\Middleware\StartSession::class,
-            'Illuminate\Testing\ParallelTesting' => \Illuminate\Testing\ParallelTesting::class,
-            'LaRecipe' => \BinaryTorch\LaRecipe\LaRecipe::class,
-            'Laravel\Cashier\Contracts\InvoiceRenderer' => \Laravel\Cashier\Invoices\DompdfInvoiceRenderer::class,
-            'Laravel\Passport\ClientRepository' => \Laravel\Passport\ClientRepository::class,
-            'Laravel\Passport\Contracts\AuthorizationViewResponse' => \Laravel\Passport\Http\Responses\AuthorizationViewResponse::class,
-            'Laravel\Socialite\Contracts\Factory' => \Laravel\Socialite\SocialiteManager::class,
-            'Lcobucci\JWT\Parser' => \Lcobucci\JWT\Token\Parser::class,
-            'League\OAuth2\Server\AuthorizationServer' => \League\OAuth2\Server\AuthorizationServer::class,
-            'League\OAuth2\Server\ResourceServer' => \League\OAuth2\Server\ResourceServer::class,
-            'Mcamara\LaravelLocalization\LaravelLocalization' => \Mcamara\LaravelLocalization\LaravelLocalization::class,
-            'NunoMaduro\Collision\Provider' => \NunoMaduro\Collision\Provider::class,
-            'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
-            'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
-            'RichanFongdasen\EloquentBlameable\BlameableObserver' => \RichanFongdasen\EloquentBlameable\BlameableObserver::class,
-            'RichanFongdasen\EloquentBlameable\BlameableService' => \RichanFongdasen\EloquentBlameable\BlameableService::class,
-            'Sentry\ClientBuilderInterface' => \Sentry\ClientBuilder::class,
-            'Sentry\Laravel\Tracing\BacktraceHelper' => \Sentry\Laravel\Tracing\BacktraceHelper::class,
-            'Sentry\Laravel\Tracing\Middleware' => \Sentry\Laravel\Tracing\Middleware::class,
-            'Sentry\State\HubInterface' => \Sentry\State\Hub::class,
-            'Spatie\Backup\Helpers\ConsoleOutput' => \Spatie\Backup\Helpers\ConsoleOutput::class,
-            'Spatie\Backup\Tasks\Cleanup\CleanupStrategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
-            'Spatie\FlareClient\Flare' => \Spatie\FlareClient\Flare::class,
-            'Spatie\Ignition\Config\IgnitionConfig' => \Spatie\Ignition\Config\IgnitionConfig::class,
-            'Spatie\Ignition\Contracts\ConfigManager' => \Spatie\Ignition\Config\FileConfigManager::class,
-            'Spatie\Ignition\Contracts\SolutionProviderRepository' => \Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository::class,
-            'Spatie\Ignition\Ignition' => \Spatie\Ignition\Ignition::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler' => \Spatie\LaravelIgnition\Recorders\DumpRecorder\MultiDumpHandler::class,
-            'Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder' => \Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder' => \Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder::class,
-            'Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder' => \Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder::class,
-            'Spatie\LaravelIgnition\Support\SentReports' => \Spatie\LaravelIgnition\Support\SentReports::class,
-            'Spatie\SignalAwareCommand\Signal' => \Spatie\SignalAwareCommand\Signal::class,
-            'Stripe\Util\LoggerInterface' => \Laravel\Cashier\Logger::class,
-            'Vsch\TranslationManager\Repositories\Interfaces\ITranslatorRepository' => \Vsch\TranslationManager\Repositories\MysqlTranslatorRepository::class,
-            'auth' => \Illuminate\Auth\AuthManager::class,
-            'auth.driver' => \Illuminate\Auth\SessionGuard::class,
-            'auth.password' => \Illuminate\Auth\Passwords\PasswordBrokerManager::class,
-            'auth.password.broker' => \Illuminate\Auth\Passwords\PasswordBroker::class,
-            'blade.compiler' => \Illuminate\View\Compilers\BladeCompiler::class,
-            'cache' => \Illuminate\Cache\CacheManager::class,
-            'cache.store' => \Illuminate\Cache\Repository::class,
-            'command.debugbar.clear' => \Barryvdh\Debugbar\Console\ClearCommand::class,
-            'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
-            'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
-            'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
-            'command.ide-helper.models' => \Barryvdh\LaravelIdeHelper\Console\ModelsCommand::class,
-            'command.translation-manager.clean' => \Vsch\TranslationManager\Console\CleanCommand::class,
-            'command.translation-manager.export' => \Vsch\TranslationManager\Console\ExportCommand::class,
-            'command.translation-manager.find' => \Vsch\TranslationManager\Console\FindCommand::class,
-            'command.translation-manager.import' => \Vsch\TranslationManager\Console\ImportCommand::class,
-            'command.translation-manager.reset' => \Vsch\TranslationManager\Console\ResetCommand::class,
-            'composer' => \Illuminate\Support\Composer::class,
-            'cookie' => \Illuminate\Cookie\CookieJar::class,
-            'db' => \Illuminate\Database\DatabaseManager::class,
-            'db.connection' => \Illuminate\Database\MySqlConnection::class,
-            'db.factory' => \Illuminate\Database\Connectors\ConnectionFactory::class,
-            'db.schema' => \Illuminate\Database\Schema\MySqlBuilder::class,
-            'db.transactions' => \Illuminate\Database\DatabaseTransactionsManager::class,
-            'encrypter' => \Illuminate\Encryption\Encrypter::class,
-            'events' => \Illuminate\Events\Dispatcher::class,
-            'files' => \Illuminate\Filesystem\Filesystem::class,
-            'filesystem' => \Illuminate\Filesystem\FilesystemManager::class,
-            'filesystem.cloud' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'filesystem.disk' => \Illuminate\Filesystem\AwsS3V3Adapter::class,
-            'flare.logger' => \Monolog\Logger::class,
-            'form' => \Collective\Html\FormBuilder::class,
-            'hash' => \Illuminate\Hashing\HashManager::class,
-            'hash.driver' => \Illuminate\Hashing\BcryptHasher::class,
-            'html' => \Collective\Html\HtmlBuilder::class,
-            'image' => \Intervention\Image\ImageManager::class,
-            'laravel-translation-manager' => \Vsch\TranslationManager\Manager::class,
-            'laravellocalizationroutecache.cache' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsCacheCommand::class,
-            'laravellocalizationroutecache.clear' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsClearCommand::class,
-            'laravellocalizationroutecache.list' => \Mcamara\LaravelLocalization\Commands\RouteTranslationsListCommand::class,
-            'log' => \Illuminate\Log\LogManager::class,
-            'mail.manager' => \Illuminate\Mail\MailManager::class,
-            'mailer' => \Illuminate\Mail\Mailer::class,
-            'memcached.connector' => \Illuminate\Cache\MemcachedConnector::class,
-            'migration.creator' => \Illuminate\Database\Migrations\MigrationCreator::class,
-            'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
-            'migrator' => \Illuminate\Database\Migrations\Migrator::class,
-            'paypal_client' => \Srmklive\PayPal\Services\PayPal::class,
-            'pipeline' => \Illuminate\Pipeline\Pipeline::class,
-            'pragmarx.google2fa' => \PragmaRX\Google2FALaravel\Google2FA::class,
-            'purify' => \Stevebauman\Purify\PurifyManager::class,
-            'queue' => \Illuminate\Queue\QueueManager::class,
-            'queue.connection' => \Illuminate\Queue\RedisQueue::class,
-            'queue.failer' => \Illuminate\Queue\Failed\DatabaseFailedJobProvider::class,
-            'queue.listener' => \Illuminate\Queue\Listener::class,
-            'queue.worker' => \Illuminate\Queue\Worker::class,
-            'redirect' => \Illuminate\Routing\Redirector::class,
-            'redis' => \Illuminate\Redis\RedisManager::class,
-            'redis.connection' => \Illuminate\Redis\Connections\PredisConnection::class,
-            'router' => \Illuminate\Routing\Router::class,
-            'session' => \Illuminate\Session\SessionManager::class,
-            'session.store' => \Illuminate\Session\Store::class,
-            'translation.loader' => \Illuminate\Translation\FileLoader::class,
-            'translator' => \Vsch\TranslationManager\Translator::class,
-            'url' => \Illuminate\Routing\UrlGenerator::class,
-            'validation.presence' => \Illuminate\Validation\DatabasePresenceVerifier::class,
-            'view' => \Illuminate\View\Factory::class,
-            'view.engine.resolver' => \Illuminate\View\Engines\EngineResolver::class,
-            'view.finder' => \Illuminate\View\FileViewFinder::class,
-        ]));
-
-
-    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::mock(0), map(["" => "@&\Mockery\MockInterface"]));
-    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::partialMock(0), map(["" => "@&\Mockery\MockInterface"]));
-    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::instance(0), type(1));
-    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::spy(0), map(["" => "@&\Mockery\MockInterface"]));
-    override(\Illuminate\Support\Arr::add(0), type(0));
-    override(\Illuminate\Support\Arr::except(0), type(0));
-    override(\Illuminate\Support\Arr::first(0), elementType(0));
-    override(\Illuminate\Support\Arr::last(0), elementType(0));
-    override(\Illuminate\Support\Arr::get(0), elementType(0));
-    override(\Illuminate\Support\Arr::only(0), type(0));
-    override(\Illuminate\Support\Arr::prepend(0), type(0));
-    override(\Illuminate\Support\Arr::pull(0), elementType(0));
-    override(\Illuminate\Support\Arr::set(0), type(0));
-    override(\Illuminate\Support\Arr::shuffle(0), type(0));
-    override(\Illuminate\Support\Arr::sort(0), type(0));
-    override(\Illuminate\Support\Arr::sortRecursive(0), type(0));
-    override(\Illuminate\Support\Arr::where(0), type(0));
-    override(\array_add(0), type(0));
-    override(\array_except(0), type(0));
-    override(\array_first(0), elementType(0));
-    override(\array_last(0), elementType(0));
-    override(\array_get(0), elementType(0));
-    override(\array_only(0), type(0));
-    override(\array_prepend(0), type(0));
-    override(\array_pull(0), elementType(0));
-    override(\array_set(0), type(0));
-    override(\array_sort(0), type(0));
-    override(\array_sort_recursive(0), type(0));
-    override(\array_where(0), type(0));
-    override(\head(0), elementType(0));
-    override(\last(0), elementType(0));
-    override(\with(0), type(0));
-    override(\tap(0), type(0));
-    override(\optional(0), type(0));
-
-}
diff --git a/app/Models/MiscModel.php b/app/Models/MiscModel.php
index 34018ef98c..dc6284f3fd 100644
--- a/app/Models/MiscModel.php
+++ b/app/Models/MiscModel.php
@@ -478,8 +478,6 @@ public function ignoredLogAttributes(): array
             'campaign_id',
             'updated_at',
             'deleted_at',
-            '_lft',
-            '_rgt',
         ];
     }
 
diff --git a/app/Services/RecoveryService.php b/app/Services/RecoveryService.php
index d6d321284a..45dbdfe31b 100644
--- a/app/Services/RecoveryService.php
+++ b/app/Services/RecoveryService.php
@@ -151,10 +151,6 @@ protected function trashChild(Entity $entity, MiscModel $child = null)
 
             // Clean up the parent and tree to avoid the nested plugin to delete every child
             $child->$parentField = null;
-            if (method_exists($child, 'getRgtName')) {
-                $child->_lft = null; // @phpstan-ignore-line
-                $child->_rgt = null; // @phpstan-ignore-line
-            }
 
             $child->timestamps = false;
             $child->saveQuietly();

From ba91172c0128e900ac52b3d1797b7fc92f6f0df8 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 10:17:37 -0600
Subject: [PATCH 18/28] Fix tests and api perfs

---
 app/Http/Resources/EntityAssetResource.php |  2 +-
 app/Http/Resources/EntityResource.php      |  2 +-
 app/Http/Resources/InventoryResource.php   |  2 +-
 app/Http/Resources/PostResource.php        |  2 +-
 app/Models/Calendar.php                    |  2 ++
 app/Models/Relations/CalendarRelations.php |  8 --------
 app/Models/Scopes/SubEntityScopes.php      | 12 +++++++----
 tests/TestCase.php                         | 23 ++++++++++++++--------
 8 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/Http/Resources/EntityAssetResource.php b/app/Http/Resources/EntityAssetResource.php
index 5f00d810ff..15201573eb 100644
--- a/app/Http/Resources/EntityAssetResource.php
+++ b/app/Http/Resources/EntityAssetResource.php
@@ -17,7 +17,7 @@ public function toArray($request)
         /** @var EntityAsset $asset */
         $asset = $this->resource;
 
-        $data = $this->entity([
+        $data = $this->onEntity([
             'type_id' => $asset->type_id,
             '_file' => $asset->isFile(),
             '_link' => $asset->isLink(),
diff --git a/app/Http/Resources/EntityResource.php b/app/Http/Resources/EntityResource.php
index 1956ab8c50..e5fea0a291 100644
--- a/app/Http/Resources/EntityResource.php
+++ b/app/Http/Resources/EntityResource.php
@@ -205,7 +205,7 @@ public function entity(array $prepared = [])
 
             if ($misc->ancestors) {
                 $ancestors = [];
-                foreach ($misc->getAncestors(['id']) as $ancestor) {
+                foreach ($misc->ancestors as $ancestor) {
                     $ancestors[] = $ancestor->id;
                 }
                 $merged['parents'] = $ancestors;
diff --git a/app/Http/Resources/InventoryResource.php b/app/Http/Resources/InventoryResource.php
index 99d1fbafaf..3a13b274bd 100644
--- a/app/Http/Resources/InventoryResource.php
+++ b/app/Http/Resources/InventoryResource.php
@@ -16,7 +16,7 @@ public function toArray($request)
     {
         /** @var Inventory $model */
         $model = $this->resource;
-        return $this->entity([
+        return $this->onEntity([
             'item_id' => $model->item_id,
             'name' => $model->name,
             'position' => $model->position,
diff --git a/app/Http/Resources/PostResource.php b/app/Http/Resources/PostResource.php
index 489138a341..7b415a1a79 100644
--- a/app/Http/Resources/PostResource.php
+++ b/app/Http/Resources/PostResource.php
@@ -16,7 +16,7 @@ public function toArray($request)
     {
         /** @var Post $model */
         $model = $this->resource;
-        return $this->entity([
+        return $this->onEntity([
             'name' => $model->name,
             'visibility_id' => (int) $model->visibility_id->value,
             'entry' => $model->entry,
diff --git a/app/Models/Calendar.php b/app/Models/Calendar.php
index 3fc5d261fc..0983d9d018 100644
--- a/app/Models/Calendar.php
+++ b/app/Models/Calendar.php
@@ -12,6 +12,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Calendar
@@ -40,6 +41,7 @@ class Calendar extends MiscModel
     use CalendarRelations;
     use CampaignTrait;
     use ExportableTrait;
+    use HasRecursiveRelationships;
     use HasFactory;
     use SoftDeletes;
 
diff --git a/app/Models/Relations/CalendarRelations.php b/app/Models/Relations/CalendarRelations.php
index 6b8e8a7403..3c46dbdaa1 100644
--- a/app/Models/Relations/CalendarRelations.php
+++ b/app/Models/Relations/CalendarRelations.php
@@ -44,12 +44,4 @@ public function calendars()
     {
         return $this->hasMany(Calendar::class);
     }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function children()
-    {
-        return $this->hasMany(Calendar::class);
-    }
 }
diff --git a/app/Models/Scopes/SubEntityScopes.php b/app/Models/Scopes/SubEntityScopes.php
index 1ade3a5e49..09312ecbcd 100644
--- a/app/Models/Scopes/SubEntityScopes.php
+++ b/app/Models/Scopes/SubEntityScopes.php
@@ -75,14 +75,18 @@ public function scopeWithApi(Builder $query): Builder
     {
         $relations = [
             'entity',
-            'entity.tags', 'entity.posts', 'entity.events',
-            'entity.relationships', 'entity.attributes', 'entity.inventories',
+            'entity.tags',
+            'entity.posts', 'entity.posts.permissions',
+            'entity.events',
+            'entity.relationships', 'entity.attributes', 'entity.inventories', 'entity.inventories',
             'entity.assets',
             'entity.abilities',
-            'ancestors',
-            'children',
         ];
 
+        if (method_exists($this, 'ancestors')) {
+            $relations[] = 'ancestors';
+            $relations[] = 'children';
+        }
         $with = !empty($this->apiWith) ? $this->apiWith : [];
         foreach ($with as $relation) {
             $relations[] = $relation;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 3b947edc94..6869bc77ad 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -12,6 +12,7 @@
 use App\Models\Attribute;
 use App\Models\Bookmark;
 use App\Models\Campaign;
+use App\Services\Permissions\RolePermissionService;
 use Illuminate\Support\Facades\Storage;
 use App\Models\CampaignRoleUser;
 use App\Models\CampaignUser;
@@ -120,10 +121,12 @@ public function asPlayer(): self
             'user_id' => $user2->id,
         ]);
         Permissions::reset();
-        CampaignRole::where('id', 3)->first()->toggle(1, 1);
-        CampaignRole::where('id', 3)->first()->toggle(10, 1);
-        CampaignRole::where('id', 3)->first()->toggle(11, 1);
-        CampaignRole::where('id', 3)->first()->toggle(7, 1);
+        /** @var RolePermissionService $service */
+        $service = app()->make(RolePermissionService::class);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(1, 1);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(10, 1);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(11, 1);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(7, 1);
 
         return $this;
     }
@@ -142,7 +145,9 @@ public function withMember(): self
             'user_id' => $user3->id,
         ]);
 
-        CampaignRole::where('id', 3)->first()->toggle(1, 1);
+        /** @var RolePermissionService $service */
+        $service = app()->make(RolePermissionService::class);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(1, 1);
 
         return $this;
     }
@@ -176,9 +181,11 @@ public function withCampaigns(array $extra = []): self
 
     public function withPermissions(array $extra = []): self
     {
-        CampaignRole::where('id', 3)->first()->toggle(1, 1);
-        CampaignRole::where('id', 3)->first()->toggle(1, 2);
-        CampaignRole::where('id', 3)->first()->toggle(1, 3);
+        /** @var RolePermissionService $service */
+        $service = app()->make(RolePermissionService::class);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(1, 1);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(1, 2);
+        $service->role(CampaignRole::where('id', 3)->first())->toggle(1, 3);
 
         return $this;
     }

From d46674c3a438588e06a9e77e428beabce6602241 Mon Sep 17 00:00:00 2001
From: ilestis <ilestis@users.noreply.github.com>
Date: Sat, 2 Dec 2023 16:18:28 +0000
Subject: [PATCH 19/28] Fix styling

---
 app/Models/Calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Calendar.php b/app/Models/Calendar.php
index 0983d9d018..897ebd16b7 100644
--- a/app/Models/Calendar.php
+++ b/app/Models/Calendar.php
@@ -41,8 +41,8 @@ class Calendar extends MiscModel
     use CalendarRelations;
     use CampaignTrait;
     use ExportableTrait;
-    use HasRecursiveRelationships;
     use HasFactory;
+    use HasRecursiveRelationships;
     use SoftDeletes;
 
     /** @var string[]  */

From 65059634eb85324f45c969ccb3ed071bea1be17e Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 10:24:16 -0600
Subject: [PATCH 20/28] Fix tests and api perfs

---
 tests/Feature/Entities/TimelineElementTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Feature/Entities/TimelineElementTest.php b/tests/Feature/Entities/TimelineElementTest.php
index 0eab2af4cf..bce32da308 100644
--- a/tests/Feature/Entities/TimelineElementTest.php
+++ b/tests/Feature/Entities/TimelineElementTest.php
@@ -16,6 +16,7 @@
     ->postJson('/api/1.0/campaigns/1/timelines/1/timeline_elements', [
         'name' => fake()->name(),
         'era_id' => 1,
+        'entry' => '',
         'use_event_date' => true,
     ])
     ->assertStatus(201)

From 5e47547c6f604cf7d67aa964082f9ca1078d5d59 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 13:05:28 -0600
Subject: [PATCH 21/28] PHPStan

---
 app/Http/Controllers/Abilities/AbilityController.php   |  1 -
 app/Http/Controllers/Events/EventController.php        |  1 -
 .../Organisation/OrganisationController.php            |  1 -
 app/Http/Controllers/Quests/QuestController.php        |  1 -
 app/Http/Controllers/Races/RaceController.php          |  1 -
 app/Http/Controllers/Tags/TagController.php            |  1 -
 app/Http/Controllers/Timelines/TimelineController.php  |  1 -
 .../Timelines/TimelineReorderController.php            |  2 ++
 app/Models/Tag.php                                     |  2 +-
 app/Models/TimelineEra.php                             |  5 +++--
 app/Services/Campaign/Import/Mappers/AbilityMapper.php |  2 +-
 .../Campaign/Import/Mappers/CreatureMapper.php         |  2 +-
 app/Services/Campaign/Import/Mappers/EventMapper.php   |  2 +-
 app/Services/Campaign/Import/Mappers/FamilyMapper.php  |  2 +-
 app/Services/Campaign/Import/Mappers/JournalMapper.php |  2 +-
 .../Campaign/Import/Mappers/LocationMapper.php         |  8 ++++----
 app/Services/Campaign/Import/Mappers/MapMapper.php     |  8 ++++----
 app/Services/Campaign/Import/Mappers/NoteMapper.php    |  2 +-
 .../Campaign/Import/Mappers/OrganisationMapper.php     |  2 +-
 app/Services/Campaign/Import/Mappers/QuestMapper.php   |  8 ++++----
 app/Services/Campaign/Import/Mappers/RaceMapper.php    |  2 +-
 app/Services/Campaign/Import/Mappers/TagMapper.php     |  8 ++++----
 .../Campaign/Import/Mappers/TimelineMapper.php         | 10 +++++-----
 app/Services/Entity/TagService.php                     |  1 -
 app/Services/Entity/TransformService.php               |  2 +-
 25 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/app/Http/Controllers/Abilities/AbilityController.php b/app/Http/Controllers/Abilities/AbilityController.php
index ba50011807..3ec28ca1fe 100644
--- a/app/Http/Controllers/Abilities/AbilityController.php
+++ b/app/Http/Controllers/Abilities/AbilityController.php
@@ -31,7 +31,6 @@ public function index(Campaign $campaign, Ability $ability)
         Datagrid::layout(\App\Renderers\Layouts\Ability\Ability::class)
             ->route('abilities.abilities', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $ability
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
diff --git a/app/Http/Controllers/Events/EventController.php b/app/Http/Controllers/Events/EventController.php
index 7d7512b309..10a30ed0ea 100644
--- a/app/Http/Controllers/Events/EventController.php
+++ b/app/Http/Controllers/Events/EventController.php
@@ -31,7 +31,6 @@ public function index(Campaign $campaign, Event $event)
         Datagrid::layout(\App\Renderers\Layouts\Event\Event::class)
             ->route('events.events', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $event
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
diff --git a/app/Http/Controllers/Organisation/OrganisationController.php b/app/Http/Controllers/Organisation/OrganisationController.php
index 1a8c6cc711..b2fba0b55c 100644
--- a/app/Http/Controllers/Organisation/OrganisationController.php
+++ b/app/Http/Controllers/Organisation/OrganisationController.php
@@ -32,7 +32,6 @@ public function organisations(Campaign $campaign, Organisation $organisation)
         Datagrid::layout(\App\Renderers\Layouts\Organisation\Organisation::class)
             ->route('organisations.organisations', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $organisation
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
diff --git a/app/Http/Controllers/Quests/QuestController.php b/app/Http/Controllers/Quests/QuestController.php
index b94165a0c9..d6daa21854 100644
--- a/app/Http/Controllers/Quests/QuestController.php
+++ b/app/Http/Controllers/Quests/QuestController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Quest $quest)
         Datagrid::layout(\App\Renderers\Layouts\Quest\Quest::class)
             ->route('quests.quests', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $quest
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
diff --git a/app/Http/Controllers/Races/RaceController.php b/app/Http/Controllers/Races/RaceController.php
index b77298e4b8..07e6ea78be 100644
--- a/app/Http/Controllers/Races/RaceController.php
+++ b/app/Http/Controllers/Races/RaceController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Race $race)
         Datagrid::layout(\App\Renderers\Layouts\Race\Race::class)
             ->route('races.races', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $race
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
diff --git a/app/Http/Controllers/Tags/TagController.php b/app/Http/Controllers/Tags/TagController.php
index d4e10ee7a9..4cded75dd6 100644
--- a/app/Http/Controllers/Tags/TagController.php
+++ b/app/Http/Controllers/Tags/TagController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Tag $tag)
         Datagrid::layout(\App\Renderers\Layouts\Tag\Tag::class)
             ->route('tags.tags', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $tag
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
diff --git a/app/Http/Controllers/Timelines/TimelineController.php b/app/Http/Controllers/Timelines/TimelineController.php
index bdbe36f45c..cec7365db4 100644
--- a/app/Http/Controllers/Timelines/TimelineController.php
+++ b/app/Http/Controllers/Timelines/TimelineController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Timeline $timeline)
         Datagrid::layout(\App\Renderers\Layouts\Timeline\Timeline::class)
             ->route('timelines.timelines', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $timeline
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
diff --git a/app/Http/Controllers/Timelines/TimelineReorderController.php b/app/Http/Controllers/Timelines/TimelineReorderController.php
index 315ffc824d..05512fa9e9 100644
--- a/app/Http/Controllers/Timelines/TimelineReorderController.php
+++ b/app/Http/Controllers/Timelines/TimelineReorderController.php
@@ -6,6 +6,7 @@
 use App\Http\Requests\ReorderTimeline;
 use App\Models\Campaign;
 use App\Models\Timeline;
+use App\Models\TimelineEra;
 use App\Services\TimelineService;
 
 class TimelineReorderController extends Controller
@@ -31,6 +32,7 @@ public function index(Campaign $campaign, Timeline $timeline)
             ->get();
 
         $hasNothing = true;
+        /** @var TimelineEra $era */
         foreach ($eras as $era) {
             if (!$era->orderedElements->isEmpty()) {
                 $hasNothing = false;
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index af63ed6920..f0767c42a6 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -182,8 +182,8 @@ public function allChildren(bool $withTags = false)
         foreach ($this->entities->pluck('id')->toArray() as $entity) {
             $children[] = $entity;
         }
+        // @phpstan-ignore-next-line
         foreach ($this->descendants as $desc) {
-            // @phpstan-ignore-next-line
             foreach ($desc->entities()->pluck('entities.id')->toArray() as $entity) {
                 $children[] = $entity;
             }
diff --git a/app/Models/TimelineEra.php b/app/Models/TimelineEra.php
index 9f0ccd6a2c..d04130039d 100644
--- a/app/Models/TimelineEra.php
+++ b/app/Models/TimelineEra.php
@@ -5,6 +5,7 @@
 use App\Facades\CampaignLocalization;
 use App\Facades\Mentions;
 use App\Models\Concerns\SortableTrait;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -24,8 +25,8 @@
  * @property int|null $position
  *
  * @property Timeline $timeline
- * @property TimelineElement[] $elements
- * @property TimelineElement[] $orderedElements
+ * @property TimelineElement[]|Collection $elements
+ * @property TimelineElement[]|Collection $orderedElements
  *
  * @method static self|Builder ordered()
  */
diff --git a/app/Services/Campaign/Import/Mappers/AbilityMapper.php b/app/Services/Campaign/Import/Mappers/AbilityMapper.php
index 27aa3168e8..e3c2a58285 100644
--- a/app/Services/Campaign/Import/Mappers/AbilityMapper.php
+++ b/app/Services/Campaign/Import/Mappers/AbilityMapper.php
@@ -27,7 +27,7 @@ public function tree(): self
             // We need the nested trait to trigger for this, so it's going to be inefficient
             $models = Ability::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->ability_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/CreatureMapper.php b/app/Services/Campaign/Import/Mappers/CreatureMapper.php
index ba68f1f2c8..4e45ca9e71 100644
--- a/app/Services/Campaign/Import/Mappers/CreatureMapper.php
+++ b/app/Services/Campaign/Import/Mappers/CreatureMapper.php
@@ -36,7 +36,7 @@ public function tree(): self
             // We need the nested trait to trigger for this so it's going to be inefficient
             $models = Creature::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->creature_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/EventMapper.php b/app/Services/Campaign/Import/Mappers/EventMapper.php
index 781588f4a7..ad74ade69d 100644
--- a/app/Services/Campaign/Import/Mappers/EventMapper.php
+++ b/app/Services/Campaign/Import/Mappers/EventMapper.php
@@ -36,7 +36,7 @@ public function tree(): self
             // We need the nested trait to trigger for this so it's going to be inefficient
             $models = Event::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->event_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/FamilyMapper.php b/app/Services/Campaign/Import/Mappers/FamilyMapper.php
index e32b9f691d..5a3646e746 100644
--- a/app/Services/Campaign/Import/Mappers/FamilyMapper.php
+++ b/app/Services/Campaign/Import/Mappers/FamilyMapper.php
@@ -38,7 +38,7 @@ public function tree(): self
             // We need the nested trait to trigger for this, so it's going to be inefficient
             $models = Family::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->family_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/JournalMapper.php b/app/Services/Campaign/Import/Mappers/JournalMapper.php
index 027e2f6e6f..7e7bda13d9 100644
--- a/app/Services/Campaign/Import/Mappers/JournalMapper.php
+++ b/app/Services/Campaign/Import/Mappers/JournalMapper.php
@@ -37,7 +37,7 @@ public function tree(): self
             // We need the nested trait to trigger for this, so it's going to be inefficient
             $models = Journal::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->journal_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/LocationMapper.php b/app/Services/Campaign/Import/Mappers/LocationMapper.php
index bda57e9207..a8741bfe76 100644
--- a/app/Services/Campaign/Import/Mappers/LocationMapper.php
+++ b/app/Services/Campaign/Import/Mappers/LocationMapper.php
@@ -26,10 +26,10 @@ public function tree(): self
             }
             // We need the nested trait to trigger for this so it's going to be inefficient
             $locations = Location::whereIn('id', $children)->get();
-            /** @var Location $location */
-            foreach ($locations as $location) {
-                $location->setParentId($this->mapping[$parent]);
-                $location->save();
+            /** @var Location $model */
+            foreach ($locations as $model) {
+                $model->location_id = $this->mapping[$parent];
+                $model->save();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/MapMapper.php b/app/Services/Campaign/Import/Mappers/MapMapper.php
index d02a809a81..30130f7889 100644
--- a/app/Services/Campaign/Import/Mappers/MapMapper.php
+++ b/app/Services/Campaign/Import/Mappers/MapMapper.php
@@ -47,10 +47,10 @@ public function tree(): self
             }
             // We need the nested trait to trigger for this so it's going to be inefficient
             $maps = Map::whereIn('id', $children)->get();
-            /** @var Map $map */
-            foreach ($maps as $map) {
-                $map->setParentId($this->mapping[$parent]);
-                $map->save();
+            /** @var Map $model */
+            foreach ($maps as $model) {
+                $model->map_id = $this->mapping[$parent];
+                $model->save();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/NoteMapper.php b/app/Services/Campaign/Import/Mappers/NoteMapper.php
index f9245c9467..c6ffafcb13 100644
--- a/app/Services/Campaign/Import/Mappers/NoteMapper.php
+++ b/app/Services/Campaign/Import/Mappers/NoteMapper.php
@@ -27,7 +27,7 @@ public function tree(): self
             // We need the nested trait to trigger for this so it's going to be inefficient
             $models = Note::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->note_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/OrganisationMapper.php b/app/Services/Campaign/Import/Mappers/OrganisationMapper.php
index dba5038e33..a1d158d936 100644
--- a/app/Services/Campaign/Import/Mappers/OrganisationMapper.php
+++ b/app/Services/Campaign/Import/Mappers/OrganisationMapper.php
@@ -36,7 +36,7 @@ public function tree(): self
             // We need the nested trait to trigger for this, so it's going to be inefficient
             $models = Organisation::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->organisation_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/QuestMapper.php b/app/Services/Campaign/Import/Mappers/QuestMapper.php
index c7756b55bd..1062b4e18d 100644
--- a/app/Services/Campaign/Import/Mappers/QuestMapper.php
+++ b/app/Services/Campaign/Import/Mappers/QuestMapper.php
@@ -39,10 +39,10 @@ public function tree(): self
             }
             // We need the nested trait to trigger for this so it's going to be inefficient
             $quests = Quest::whereIn('id', $children)->get();
-            /** @var Quest $quest */
-            foreach ($quests as $quest) {
-                $quest->setParentId($this->mapping[$parent]);
-                $quest->save();
+            /** @var Quest $model */
+            foreach ($quests as $model) {
+                $model->quest_id = $this->mapping[$parent];
+                $model->save();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/RaceMapper.php b/app/Services/Campaign/Import/Mappers/RaceMapper.php
index 2df54d29b2..77e306ce48 100644
--- a/app/Services/Campaign/Import/Mappers/RaceMapper.php
+++ b/app/Services/Campaign/Import/Mappers/RaceMapper.php
@@ -36,7 +36,7 @@ public function tree(): self
             // We need the nested trait to trigger for this so it's going to be inefficient
             $models = Race::whereIn('id', $children)->get();
             foreach ($models as $model) {
-                $model->setParentId($this->mapping[$parent]);
+                $model->race_id = $this->mapping[$parent];
                 $model->save();
             }
         }
diff --git a/app/Services/Campaign/Import/Mappers/TagMapper.php b/app/Services/Campaign/Import/Mappers/TagMapper.php
index 187008c6fa..c62a016ec7 100644
--- a/app/Services/Campaign/Import/Mappers/TagMapper.php
+++ b/app/Services/Campaign/Import/Mappers/TagMapper.php
@@ -26,10 +26,10 @@ public function tree(): self
             }
             // We need the nested trait to trigger for this so it's going to be inefficient
             $tags = Tag::whereIn('id', $children)->get();
-            /** @var Tag $tag */
-            foreach ($tags as $tag) {
-                $tag->setParentId($this->mapping[$parent]);
-                $tag->save();
+            /** @var Tag $model */
+            foreach ($tags as $model) {
+                $model->tag_id = $this->mapping[$parent];
+                $model->save();
             }
         }
         return $this;
diff --git a/app/Services/Campaign/Import/Mappers/TimelineMapper.php b/app/Services/Campaign/Import/Mappers/TimelineMapper.php
index e3732f5d42..79c897541a 100644
--- a/app/Services/Campaign/Import/Mappers/TimelineMapper.php
+++ b/app/Services/Campaign/Import/Mappers/TimelineMapper.php
@@ -40,11 +40,11 @@ public function tree(): self
                 continue;
             }
             // We need the nested trait to trigger for this so it's going to be inefficient
-            $timelines = Timeline::whereIn('id', $children)->get();
-            /** @var Timeline $timeline */
-            foreach ($timelines as $timeline) {
-                $timeline->setParentId($this->mapping[$parent]);
-                $timeline->save();
+            $models = Timeline::whereIn('id', $children)->get();
+            /** @var Timeline $model */
+            foreach ($models as $model) {
+                $model->timeline_id = $this->mapping[$parent];
+                $model->save();
             }
         }
 
diff --git a/app/Services/Entity/TagService.php b/app/Services/Entity/TagService.php
index b2d6b77d71..9dd2ef8fa4 100644
--- a/app/Services/Entity/TagService.php
+++ b/app/Services/Entity/TagService.php
@@ -46,7 +46,6 @@ public function create(mixed $name, int $campaignID): Tag
         $tag->campaign_id = $campaignID;
         $tag->slug = Str::slug($tag->name, '');
         $tag->is_private = false;
-        $tag->recalculateTreeBounds();
         $tag->saveQuietly();
         $tag->createEntity();
 
diff --git a/app/Services/Entity/TransformService.php b/app/Services/Entity/TransformService.php
index 282ea65cc0..4e6073db69 100644
--- a/app/Services/Entity/TransformService.php
+++ b/app/Services/Entity/TransformService.php
@@ -60,7 +60,7 @@ protected function location(): self
         // Special import for location location_id
         if (in_array('location_id', $this->fillable) && empty($this->new->location_id) && !empty($this->child->location_id)) {
             // @phpstan-ignore-next-line
-            $this->new->location_id = $this->child->getParentId();
+            $this->new->location_id = $this->child->{$this->child->getParentKeyName()};
         }
         if (in_array('location_id', $this->fillable) && empty($this->new->location_id) && !empty($this->child->location_id)) {
             // @phpstan-ignore-next-line

From 57107d5e72de650d1bc9785962cc10129d9ad66c Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sat, 2 Dec 2023 15:53:58 -0600
Subject: [PATCH 22/28] Fix export/import with lazy loading and deleted
 relation models

---
 app/Models/Entity.php                         |  6 +++++
 app/Services/Campaign/ExportService.php       | 17 ++++++++++++--
 .../Campaign/Import/ImportIdMapper.php        |  5 ++++
 .../Campaign/Import/ImportService.php         |  1 +
 .../Campaign/Import/Mappers/AbilityMapper.php |  2 +-
 .../Import/Mappers/CalendarMapper.php         |  2 +-
 .../Import/Mappers/CreatureMapper.php         |  2 +-
 .../Campaign/Import/Mappers/EntityMapper.php  | 23 ++++++++++++++-----
 .../Campaign/Import/Mappers/EventMapper.php   |  2 +-
 .../Campaign/Import/Mappers/FamilyMapper.php  |  2 +-
 .../Campaign/Import/Mappers/ImportMapper.php  |  1 -
 .../Campaign/Import/Mappers/ItemMapper.php    |  2 +-
 .../Campaign/Import/Mappers/JournalMapper.php |  2 +-
 .../Import/Mappers/LocationMapper.php         |  2 +-
 .../Campaign/Import/Mappers/MapMapper.php     |  2 +-
 .../Campaign/Import/Mappers/NoteMapper.php    |  2 +-
 .../Import/Mappers/OrganisationMapper.php     |  2 +-
 .../Campaign/Import/Mappers/QuestMapper.php   |  2 +-
 .../Campaign/Import/Mappers/RaceMapper.php    |  2 +-
 .../Campaign/Import/Mappers/TagMapper.php     |  2 +-
 .../Import/Mappers/TimelineMapper.php         |  2 +-
 app/Traits/ExportableTrait.php                | 10 +++++---
 config/queue.php                              |  4 ++--
 23 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/app/Models/Entity.php b/app/Models/Entity.php
index e9406ce3b2..db4fda965a 100644
--- a/app/Models/Entity.php
+++ b/app/Models/Entity.php
@@ -462,6 +462,12 @@ public function export(): array
         ];
         foreach ($relations as $relation) {
             foreach ($this->$relation as $model) {
+                if ($relation === 'abilities' && empty($model->ability)) {
+                    continue;
+                }
+                if ($relation === 'inventories' && empty($model->item)) {
+                    continue;
+                }
                 if (method_exists($model, 'exportFields')) {
                     $export = [];
                     foreach ($model->exportFields() as $field) {
diff --git a/app/Services/Campaign/ExportService.php b/app/Services/Campaign/ExportService.php
index e3e821519d..30db9fe5e6 100644
--- a/app/Services/Campaign/ExportService.php
+++ b/app/Services/Campaign/ExportService.php
@@ -9,6 +9,7 @@
 use App\Models\Image;
 use App\Models\CampaignExport;
 use App\Models\Map;
+use App\Models\MiscModel;
 use App\Notifications\Header;
 use App\Traits\CampaignAware;
 use App\Traits\UserAware;
@@ -72,7 +73,7 @@ public function queue(): self
             'status' => CampaignExport::STATUS_SCHEDULED,
         ]);
 
-        Export::dispatch($this->campaign, $this->user, $entitiesExport, false);
+        Export::dispatch($this->campaign, $this->user, $entitiesExport, false)->onQueue('heavy');
 
         return $this;
     }
@@ -176,6 +177,7 @@ protected function entities(): self
             'entity.image',
             'entity.header',
             'entity.assets',
+            'entity.files',
             'entity.mentions',
             'entity.inventories',
             'entity.entityAttributes',
@@ -187,7 +189,8 @@ protected function entities(): self
             }
             try {
                 $property = Str::camel($entity);
-                foreach ($this->campaign->$property()->with($entityWith)->has('entity')->get() as $model) {
+                $smartWith = $this->smartWith($entityWith, $class);
+                foreach ($this->campaign->$property()->with($smartWith)->has('entity')->get() as $model) {
                     $this->process($entity, $model);
                 }
             } catch (Exception $e) {
@@ -204,6 +207,16 @@ protected function entities(): self
         return $this;
     }
 
+    protected function smartWith(array $with, string $entityClass): array
+    {
+        /** @var MiscModel $class */
+        $class = app()->make($entityClass);
+        foreach ($class->exportRelations() as $rel) {
+            $with[] = $rel;
+        }
+        return $with;
+    }
+
     protected function gallery(): self
     {
         foreach ($this->campaign->images()->with('imageFolder')->get() as $image) {
diff --git a/app/Services/Campaign/Import/ImportIdMapper.php b/app/Services/Campaign/Import/ImportIdMapper.php
index c06ecf5e3a..e98a344584 100644
--- a/app/Services/Campaign/Import/ImportIdMapper.php
+++ b/app/Services/Campaign/Import/ImportIdMapper.php
@@ -49,6 +49,11 @@ public function get(string $type, int $old): int
         return $this->misc[$type][$old];
     }
 
+    public function has(string $type, int $old): bool
+    {
+        return !empty($this->misc[$type][$old]);
+    }
+
     public function getEntity(int $old): int
     {
         return $this->entities[$old];
diff --git a/app/Services/Campaign/Import/ImportService.php b/app/Services/Campaign/Import/ImportService.php
index aa1034280f..b4595e1229 100644
--- a/app/Services/Campaign/Import/ImportService.php
+++ b/app/Services/Campaign/Import/ImportService.php
@@ -159,6 +159,7 @@ protected function process()
             $this->job->status_id = CampaignImportStatus::FINISHED;
         } catch (Exception $e) {
             dump($e->getMessage());
+            dump($e->getTrace());
             Log::error('Import', ['error' => $e->getMessage()]);
             $this->job->status_id = CampaignImportStatus::FAILED;
         }
diff --git a/app/Services/Campaign/Import/Mappers/AbilityMapper.php b/app/Services/Campaign/Import/Mappers/AbilityMapper.php
index e3c2a58285..ea9726849f 100644
--- a/app/Services/Campaign/Import/Mappers/AbilityMapper.php
+++ b/app/Services/Campaign/Import/Mappers/AbilityMapper.php
@@ -28,7 +28,7 @@ public function tree(): self
             $models = Ability::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->ability_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/CalendarMapper.php b/app/Services/Campaign/Import/Mappers/CalendarMapper.php
index fd8a8fa862..3b444d7e1e 100644
--- a/app/Services/Campaign/Import/Mappers/CalendarMapper.php
+++ b/app/Services/Campaign/Import/Mappers/CalendarMapper.php
@@ -37,7 +37,7 @@ public function tree(): self
             $models = Calendar::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->calendar_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/CreatureMapper.php b/app/Services/Campaign/Import/Mappers/CreatureMapper.php
index 4e45ca9e71..b22c727a91 100644
--- a/app/Services/Campaign/Import/Mappers/CreatureMapper.php
+++ b/app/Services/Campaign/Import/Mappers/CreatureMapper.php
@@ -37,7 +37,7 @@ public function tree(): self
             $models = Creature::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->creature_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/EntityMapper.php b/app/Services/Campaign/Import/Mappers/EntityMapper.php
index 5077fe6171..4188e51f7a 100644
--- a/app/Services/Campaign/Import/Mappers/EntityMapper.php
+++ b/app/Services/Campaign/Import/Mappers/EntityMapper.php
@@ -55,7 +55,7 @@ protected function loadModel(): self
     {
         $builder = app()->make($this->className);
         $id = ImportIdMapper::get($this->mappingName, $this->data['id']);
-        $this->model = $builder->where('id', $id)->firstOrFail();
+        $this->model = $builder->where('id', $id)->with('entity')->firstOrFail();
         return $this;
     }
 
@@ -323,6 +323,9 @@ protected function foreign(string $model, string $field): self
         if ($model === 'entities') {
             $foreignID = ImportIdMapper::getEntity($this->data[$field]);
         } else {
+            if (!ImportIdMapper::has($model, $this->data[$field])) {
+                return $this;
+            }
             $foreignID = ImportIdMapper::get($model, $this->data[$field]);
         }
         if (!$foreignID) {
@@ -335,10 +338,10 @@ protected function foreign(string $model, string $field): self
     protected function pivot(string $relation, string $model, string $field): self
     {
         foreach ($this->data[$relation] as $pivot) {
-            $foreignID = ImportIdMapper::get($model, $pivot[$field]);
-            if (!$foreignID) {
+            if (!ImportIdMapper::has($model, $pivot[$field])) {
                 continue;
             }
+            $foreignID = ImportIdMapper::get($model, $pivot[$field]);
             $this->model->{$model}()->attach($foreignID);
         }
         return $this;
@@ -362,11 +365,10 @@ protected function relations(): self
             'relation', 'visibility_id', 'attitude', 'is_pinned', 'colour', 'marketplace_uuid'
         ];
         foreach ($this->data['entity']['relationships'] as $data) {
-            $targetID = ImportIdMapper::getEntity($data['target_id']);
-            if (empty($targetID)) {
+            if (!ImportIdMapper::hasEntity( $data['target_id'])) {
                 continue;
             }
-
+            $targetID = ImportIdMapper::getEntity($data['target_id']);
             $rel = new Relation();
             $rel->owner_id = $this->entity->id;
             $rel->target_id = $targetID;
@@ -400,6 +402,9 @@ protected function reminders(): self
             'visibility_id',
         ];
         foreach ($this->data['entity']['events'] as $data) {
+            if (!ImportIdMapper::has('calendars', $data['calendar_id'])) {
+                continue;
+            }
             $rem = new EntityEvent();
             $rem->entity_id = $this->entity->id;
             $rem->calendar_id = ImportIdMapper::get('calendars', $data['calendar_id']);
@@ -421,6 +426,9 @@ protected function abilities(): self
             'visibility_id', 'charges', 'position', 'note'
         ];
         foreach ($this->data['entity']['abilities'] as $data) {
+            if (!ImportIdMapper::has('abilities', $data['ability_id'])) {
+                continue;
+            }
             $abilityID = ImportIdMapper::get('abilities', $data['ability_id']);
             if (empty($abilityID)) {
                 continue;
@@ -457,6 +465,9 @@ protected function inventory(): self
             $inv = new Inventory();
             $inv->entity_id = $this->entity->id;
             if (!empty($data['item_id'])) {
+                if (!ImportIdMapper::has('items', $data['item_id'])) {
+                    continue;
+                }
                 $itemID = ImportIdMapper::get('items', $data['item_id']);
                 if (empty($itemID)) {
                     continue;
diff --git a/app/Services/Campaign/Import/Mappers/EventMapper.php b/app/Services/Campaign/Import/Mappers/EventMapper.php
index ad74ade69d..432e43341f 100644
--- a/app/Services/Campaign/Import/Mappers/EventMapper.php
+++ b/app/Services/Campaign/Import/Mappers/EventMapper.php
@@ -37,7 +37,7 @@ public function tree(): self
             $models = Event::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->event_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/FamilyMapper.php b/app/Services/Campaign/Import/Mappers/FamilyMapper.php
index 5a3646e746..1e5d7f3352 100644
--- a/app/Services/Campaign/Import/Mappers/FamilyMapper.php
+++ b/app/Services/Campaign/Import/Mappers/FamilyMapper.php
@@ -39,7 +39,7 @@ public function tree(): self
             $models = Family::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->family_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/ImportMapper.php b/app/Services/Campaign/Import/Mappers/ImportMapper.php
index 80f7394635..ddedb30ed9 100644
--- a/app/Services/Campaign/Import/Mappers/ImportMapper.php
+++ b/app/Services/Campaign/Import/Mappers/ImportMapper.php
@@ -27,6 +27,5 @@ public function prepare(): self
     public function clear(): void
     {
         unset($this->path, $this->data);
-
     }
 }
diff --git a/app/Services/Campaign/Import/Mappers/ItemMapper.php b/app/Services/Campaign/Import/Mappers/ItemMapper.php
index adabeb6656..3779e66ee1 100644
--- a/app/Services/Campaign/Import/Mappers/ItemMapper.php
+++ b/app/Services/Campaign/Import/Mappers/ItemMapper.php
@@ -38,7 +38,7 @@ public function tree(): self
             $models = Item::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->item_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/JournalMapper.php b/app/Services/Campaign/Import/Mappers/JournalMapper.php
index 7e7bda13d9..3f11c21a37 100644
--- a/app/Services/Campaign/Import/Mappers/JournalMapper.php
+++ b/app/Services/Campaign/Import/Mappers/JournalMapper.php
@@ -38,7 +38,7 @@ public function tree(): self
             $models = Journal::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->journal_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/LocationMapper.php b/app/Services/Campaign/Import/Mappers/LocationMapper.php
index a8741bfe76..5f50a43fb9 100644
--- a/app/Services/Campaign/Import/Mappers/LocationMapper.php
+++ b/app/Services/Campaign/Import/Mappers/LocationMapper.php
@@ -29,7 +29,7 @@ public function tree(): self
             /** @var Location $model */
             foreach ($locations as $model) {
                 $model->location_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/MapMapper.php b/app/Services/Campaign/Import/Mappers/MapMapper.php
index 30130f7889..50b392e081 100644
--- a/app/Services/Campaign/Import/Mappers/MapMapper.php
+++ b/app/Services/Campaign/Import/Mappers/MapMapper.php
@@ -50,7 +50,7 @@ public function tree(): self
             /** @var Map $model */
             foreach ($maps as $model) {
                 $model->map_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/NoteMapper.php b/app/Services/Campaign/Import/Mappers/NoteMapper.php
index c6ffafcb13..92e65b5ccb 100644
--- a/app/Services/Campaign/Import/Mappers/NoteMapper.php
+++ b/app/Services/Campaign/Import/Mappers/NoteMapper.php
@@ -28,7 +28,7 @@ public function tree(): self
             $models = Note::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->note_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/OrganisationMapper.php b/app/Services/Campaign/Import/Mappers/OrganisationMapper.php
index a1d158d936..f323b1f90a 100644
--- a/app/Services/Campaign/Import/Mappers/OrganisationMapper.php
+++ b/app/Services/Campaign/Import/Mappers/OrganisationMapper.php
@@ -37,7 +37,7 @@ public function tree(): self
             $models = Organisation::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->organisation_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/QuestMapper.php b/app/Services/Campaign/Import/Mappers/QuestMapper.php
index 1062b4e18d..662d5eb76d 100644
--- a/app/Services/Campaign/Import/Mappers/QuestMapper.php
+++ b/app/Services/Campaign/Import/Mappers/QuestMapper.php
@@ -42,7 +42,7 @@ public function tree(): self
             /** @var Quest $model */
             foreach ($quests as $model) {
                 $model->quest_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/RaceMapper.php b/app/Services/Campaign/Import/Mappers/RaceMapper.php
index 77e306ce48..afb298c4b0 100644
--- a/app/Services/Campaign/Import/Mappers/RaceMapper.php
+++ b/app/Services/Campaign/Import/Mappers/RaceMapper.php
@@ -37,7 +37,7 @@ public function tree(): self
             $models = Race::whereIn('id', $children)->get();
             foreach ($models as $model) {
                 $model->race_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Services/Campaign/Import/Mappers/TagMapper.php b/app/Services/Campaign/Import/Mappers/TagMapper.php
index c62a016ec7..73d8f37c4d 100644
--- a/app/Services/Campaign/Import/Mappers/TagMapper.php
+++ b/app/Services/Campaign/Import/Mappers/TagMapper.php
@@ -29,7 +29,7 @@ public function tree(): self
             /** @var Tag $model */
             foreach ($tags as $model) {
                 $model->tag_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
         return $this;
diff --git a/app/Services/Campaign/Import/Mappers/TimelineMapper.php b/app/Services/Campaign/Import/Mappers/TimelineMapper.php
index 79c897541a..e5c9ee5df0 100644
--- a/app/Services/Campaign/Import/Mappers/TimelineMapper.php
+++ b/app/Services/Campaign/Import/Mappers/TimelineMapper.php
@@ -44,7 +44,7 @@ public function tree(): self
             /** @var Timeline $model */
             foreach ($models as $model) {
                 $model->timeline_id = $this->mapping[$parent];
-                $model->save();
+                $model->saveQuietly();
             }
         }
 
diff --git a/app/Traits/ExportableTrait.php b/app/Traits/ExportableTrait.php
index bbec4d54d3..b4092c667d 100644
--- a/app/Traits/ExportableTrait.php
+++ b/app/Traits/ExportableTrait.php
@@ -62,12 +62,16 @@ protected function entityExportData(): self
         return $this;
     }
 
-    protected function foreignExportData(): self
+    public function exportRelations(): array
     {
         if (!property_exists($this, 'foreignExport')) {
-            return $this;
+            return [];
         }
-        foreach ($this->foreignExport as $foreign) {
+        return $this->foreignExport;
+    }
+    protected function foreignExportData(): self
+    {
+        foreach ($this->exportRelations() as $foreign) {
             $this->exportData[$foreign] = [];
             foreach ($this->$foreign as $model) {
                 try {
diff --git a/config/queue.php b/config/queue.php
index 858d56dee9..60d4fed715 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -65,10 +65,10 @@
         ],
 
         // For heavy jobs (no timeout) like map chunking
-        'import' => [
+        'heavy' => [
             'driver' => 'redis',
             'connection' => 'default',
-            'queue' => env('REDIS_IMPORT_QUEUE', 'import'),
+            'queue' => env('REDIS_HEAVY_QUEUE', 'heavy'),
             'retry_after' => 90,
         ],
     ],

From 720b86e33de80c2606cc86a8f5f4a1be587ec1b7 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sun, 3 Dec 2023 19:34:34 -0600
Subject: [PATCH 23/28] API endpoint to get entity type filters

---
 .../Api/v1/FilterApiController.php            | 30 ++++++++++++
 app/Http/Controllers/CrudController.php       |  9 ++--
 app/Models/Ability.php                        |  2 +
 app/Models/AttributeTemplate.php              |  2 +
 app/Models/Bookmark.php                       |  3 +-
 app/Models/Calendar.php                       |  2 +
 app/Models/Character.php                      |  2 +
 app/Models/Concerns/HasFilters.php            | 48 ++++---------------
 app/Models/Conversation.php                   |  5 +-
 app/Models/Creature.php                       |  2 +
 app/Models/DiceRoll.php                       |  2 +
 app/Models/EntityType.php                     |  2 +-
 app/Models/Event.php                          |  2 +
 app/Models/Family.php                         |  2 +
 app/Models/Item.php                           |  5 +-
 app/Models/Journal.php                        |  2 +
 app/Models/Location.php                       |  2 +
 app/Models/Map.php                            |  2 +
 app/Models/MiscModel.php                      |  1 -
 app/Models/Note.php                           |  2 +
 app/Models/Organisation.php                   |  2 +
 app/Models/Quest.php                          |  2 +
 app/Models/Race.php                           |  2 +
 app/Models/Tag.php                            |  2 +
 app/Models/Timeline.php                       |  2 +
 app/Providers/RouteServiceProvider.php        |  2 +
 app/Services/Api/FilterService.php            | 34 +++++++++++++
 app/Traits/EntityAware.php                    |  4 --
 app/Traits/EntityTypeAware.php                | 16 +++++++
 routes/api.v1.php                             |  5 +-
 30 files changed, 144 insertions(+), 54 deletions(-)
 create mode 100644 app/Http/Controllers/Api/v1/FilterApiController.php
 create mode 100644 app/Services/Api/FilterService.php
 create mode 100644 app/Traits/EntityTypeAware.php

diff --git a/app/Http/Controllers/Api/v1/FilterApiController.php b/app/Http/Controllers/Api/v1/FilterApiController.php
new file mode 100644
index 0000000000..8f5039e42e
--- /dev/null
+++ b/app/Http/Controllers/Api/v1/FilterApiController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Api\v1;
+
+use App\Http\Controllers\Controller;
+use App\Models\EntityType;
+use App\Services\Api\FilterService;
+
+class FilterApiController extends Controller
+{
+    protected FilterService $filterService;
+
+    public function __construct(FilterService $filterService)
+    {
+        $this->filterService = $filterService;
+    }
+
+    public function index()
+    {
+        return response()->json($this->filterService->endpoints());
+    }
+    public function show(EntityType $entityType)
+    {
+        return response()->json(
+            $this->filterService
+                ->entityType($entityType)
+                ->filters()
+        );
+    }
+}
diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php
index 0500a135c6..a2c5a8c1ec 100644
--- a/app/Http/Controllers/CrudController.php
+++ b/app/Http/Controllers/CrudController.php
@@ -118,9 +118,12 @@ public function crudIndex(Request $request)
         $model = new $this->model();
         $campaign = $this->campaign;
         $this->filterService
-            ->request($request)
-            ->model($model)
-            ->make($this->view);
+            ->request($request);
+        if (method_exists($model, 'explicitFilters')) {
+            $this->filterService
+                ->model($model)
+                ->make($this->view);
+        }
         $name = $this->view;
         $langKey = $this->langKey ?? $name;
         /** @var DatagridFilter|null $filter */
diff --git a/app/Models/Ability.php b/app/Models/Ability.php
index 67c65ef2ce..fe9447f273 100644
--- a/app/Models/Ability.php
+++ b/app/Models/Ability.php
@@ -5,6 +5,7 @@
 use App\Facades\Mentions;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -34,6 +35,7 @@ class Ability extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/AttributeTemplate.php b/app/Models/AttributeTemplate.php
index 378d8450d3..c3822aa3f2 100644
--- a/app/Models/AttributeTemplate.php
+++ b/app/Models/AttributeTemplate.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Services\Attributes\RandomService;
 use App\Traits\CampaignTrait;
 use Illuminate\Database\Eloquent\Builder;
@@ -23,6 +24,7 @@ class AttributeTemplate extends MiscModel
 {
     use Acl;
     use CampaignTrait;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
 
diff --git a/app/Models/Bookmark.php b/app/Models/Bookmark.php
index 45d51341ce..338c763472 100644
--- a/app/Models/Bookmark.php
+++ b/app/Models/Bookmark.php
@@ -38,7 +38,8 @@
  * @property boolean $is_active
  * @property array $optionsAllowedKeys
  *
- * @method self ordered()
+ * @method static self|Builder ordered()
+ * @method static self|Builder active()
  */
 class Bookmark extends MiscModel
 {
diff --git a/app/Models/Calendar.php b/app/Models/Calendar.php
index 897ebd16b7..cda75cd082 100644
--- a/app/Models/Calendar.php
+++ b/app/Models/Calendar.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Relations\CalendarRelations;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -42,6 +43,7 @@ class Calendar extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
 
diff --git a/app/Models/Character.php b/app/Models/Character.php
index 86a00505a6..b30b7a9901 100644
--- a/app/Models/Character.php
+++ b/app/Models/Character.php
@@ -6,6 +6,7 @@
 use App\Facades\CampaignLocalization;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -44,6 +45,7 @@ class Character extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use SoftDeletes;
     use SortableTrait;
 
diff --git a/app/Models/Concerns/HasFilters.php b/app/Models/Concerns/HasFilters.php
index c0a9eaf12c..c59cddb202 100644
--- a/app/Models/Concerns/HasFilters.php
+++ b/app/Models/Concerns/HasFilters.php
@@ -20,19 +20,6 @@
  */
 trait HasFilters
 {
-    /**
-     * Explicit fields for filtering.
-     * Ex. ['sex']
-     * @var array
-     */
-    protected $explicitFilters = [];
-
-    /**
-     * @var bool If the entity table was already joined or not
-     */
-    protected $joinedEntity = false;
-
-    protected string $key;
     protected string|array|null $filterValue;
 
     /** @var string|null Some filters have a fellow _option field that can define more in detail what is needed */
@@ -110,7 +97,7 @@ public function scopeFilter(Builder $query, array $params = []): Builder
                 }
 
                 // Explicit filters (numbers typically, foreign ids)
-                if (in_array($key, $this->explicitFilters)) {
+                if (in_array($key, $this->explicitFilters())) {
                     if ($this->filterOperator == 'IS NULL') {
                         $query->whereNull($this->getTable() . '.' . $key);
                     } else {
@@ -203,31 +190,6 @@ protected function extractSearchOperator($value, string $key): void
         $this->filterValue = $filterValue;
     }
 
-    /**
-     * Add a left join on the entity to the query. Only do this once
-     * @return Builder
-     */
-    /*protected function joinEntity(Builder $query): Builder
-    {
-        if ($this->joinedEntity) {
-            return $query;
-        }
-
-        $this->joinedEntity = true;
-
-        // @phpstan-ignore-next-line
-        return $query
-            ->distinct()
-            ->leftJoin('entities as e', function ($join) {
-                $join->on('e.entity_id', '=', $this->getTable() . '.id');
-                // @phpstan-ignore-next-line
-                $join->where('e.type_id', '=', $this->entityTypeID())
-                    ->whereRaw('e.campaign_id = ' . $this->getTable() . '.campaign_id');
-            })
-            ->groupBy($this->getTable() . '.id')
-        ;
-    }*/
-
     /**
      * Add a query on a foreign relationship of the model
      */
@@ -652,4 +614,12 @@ protected function filterParent(Builder $query): void
     {
         $query->where($this->getTable() . '.' . $this->getParentKeyName(), $this->filterValue);
     }
+
+    protected function explicitFilters(): array
+    {
+        if (property_exists($this, 'explicitFilters')) {
+            return $this->explicitFilters;
+        }
+        return [];
+    }
 }
diff --git a/app/Models/Conversation.php b/app/Models/Conversation.php
index 384a8fbe0b..017bc8b5f5 100644
--- a/app/Models/Conversation.php
+++ b/app/Models/Conversation.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Traits\CampaignTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -20,10 +21,10 @@
  */
 class Conversation extends MiscModel
 {
-    use Acl
-    ;
+    use Acl    ;
     use CampaignTrait;
     use HasFactory;
+    use HasFilters;
     use SoftDeletes;
 
     /** @var string[]  */
diff --git a/app/Models/Creature.php b/app/Models/Creature.php
index c4cd63b452..c43cc51742 100644
--- a/app/Models/Creature.php
+++ b/app/Models/Creature.php
@@ -5,6 +5,7 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -32,6 +33,7 @@ class Creature extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/DiceRoll.php b/app/Models/DiceRoll.php
index 36f58b1b2d..300c2edbc7 100644
--- a/app/Models/DiceRoll.php
+++ b/app/Models/DiceRoll.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Traits\CampaignTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -18,6 +19,7 @@ class DiceRoll extends MiscModel
     use Acl;
     use CampaignTrait;
     use HasFactory;
+    use HasFilters;
     use SoftDeletes;
 
     /** @var string[]  */
diff --git a/app/Models/EntityType.php b/app/Models/EntityType.php
index f9bb8e8f4f..882b657d6e 100644
--- a/app/Models/EntityType.php
+++ b/app/Models/EntityType.php
@@ -42,7 +42,7 @@ public function scopeExclude(Builder $query, array $exclude): Builder
     /**
      * Get the class model of the entity type
      */
-    public function getClass()
+    public function getClass(): MiscModel
     {
         $className = 'App\Models\\' . Str::studly($this->code);
         return app()->make($className);
diff --git a/app/Models/Event.php b/app/Models/Event.php
index 22794ffe42..4af4b30b39 100644
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -4,6 +4,7 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -32,6 +33,7 @@ class Event extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Family.php b/app/Models/Family.php
index 8c25b01106..013595bc7e 100644
--- a/app/Models/Family.php
+++ b/app/Models/Family.php
@@ -5,6 +5,7 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -31,6 +32,7 @@ class Family extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Item.php b/app/Models/Item.php
index 357614e7f9..90b340d028 100644
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -28,11 +29,11 @@
  */
 class Item extends MiscModel
 {
-    use Acl
-    ;
+    use Acl    ;
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use SoftDeletes;
     use SortableTrait;
 
diff --git a/app/Models/Journal.php b/app/Models/Journal.php
index c2c1d9b772..156f091882 100644
--- a/app/Models/Journal.php
+++ b/app/Models/Journal.php
@@ -4,6 +4,7 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CalendarDateTrait;
 use App\Traits\CampaignTrait;
@@ -35,6 +36,7 @@ class Journal extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Location.php b/app/Models/Location.php
index efa8e9ceca..f2afb9d9ec 100644
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Facades\CampaignLocalization;
+use App\Models\Concerns\HasFilters;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
@@ -39,6 +40,7 @@ class Location extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Map.php b/app/Models/Map.php
index 28d0806bc8..eab0228c64 100644
--- a/app/Models/Map.php
+++ b/app/Models/Map.php
@@ -5,6 +5,7 @@
 use App\Facades\CampaignLocalization;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -49,6 +50,7 @@ class Map extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/MiscModel.php b/app/Models/MiscModel.php
index dc6284f3fd..934bc5ed1c 100644
--- a/app/Models/MiscModel.php
+++ b/app/Models/MiscModel.php
@@ -46,7 +46,6 @@
  */
 abstract class MiscModel extends Model
 {
-    use HasFilters;
     use LastSync;
     use Orderable;
     use Paginatable;
diff --git a/app/Models/Note.php b/app/Models/Note.php
index 8e04a5355e..b28d841b78 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -25,6 +26,7 @@ class Note extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
 
diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
index 11b30a07aa..e77842ec18 100644
--- a/app/Models/Organisation.php
+++ b/app/Models/Organisation.php
@@ -5,6 +5,7 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -32,6 +33,7 @@ class Organisation extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Quest.php b/app/Models/Quest.php
index 9db728ac1d..266b7aeaf3 100644
--- a/app/Models/Quest.php
+++ b/app/Models/Quest.php
@@ -4,6 +4,7 @@
 
 use App\Enums\FilterOption;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CalendarDateTrait;
 use App\Traits\CampaignTrait;
@@ -35,6 +36,7 @@ class Quest extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Race.php b/app/Models/Race.php
index 3873d4f317..b1093c9b0f 100644
--- a/app/Models/Race.php
+++ b/app/Models/Race.php
@@ -5,6 +5,7 @@
 use App\Enums\FilterOption;
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -32,6 +33,7 @@ class Race extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index f0767c42a6..c5d85dae41 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -4,6 +4,7 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Models\Scopes\TagScopes;
 use App\Traits\CampaignTrait;
@@ -36,6 +37,7 @@ class Tag extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Models/Timeline.php b/app/Models/Timeline.php
index fe06cda927..20a8b4953c 100644
--- a/app/Models/Timeline.php
+++ b/app/Models/Timeline.php
@@ -4,6 +4,7 @@
 
 use App\Facades\Module;
 use App\Models\Concerns\Acl;
+use App\Models\Concerns\HasFilters;
 use App\Models\Concerns\SortableTrait;
 use App\Traits\CampaignTrait;
 use App\Traits\ExportableTrait;
@@ -27,6 +28,7 @@ class Timeline extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
+    use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;
     use SortableTrait;
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 67d6f67038..2ef0137a98 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -7,6 +7,7 @@
 use App\Http\Controllers\Api\v1\HealthController;
 use App\Http\Middleware\LastCampaign;
 use App\Models\Campaign;
+use App\Models\EntityType;
 use App\Models\Plugin;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -38,6 +39,7 @@ public function boot(): void
         Route::bind('campaign', function (string $value) {
             return Campaign::acl($value)->firstOrFail();
         });
+        Route::model('entityType', EntityType::class);
     }
 
     /**
diff --git a/app/Services/Api/FilterService.php b/app/Services/Api/FilterService.php
new file mode 100644
index 0000000000..25e0cfda9f
--- /dev/null
+++ b/app/Services/Api/FilterService.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Services\Api;
+
+use App\Models\EntityType;
+use App\Traits\EntityTypeAware;
+
+class FilterService
+{
+    use EntityTypeAware;
+
+    public function endpoints()
+    {
+        $endpoints = [];
+        $types = EntityType::get();
+        foreach ($types as $type) {
+            $endpoints[] = [
+                'type' => $type->code,
+                'url' => url('/filters/' . $type->id)
+            ];
+        }
+
+        return $endpoints;
+    }
+
+    public function filters(): array
+    {
+        $model = $this->entityType->getClass();
+        if (method_exists($model, 'getFilterableColumns')) {
+            return $model->getFilterableColumns();
+        }
+        return [];
+    }
+}
diff --git a/app/Traits/EntityAware.php b/app/Traits/EntityAware.php
index b658dffccf..bc2c845f06 100644
--- a/app/Traits/EntityAware.php
+++ b/app/Traits/EntityAware.php
@@ -5,15 +5,11 @@
 use App\Models\Entity;
 
 /**
- * Trait for campaign aware services
  */
 trait EntityAware
 {
     public Entity $entity;
 
-    /**
-     * @return $this
-     */
     public function entity(Entity $entity): self
     {
         $this->entity = $entity;
diff --git a/app/Traits/EntityTypeAware.php b/app/Traits/EntityTypeAware.php
new file mode 100644
index 0000000000..b5daf0339d
--- /dev/null
+++ b/app/Traits/EntityTypeAware.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Traits;
+
+use App\Models\EntityType;
+
+trait EntityTypeAware
+{
+    public EntityType $entityType;
+
+    public function entityType(EntityType $entityType): self
+    {
+        $this->entityType = $entityType;
+        return $this;
+    }
+}
diff --git a/routes/api.v1.php b/routes/api.v1.php
index 3dff8e54d2..8a850e9ed4 100644
--- a/routes/api.v1.php
+++ b/routes/api.v1.php
@@ -93,7 +93,6 @@
 Route::post('campaigns/{campaign}/calendars/{calendar}/advance', [\App\Http\Controllers\Api\v1\Calendars\AdvancerApiController::class, 'advance']);
 Route::post('campaigns/{campaign}/calendars/{calendar}/retreat', [\App\Http\Controllers\Api\v1\Calendars\AdvancerApiController::class, 'retreat']);
 
-Route::get('entity-types', [\App\Http\Controllers\Api\v1\EntityTypeApiController::class, 'index']);
 Route::get('visibilities', [\App\Http\Controllers\Api\v1\VisibilityController::class, 'index']);
 Route::get('post-layouts', [\App\Http\Controllers\Api\v1\PostLayoutApiController::class, 'index']);
 
@@ -112,3 +111,7 @@
 Route::get('version', function () {
     return config('app.version');
 });
+
+Route::get('entity-types', [\App\Http\Controllers\Api\v1\EntityTypeApiController::class, 'index']);
+Route::get('filters', [\App\Http\Controllers\Api\v1\FilterApiController::class, 'index']);
+Route::get('filters/{entityType}', [\App\Http\Controllers\Api\v1\FilterApiController::class, 'show']);

From 3321fc07620d9190bf0bdb160ab51d765227bc57 Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Sun, 3 Dec 2023 19:42:09 -0600
Subject: [PATCH 24/28] API endpoint to get entity type filters

---
 .../Api/v1/FilterApiController.php            |  6 +-
 app/Services/Api/FilterService.php            |  2 +-
 resources/api-docs/1.0/entity-mentions.md     |  2 +-
 resources/api-docs/1.0/filters.md             | 66 +++++++++++++++++++
 resources/api-docs/1.0/index.md               |  1 +
 5 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 resources/api-docs/1.0/filters.md

diff --git a/app/Http/Controllers/Api/v1/FilterApiController.php b/app/Http/Controllers/Api/v1/FilterApiController.php
index 8f5039e42e..275471a095 100644
--- a/app/Http/Controllers/Api/v1/FilterApiController.php
+++ b/app/Http/Controllers/Api/v1/FilterApiController.php
@@ -21,10 +21,10 @@ public function index()
     }
     public function show(EntityType $entityType)
     {
-        return response()->json(
-            $this->filterService
+        return response()->json([
+            'data' => $this->filterService
                 ->entityType($entityType)
                 ->filters()
-        );
+        ]);
     }
 }
diff --git a/app/Services/Api/FilterService.php b/app/Services/Api/FilterService.php
index 25e0cfda9f..cd3f7ee289 100644
--- a/app/Services/Api/FilterService.php
+++ b/app/Services/Api/FilterService.php
@@ -15,7 +15,7 @@ public function endpoints()
         $types = EntityType::get();
         foreach ($types as $type) {
             $endpoints[] = [
-                'type' => $type->code,
+                'code' => $type->code,
                 'url' => url('/filters/' . $type->id)
             ];
         }
diff --git a/resources/api-docs/1.0/entity-mentions.md b/resources/api-docs/1.0/entity-mentions.md
index 00228dede0..467d44c9da 100644
--- a/resources/api-docs/1.0/entity-mentions.md
+++ b/resources/api-docs/1.0/entity-mentions.md
@@ -38,4 +38,4 @@ You can get a list of all the mentions of an entity by using the following endpo
 | `campaign_id` | The campaign ID mentioning this entity. This will always be the entity's campaign ID |
 | `target_id` | The entity ID that mentions this entity |
 
-Only one of `post_id`, `campaign_id` or `target_id` will ever be filled out for a mention. If an entity is mentionned several times by another entity, only one mention object is saved.
+Only one of `post_id`, `campaign_id` or `target_id` will ever be filled out for a mention. If an entity is mentioned several times by another entity, only one mention object is saved.
diff --git a/resources/api-docs/1.0/filters.md b/resources/api-docs/1.0/filters.md
new file mode 100644
index 0000000000..0fa32db846
--- /dev/null
+++ b/resources/api-docs/1.0/filters.md
@@ -0,0 +1,66 @@
+# Filters
+
+The various entity endpoints like `/characters`, `/locations` etc support many filters.
+
+To get a list of filters, first call `/filters` to get the endpoint for each [entity type](/api-docs/{{version}}/entity-types.md).
+
+| Method | URI       | Headers |
+| :- |:----------|  :-  |
+| GET/HEAD | `filters` | Default |
+
+### Results
+```json
+{
+    "data": [
+        {
+            "code": "character",
+            "url": ".../filters/1"
+        },
+        {
+            "code": "family",
+            "url": ".../filters/2"
+        },
+    ]
+}
+```
+
+## Character filters
+
+To get a list of available filters for the characters endpoint, call the following endpoint.
+
+
+| Method | URI               | Headers |
+| :- |:------------------|  :-  |
+| GET/HEAD | `filters/1` | Default |
+
+### Results
+```json
+{
+    "data": [
+        "title",
+        "age",
+        "sex",
+        "pronouns",
+        "location_id",
+        "is_dead",
+        "member_id",
+        "race_id",
+        "family_id",
+        "races",
+        "name",
+        "type",
+        "is_private",
+        "template",
+        "tag_id",
+        "tags",
+        "has_image",
+        "has_posts",
+        "has_entity_files",
+        "has_attributes",
+        "created_by",
+        "updated_by",
+        "attribute_name",
+        "attribute_value"
+    ]
+}
+```
diff --git a/resources/api-docs/1.0/index.md b/resources/api-docs/1.0/index.md
index 5190814a25..7f9c8a96f1 100644
--- a/resources/api-docs/1.0/index.md
+++ b/resources/api-docs/1.0/index.md
@@ -53,6 +53,7 @@
 
 - ## Other Concepts
     - [Last Sync](/api-docs/{{version}}/last-sync)
+    - [Filters](/api-docs/{{version}}/filters)
     - [Pagination](/api-docs/{{version}}/pagination)
     - [Bookmarks](/api-docs/{{version}}/bookmark)
     - [Dashboard Widgets](/api-docs/{{version}}/dashboard-widgets)

From 2cd4fb6f48da2a481852ff96e84ef9a0380bb7e6 Mon Sep 17 00:00:00 2001
From: Spitfire <itza305@gmail.com>
Date: Mon, 4 Dec 2023 15:20:23 -0600
Subject: [PATCH 25/28] Refactored entities component into foreign component

---
 .../views/abilities/entities/_form.blade.php  | 20 ++++----
 .../views/components/form/entities.blade.php  | 46 -------------------
 .../views/components/forms/foreign.blade.php  | 13 +++++-
 3 files changed, 23 insertions(+), 56 deletions(-)
 delete mode 100644 resources/views/components/form/entities.blade.php

diff --git a/resources/views/abilities/entities/_form.blade.php b/resources/views/abilities/entities/_form.blade.php
index 164c446ca8..83b51d8d2b 100644
--- a/resources/views/abilities/entities/_form.blade.php
+++ b/resources/views/abilities/entities/_form.blade.php
@@ -2,14 +2,18 @@
 {{ csrf_field() }}
 
 <x-grid type="1/1">
-    <x-forms.field field="entities" :required="true" >
-        <x-form.entities 
-            :options="['exclude-entity' => $model->entity->id, 'route' => 'search.ability-entities']" 
-            :campaign="$campaign"
-            :ajax="request()->ajax()"
-        >
-        </x-form.entities>
-    </x-forms.field>
+    <x-forms.foreign
+        field="entities"
+        :required="true"
+        label="abilities.show.tabs.entities"
+        multiple="multiple"
+        name="entities[]"
+        id="entities[]"
+        :options="['exclude-entity' => $model->entity->id, 'route' => 'search.ability-entities']" 
+        :campaign="$campaign"
+        :route="route('search.ability-entities', [$campaign])"
+    >
+    </x-forms.foreign>
 
     @include('cruds.fields.visibility_id', ['model' => null])
 </x-grid>
diff --git a/resources/views/components/form/entities.blade.php b/resources/views/components/form/entities.blade.php
deleted file mode 100644
index c5dcaf034a..0000000000
--- a/resources/views/components/form/entities.blade.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-use Illuminate\Support\Arr;
-/**
- * We want to pre-load the data from the model, or what has been sent with the form.
- * @var \App\Models\MiscModel $model
- */
-$selectedOption = [];
-$model = Arr::get($options, 'model', null);
-$enableNew = Arr::get($options, 'enableNew', true);
-$label = Arr::get($options, 'label', true);
-// From source to exclude duplicates
-$searchParams = [$campaign];
-if (Arr::has($options, 'exclude', false)) {
-    $searchParams['exclude'] = Arr::get($options, 'exclude');
-} elseif (Arr::has($options, 'exclude-entity', false)) {    
-    $searchParams['exclude-entity'] = Arr::get($options, 'exclude-entity');
-}
-// Try to load what was sent with the form first, in case there was a form validation error
-$previous = old('entities[]');
-if (!empty($previous)) {
-    //dd($previous);
-}
-?>
-@if ($label)
-<label>
-   {{ __('abilities.show.tabs.entities') }}
-</label>
-@endif
-
-<select
-    multiple="multiple"
-    name="entities[]"
-    id="{{ Arr::get($options, 'id', 'entities[]') }}"
-    class="w-full form-tags form-entities"
-    style="width: 100%"
-    data-url="{{ route(Arr::get($options, 'route', 'search.ability-entities'), $searchParams) }}"
-    data-allow-new="{{ $enableNew ? 'true' : 'false' }}"
-    data-allow-clear="{{ Arr::get($options, 'allowClear', 'true') }}"
-    data-new-tag="{{ __('entities.new_entity') }}"
-    data-placeholder="{{ __('entities/relations.placeholders.target') }}"
-    :dropdownParent="$dropdownParent ?? ($ajax ? '#primary-dialog' : null)"
->
-    @foreach ($selectedOption as $key => $entity)
-        <option value="{{ $key }}" class="select2-entity" selected="selected">{{ $entity->name }}</option>
-    @endforeach
-</select>
diff --git a/resources/views/components/forms/foreign.blade.php b/resources/views/components/forms/foreign.blade.php
index d5debc28a9..162ea87728 100644
--- a/resources/views/components/forms/foreign.blade.php
+++ b/resources/views/components/forms/foreign.blade.php
@@ -10,7 +10,10 @@
         <div class="join w-full">
     @endif
 
-    <select name="{{ $name }}" id="{{ $id }}"
+    <select 
+            multiple="$multiple"
+            name="{{ $name }}" 
+            id="{{ $id }}"
             class="w-full select2 join-item"
             style="width: 100%"
             data-url="{{ $route }}"
@@ -19,9 +22,15 @@ class="w-full select2 join-item"
             data-language="{{ LaravelLocalization::getCurrentLocale() }}"
             data-allow-clear="{{ $allowClear ? 'true' : 'false' }}"
             @if (!empty($dropdownParent)) data-dropdown-parent="{{ $dropdownParent }}" @endif
+            :dropdownParent="request()->ajax() ? '#primary-dialog' : null"
+
     >
         @foreach ($options as $key => $value)
-            <option value="{{ $key }}">{!! $value !!}</option>
+            @if ($multiple)
+                <option value="{{ $key }}">{!! $value !!}</option>
+            @else
+                <option value="{{ $key }}" class="select2-entity" selected="selected">{{ $entity->name }}</option>
+            @endif
         @endforeach
     </select>
 

From ed4dd330d945e607708205de6f791a6877fc68e3 Mon Sep 17 00:00:00 2001
From: Spitfire <itza305@gmail.com>
Date: Mon, 4 Dec 2023 15:32:58 -0600
Subject: [PATCH 26/28] Removed leftover code

---
 resources/views/abilities/entities/_form.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/abilities/entities/_form.blade.php b/resources/views/abilities/entities/_form.blade.php
index 83b51d8d2b..30e54e3a17 100644
--- a/resources/views/abilities/entities/_form.blade.php
+++ b/resources/views/abilities/entities/_form.blade.php
@@ -9,7 +9,6 @@
         multiple="multiple"
         name="entities[]"
         id="entities[]"
-        :options="['exclude-entity' => $model->entity->id, 'route' => 'search.ability-entities']" 
         :campaign="$campaign"
         :route="route('search.ability-entities', [$campaign])"
     >

From a1db8c5176b8717262d423339cef3abc97a40d30 Mon Sep 17 00:00:00 2001
From: Spitfire <itza305@gmail.com>
Date: Mon, 4 Dec 2023 16:44:57 -0600
Subject: [PATCH 27/28] Added missing param

---
 resources/views/abilities/entities/_form.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/abilities/entities/_form.blade.php b/resources/views/abilities/entities/_form.blade.php
index 30e54e3a17..d92a61548a 100644
--- a/resources/views/abilities/entities/_form.blade.php
+++ b/resources/views/abilities/entities/_form.blade.php
@@ -10,7 +10,7 @@
         name="entities[]"
         id="entities[]"
         :campaign="$campaign"
-        :route="route('search.ability-entities', [$campaign])"
+        :route="route('search.ability-entities', [$campaign, 'exclude-entity' => $model->entity->id])"
     >
     </x-forms.foreign>
 

From 463e1b4049138092e7d8be8c342ac04c3929ec8e Mon Sep 17 00:00:00 2001
From: ilestis <jay.payne.ch@gmail.com>
Date: Mon, 4 Dec 2023 18:24:22 -0600
Subject: [PATCH 28/28] Fix phpstan

---
 app/Http/Controllers/CrudController.php         | 2 ++
 app/Http/Controllers/Front/HelperController.php | 2 ++
 app/Http/Requests/StoreAbilityEntity.php        | 6 ++----
 app/Models/CampaignDashboardWidget.php          | 3 ++-
 app/Services/Campaign/ExportService.php         | 1 +
 app/Traits/TreeControllerTrait.php              | 1 +
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php
index a2c5a8c1ec..3e7483dd2e 100644
--- a/app/Http/Controllers/CrudController.php
+++ b/app/Http/Controllers/CrudController.php
@@ -13,6 +13,7 @@
 use App\Models\Entity;
 use App\Models\AttributeTemplate;
 use App\Models\Bookmark;
+use App\Models\Family;
 use App\Models\MiscModel;
 use App\Sanitizers\MiscSanitizer;
 use App\Services\MultiEditingService;
@@ -156,6 +157,7 @@ public function crudIndex(Request $request)
         // Do this to avoid an extra sql query when no filters are selected
         if ($this->filterService->hasFilters()) {
             $unfilteredCount = $base->count();
+            // @phpstan-ignore-next-line
             $base = $base->filter($this->filterService->filters());
 
             $models = $base->paginate();
diff --git a/app/Http/Controllers/Front/HelperController.php b/app/Http/Controllers/Front/HelperController.php
index 4cfa2c2cc5..3a7c88c79b 100644
--- a/app/Http/Controllers/Front/HelperController.php
+++ b/app/Http/Controllers/Front/HelperController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Front;
 
+use App\Models\Family;
 use App\Models\MiscModel;
 use Exception;
 use Illuminate\Support\Str;
@@ -29,6 +30,7 @@ public function apiFilters()
             if (!$misc instanceof MiscModel) {
                 abort(404);
             }
+            // @phpstan-ignore-next-line
             $filters = $misc->getFilterableColumns();
 
             return view('helpers.api-filters', compact(
diff --git a/app/Http/Requests/StoreAbilityEntity.php b/app/Http/Requests/StoreAbilityEntity.php
index 7ffebae0dc..6c970e5859 100644
--- a/app/Http/Requests/StoreAbilityEntity.php
+++ b/app/Http/Requests/StoreAbilityEntity.php
@@ -26,10 +26,8 @@ public function rules()
         return [
             'ability_id' => 'required|exists:entities,id',
             'visibility_id' => 'required|exists:visibilities,id',
-            'entities' => 'required',
-            'entities' => [
-                '*' => 'different:ability_id|exists:entities,id',
-            ],
+            'entities' => 'array|required',
+            'entities.*' => ['different:ability_id|exists:entities,id'],
         ];
     }
 }
diff --git a/app/Models/CampaignDashboardWidget.php b/app/Models/CampaignDashboardWidget.php
index 18cebd05dd..3b2fa85cb4 100644
--- a/app/Models/CampaignDashboardWidget.php
+++ b/app/Models/CampaignDashboardWidget.php
@@ -264,7 +264,7 @@ public function entities()
         $entityType = $this->conf('entity');
         if (!empty($entityType) && !empty($this->config['filters'])) {
             $className = 'App\Models\\' . Str::studly($entityType);
-            /** @var MiscModel|Character $model */
+            /** @var Character|mixed $model */
             $model = new $className();
 
             /** @var FilterService $filterService */
@@ -320,6 +320,7 @@ public function randomEntity()
                 ->model($model)
                 ->make($entityType);
 
+            // @phpstan-ignore-next-line
             $models = $model
                 ->select($model->getTable() . '.id')
                 ->filter($filterService->filters())
diff --git a/app/Services/Campaign/ExportService.php b/app/Services/Campaign/ExportService.php
index 30db9fe5e6..7566fb2654 100644
--- a/app/Services/Campaign/ExportService.php
+++ b/app/Services/Campaign/ExportService.php
@@ -211,6 +211,7 @@ protected function smartWith(array $with, string $entityClass): array
     {
         /** @var MiscModel $class */
         $class = app()->make($entityClass);
+        // @phpstan-ignore-next-line
         foreach ($class->exportRelations() as $rel) {
             $with[] = $rel;
         }
diff --git a/app/Traits/TreeControllerTrait.php b/app/Traits/TreeControllerTrait.php
index 18453a6a77..4c5e4917c3 100644
--- a/app/Traits/TreeControllerTrait.php
+++ b/app/Traits/TreeControllerTrait.php
@@ -98,6 +98,7 @@ public function tree(Request $request, Campaign $campaign)
         // Do this to avoid an extra sql query when no filters are selected
         if ($this->filterService->hasFilters()) {
             $unfilteredCount = $base->count();
+            // @phpstan-ignore-next-line
             $base = $base->filter($this->filterService->filters());
 
             $models = $base->paginate();