Code Cleanup

owlchester · Jul 7, 2024 · fcba7d6 · fcba7d6
1 parent 6c1eb35
commit fcba7d6
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 14 deletions.
diff --git a/app/Models/Ability.php b/app/Models/Ability.php
@@ -32,8 +32,8 @@
 class Ability extends MiscModel
 {
     use Acl;
-    use HasCampaign;
     use ExportableTrait;
+    use HasCampaign;
     use HasEntry;
     use HasFactory;
     use HasFilters;

diff --git a/app/Models/Character.php b/app/Models/Character.php
@@ -43,8 +43,8 @@
 class Character extends MiscModel
 {
     use Acl;
-    use HasCampaign;
     use ExportableTrait;
+    use HasCampaign;
     use HasEntry;
     use HasFactory;
     use HasFilters;

diff --git a/app/Models/Creature.php b/app/Models/Creature.php
@@ -31,8 +31,8 @@
 class Creature extends MiscModel
 {
     use Acl;
-    use HasCampaign;
     use ExportableTrait;
+    use HasCampaign;
     use HasEntry;
     use HasFactory;
     use HasFilters;

diff --git a/app/Models/Entity.php b/app/Models/Entity.php
@@ -60,13 +60,13 @@ class Entity extends Model
 {
     use Acl;
     use Blameable;
-    use HasCampaign;
     use EntityLogs;
     use EntityRelations;
     use EntityScopes;
     use EntityType;
-    use HasTooltip;
+    use HasCampaign;
     use HasMentions;
+    use HasTooltip;
     use LastSync;
     use Paginatable;
     use Searchable;

diff --git a/app/Models/Image.php b/app/Models/Image.php
@@ -56,8 +56,8 @@
  */
 class Image extends Model
 {
-    use HasCampaign;
     use ExportableTrait;
+    use HasCampaign;
     use HasFactory;
     use LastSync;
     use VisibilityIDTrait;

diff --git a/app/Models/Location.php b/app/Models/Location.php
@@ -39,8 +39,8 @@ class Location extends MiscModel
     use Acl;
     use ExportableTrait;
     use HasCampaign;
-    use HasFactory;
     use HasEntry;
+    use HasFactory;
     use HasFilters;
     use HasRecursiveRelationships;
     use SoftDeletes;

diff --git a/app/Models/MapMarker.php b/app/Models/MapMarker.php
@@ -46,10 +46,10 @@
 class MapMarker extends Model
 {
     use Blameable;
+    use Copiable;
     use HasFactory;
     use Paginatable;
     use SortableTrait;
-    use Copiable;
     use VisibilityIDTrait;
 
     public const SHAPE_MARKER = 1;

diff --git a/app/Models/MiscModel.php b/app/Models/MiscModel.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Facades\CampaignLocalization;
-use App\Facades\Mentions;
 use App\Models\Concerns\LastSync;
 use App\Models\Concerns\Orderable;
 use App\Models\Concerns\Paginatable;
@@ -43,13 +42,13 @@
  */
 abstract class MiscModel extends Model
 {
+    use Copiable;
     use LastSync;
     use Orderable;
     use Paginatable;
     use Scout;
     use Searchable;
     use Sortable;
-    use Copiable;
     use SubEntityScopes;
 
     /** Entity type (character, location) */

diff --git a/app/Models/Note.php b/app/Models/Note.php
@@ -24,8 +24,8 @@
 class Note extends MiscModel
 {
     use Acl;
-    use HasCampaign;
     use ExportableTrait;
+    use HasCampaign;
     use HasEntry;
     use HasFactory;
     use HasFilters;

diff --git a/app/Models/QuestElement.php b/app/Models/QuestElement.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Facades\Mentions;
 use App\Models\Concerns\HasEntry;
 use App\User;
 use App\Models\Concerns\Blameable;

diff --git a/app/Observers/PostObserver.php b/app/Observers/PostObserver.php
@@ -2,7 +2,6 @@
 
 namespace App\Observers;
 
-use App\Facades\Mentions;
 use App\Models\PostPermission;
 use App\Models\Post;
 use App\Services\Entity\PostLoggerService;

diff --git a/app/Traits/GuestAuthTrait.php b/app/Traits/GuestAuthTrait.php
@@ -5,7 +5,6 @@
 use App\Facades\CampaignLocalization;
 use App\Facades\EntityPermission;
 use App\Models\CampaignPermission;
-use App\Models\Character;
 use App\Models\Entity;
 use App\Models\MiscModel;