Merge branch 'develop' into tooltip-mentions

Author: ilestis

.github/workflows/cs-pint.yml

@@ -0,0 +1,31 @@
+name: Fix Code Style
+
+on: [push]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.4]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: json, dom, curl, libxml, mbstring
+          coverage: none
+
+      - name: Install Pint
+        run: composer global require laravel/pint
+
+      - name: Run Pint
+        run: pint
+
+      - name: Commit linted files
+        uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/lint.yml

@@ -1,49 +1,49 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Campaigns;
 
+use App\Facades\CampaignCache;
+use App\Facades\CampaignLocalization;
+use App\Facades\CharacterCache;
+use App\Facades\EntityCache;
+use App\Facades\QuestCache;
 use App\Models\Ability;
 use App\Models\Attribute;
-use App\Models\Location;
-use App\Models\Family;
-use App\Models\Note;
-use App\Models\Character;
 use App\Models\Calendar;
-use App\Models\Organisation;
+use App\Models\Campaign;
+use App\Models\Character;
+use App\Models\EntityAbility;
 use App\Models\Event;
+use App\Models\Family;
 use App\Models\Item;
-use App\Models\Tag;
+use App\Models\Journal;
+use App\Models\Location;
+use App\Models\Note;
+use App\Models\Organisation;
 use App\Models\Quest;
 use App\Models\QuestElement;
-use App\Models\Relation;
-use App\Models\Journal;
 use App\Models\Race;
-use App\Models\Campaign;
+use App\Models\Relation;
+use App\Models\Tag;
 use App\Observers\AbilityObserver;
-use App\Observers\QuestObserver;
-use App\Observers\LocationObserver;
+use App\Observers\CalendarObserver;
 use App\Observers\CharacterObserver;
-use App\Observers\FamilyObserver;
-use App\Observers\OrganisationObserver;
+use App\Observers\EntityAbilityObserver;
 use App\Observers\EventObserver;
+use App\Observers\FamilyObserver;
 use App\Observers\ItemObserver;
-use App\Observers\TagObserver;
-use App\Observers\RaceObserver;
+use App\Observers\JournalObserver;
+use App\Observers\LocationObserver;
 use App\Observers\NoteObserver;
+use App\Observers\OrganisationObserver;
 use App\Observers\QuestElementObserver;
-use App\Observers\EntityAbilityObserver;
-use App\Observers\JournalObserver;
-use App\Observers\CalendarObserver;
+use App\Observers\QuestObserver;
+use App\Observers\RaceObserver;
 use App\Observers\RelationObserver;
-use App\Facades\CampaignLocalization;
-use App\Models\EntityAbility;
-use App\Facades\CampaignCache;
-use App\Facades\CharacterCache;
-use App\Facades\EntityCache;
-use App\Facades\QuestCache;
+use App\Observers\TagObserver;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Factories\Sequence;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Factories\Sequence;
 
 class DummyEntities extends Command
 {
@@ -52,7 +52,7 @@ class DummyEntities extends Command
      *
      * @var string
      */
-    protected $signature = 'campaign:populate {campaign}';
+    protected $signature = 'campaigns:populate {campaign}';
 
     /**
      * The console command description.
@@ -88,7 +88,7 @@ public function handle()
 
         $this->loadObservers($campaign);
 
-        //Generate Characters Abilities and Locations
+        // Generate Characters Abilities and Locations
         $firstLocation = Location::factory()
             ->state(['name' => 'Thaelia', 'campaign_id' => $campaign->id])
             ->has(
@@ -121,7 +121,7 @@ public function handle()
             ->create();
         $thirdLocation = Location::factory()->state(['campaign_id' => $campaign->id, 'name' => 'Middle Earth'])->create();
 
-        //Generate Characters
+        // Generate Characters
         $firstCharacter = Character::factory()->state(['campaign_id' => $campaign->id, 'name' => 'Biblo Swaggins'])->create();
         $secondCharacter = Character::factory()->state(['campaign_id' => $campaign->id])->create();
         $thirdCharacter = Character::factory()->state(['campaign_id' => $campaign->id])->create();
@@ -142,21 +142,21 @@ public function handle()
         )
             ->create();
 
-        //Generate Families
+        // Generate Families
         Family::factory()
             ->state(['name' => 'Graff', 'campaign_id' => $campaign->id])
             ->has(Family::factory()->state(['name' => 'Market', 'campaign_id' => $campaign->id]))
             ->create();
         Family::factory()->state(['name' => 'Joren', 'campaign_id' => $campaign->id])->create();
 
-        //Generate Organisations
+        // Generate Organisations
         Organisation::factory()
             ->state(['name' => 'Kankappy Cult', 'campaign_id' => $campaign->id])
             ->has(Organisation::factory()->state(['name' => 'Fun Police', 'campaign_id' => $campaign->id]))
             ->create();
         Organisation::factory()->state(['name' => 'Great Reset', 'campaign_id' => $campaign->id])->create();
 
-        //Generate Events
+        // Generate Events
         Event::factory()->count(4)->state(
             new Sequence(
                 ['name' => 'The Great War', 'campaign_id' => $campaign->id],
@@ -167,7 +167,7 @@ public function handle()
         )
             ->create();
 
-        //Generate Items
+        // Generate Items
         Item::factory()->count(5)->state(
             new Sequence(
                 ['name' => 'Bow', 'campaign_id' => $campaign->id],
@@ -179,7 +179,7 @@ public function handle()
         )
             ->create();
 
-        //Generate Notes
+        // Generate Notes
         Note::factory()->count(3)->state(
             new Sequence(
                 ['name' => 'Aromas of Geneva', 'campaign_id' => $campaign->id],
@@ -189,7 +189,7 @@ public function handle()
         )
             ->create();
 
-        //Generate Races
+        // Generate Races
         Race::factory()
             ->state(['name' => 'Elf', 'campaign_id' => $campaign->id])
             ->has(Race::factory()
@@ -207,7 +207,7 @@ public function handle()
         )
             ->create();
 
-        //Generate Tags
+        // Generate Tags
         Tag::factory()->count(3)->state(
             new Sequence(
                 ['name' => '🧛🏻‍♂️', 'colour' => 'maroon', 'campaign_id' => $campaign->id],
@@ -217,7 +217,7 @@ public function handle()
         )
             ->create();
 
-        //Generate Quests
+        // Generate Quests
         $itemFirstQuest = Item::factory()->state(['campaign_id' => $campaign->id])->create();
         Quest::factory()->state(['name' => 'Salary Negotiations', 'campaign_id' => $campaign->id])
             ->has(QuestElement::factory()->state(['name' => 'Main Character', 'entity_id' => $firstCharacter->entity->id, 'created_by' => $campaign->created_by]), 'elements')
@@ -227,7 +227,7 @@ public function handle()
         Quest::factory()->state(['name' => 'Fixin Bugs', 'campaign_id' => $campaign->id])
             ->create();
 
-        //Generate Journals
+        // Generate Journals
         Journal::factory()->count(2)->state(
             new Sequence(
                 ['name' => 'Bilbo\'s journey to middle earth', 'campaign_id' => $campaign->id, 'author_id' => $firstCharacter->entity->id],
@@ -236,25 +236,25 @@ public function handle()
         )
             ->create();
 
-        //Generate Calendars
+        // Generate Calendars
         Calendar::factory()->state([
             'name' => 'Gregorian', 'campaign_id' => $campaign->id,
-            'months' => "[{\"name\":\"January\",\"length\":31,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"February\",\"length\":28,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"March\",\"length\":31,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"April\",\"length\":30,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"Mai\",\"length\":31,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"June\",\"length\":30,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"July\",\"length\":31,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"August\",\"length\":31,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"September\",\"length\":30,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"October\",\"length\":31,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"November\",\"length\":30,\"type\":\"standard\",\"alias\":\"\"},{\"name\":\"December\",\"length\":31,\"type\":\"standard\",\"alias\":\"\"}]",
-            'weekdays' => "[\"Monday\",\"Tuesday\",\"Wednesday\",\"Thursday\",\"Friday\",\"Saturday\",\"Sunday\"]",
-            'seasons' => "[{\"name\":\"Spring\",\"month\":3,\"day\":21},{\"name\":\"Summer\",\"month\":6,\"day\":21},{\"name\":\"Autumn\",\"month\":9,\"day\":21},{\"name\":\"Winter\",\"month\":12,\"day\":21}]",
-            'suffix' => "AD",
+            'months' => '[{"name":"January","length":31,"type":"standard","alias":""},{"name":"February","length":28,"type":"standard","alias":""},{"name":"March","length":31,"type":"standard","alias":""},{"name":"April","length":30,"type":"standard","alias":""},{"name":"Mai","length":31,"type":"standard","alias":""},{"name":"June","length":30,"type":"standard","alias":""},{"name":"July","length":31,"type":"standard","alias":""},{"name":"August","length":31,"type":"standard","alias":""},{"name":"September","length":30,"type":"standard","alias":""},{"name":"October","length":31,"type":"standard","alias":""},{"name":"November","length":30,"type":"standard","alias":""},{"name":"December","length":31,"type":"standard","alias":""}]',
+            'weekdays' => '["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"]',
+            'seasons' => '[{"name":"Spring","month":3,"day":21},{"name":"Summer","month":6,"day":21},{"name":"Autumn","month":9,"day":21},{"name":"Winter","month":12,"day":21}]',
+            'suffix' => 'AD',
             'has_leap_year' => 1,
             'leap_year_amount' => 1,
             'leap_year_month' => 2,
             'leap_year_offset' => 4,
             'leap_year_start' => 4,
             'start_offset' => 5,
             'is_incrementing' => 1,
-            'date' => Carbon::now()->toDateString()
+            'date' => Carbon::now()->toDateString(),
         ])
             ->create();
 
-        //Generate Relations
+        // Generate Relations
         $firstRelation = Relation::factory()->state(['relation' => 'Best Friend', 'campaign_id' => $campaign->id, 'owner_id' => $secondCharacter->entity->id, 'target_id' => $thirdCharacter->entity->id])->create();
         Relation::factory()->state(['relation' => 'Mortal Enemy', 'campaign_id' => $campaign->id, 'owner_id' => $thirdCharacter->entity->id, 'target_id' => $secondCharacter->entity->id])->for($firstRelation, 'mirror')->create();
 

app/Console/Commands/DummyEntities.php app/Console/Commands/Campaigns/DummyEntities.php

@@ -3,8 +3,8 @@
 namespace App\Console\Commands\Campaigns;
 
 use App\Models\Campaign;
-use App\Services\Campaign\ExportService;
 use App\Models\User;
+use App\Services\Campaign\ExportService;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 

app/Console/Commands/Campaigns/ExportCommand.php

@@ -52,11 +52,10 @@ public function handle()
         });
 
         $this->info('Updated ' . $this->count . ' campaign followers.');
+
         return 0;
     }
 
-    /**
-     */
     protected function processCampaign(Campaign $campaign): void
     {
         $campaign->follower = $campaign->followers->count();

app/Console/Commands/Campaigns/FollowerCountCommand.php

@@ -34,8 +34,9 @@ public function handle()
 
         $job = CampaignImport::where('campaign_id', $campaign->id)->orderBy('created_at', 'DESC')->
         where('status_id', '<>', 1)->first();
-        if (!$job) {
+        if (! $job) {
             $this->info('No job for campaign ' . $campaign->id);
+
             return;
         }
 

app/Console/Commands/Campaigns/ImportCommand.php

@@ -43,7 +43,6 @@ public function __construct()
 
     /**
      * Execute the console command.
-     *
      */
     public function handle(): void
     {
@@ -53,7 +52,7 @@ public function handle(): void
                 $this->count++;
                 $count = $this->campaignCount($campaign);
 
-                //$this->info('Campaign ' . $campaign->id . ' has ' . $count . ' public entities.');
+                // $this->info('Campaign ' . $campaign->id . ' has ' . $count . ' public entities.');
 
                 $campaign->visible_entity_count = $count;
                 $campaign->saveQuietly();
@@ -80,15 +79,14 @@ protected function campaignCount(Campaign $campaign): int
         /** @var CampaignPermission $permission */
         foreach ($public->permissions as $permission) {
             if ($permission->isAction(Permission::View->value)) {
-                if (!empty($permission->entity_id)) {
+                if (! empty($permission->entity_id)) {
                     $ids[] = $permission->entity_id;
                 } else {
                     $types[] = $permission->entity_type_id;
                 }
             }
         }
 
-
         // Now that we have the types and ids, we can count the number of visible entities in this campaign
         return Entity::where(['campaign_id' => $campaign->id])
             ->where('is_private', false)

app/Console/Commands/Campaigns/VisibileEntityCountCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Cleanup;
 
+use App\Services\Users\UserLogService;
 use App\Traits\HasJobLog;
 use Illuminate\Console\Command;
-use App\Services\Users\UserLogService;
 
 class AnonymiseUserLogs extends Command
 {
@@ -26,7 +26,6 @@ class AnonymiseUserLogs extends Command
 
     protected UserLogService $service;
 
-
     /**
      * Create a new command instance.
      *
@@ -45,9 +44,10 @@ public function handle()
     {
         $this->service->deleteOldLogs();
 
-        $log = "Cleaned up user logs PII.";
+        $log = 'Cleaned up user logs PII.';
         $this->info($log);
         $this->log($log);
+
         return 0;
     }
 }

app/Console/Commands/AnonymiseUserLogs.php app/Console/Commands/Cleanup/AnonymiseUserLogs.php

@@ -41,7 +41,6 @@ public function __construct()
 
     /**
      * Execute the console command.
-     *
      */
     public function handle()
     {