Merge pull request #2615 from RaiderIO/development

Release v11.7 - Fixed route synchronization, added various raid-wide buff support to SimulationCraft integration, along with many other bugfixes.

.env.docker.example

@@ -70,6 +70,7 @@ REDIS_HOST=redis
 REDIS_PASSWORD=null
 REDIS_PORT=6380
 REDIS_DB=0
+REDIS_PREFIX=keystoneguru-local-cache:
 
 MODEL_CACHE_ENABLED=false
 MODEL_CACHE_STORE=redis_model_cache

.env.example

@@ -70,6 +70,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 REDIS_DB=0
+REDIS_PREFIX=keystoneguru-local-cache:
 
 MODEL_CACHE_ENABLED=true
 MODEL_CACHE_STORE=redis_model_cache

app/Events/Models/Brushline/BrushlineChangedEvent.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Events\Models\Brushline;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\Brushline;
+use App\Models\MapIcon;
+use App\Models\User;
+use App\Service\Coordinates\CoordinatesServiceInterface;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property MapIcon $model
+ */
+class BrushlineChangedEvent extends ModelChangedEvent
+{
+    /**
+     * @param CoordinatesServiceInterface $coordinatesService
+     * @param Model                       $context
+     * @param User                        $user
+     * @param Brushline|Model             $model
+     */
+    public function __construct(
+        private readonly CoordinatesServiceInterface $coordinatesService,
+        Model                                        $context,
+        User                                         $user,
+        protected Brushline|Model                    $model
+    ) {
+        parent::__construct($context, $user, $model);
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'brushline-changed';
+    }
+
+    public function broadcastWith(): array
+    {
+        return array_merge(
+            parent::broadcastWith(), [
+                'model_data' => $this->model->polyline->getCoordinatesData(
+                    $this->coordinatesService,
+                    $this->model->dungeonRoute->mappingVersion,
+                    $this->model->floor
+                ),
+            ]
+        );
+    }
+}

app/Events/Models/Brushline/BrushlineDeletedEvent.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Events\Models\Brushline;
+
+use App\Events\Models\ModelDeletedEvent;
+
+class BrushlineDeletedEvent extends ModelDeletedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'brushline-deleted';
+    }
+}

app/Events/Model/ContextModelEvent.php → app/Events/Models/ContextModelEvent.php

@@ -1,15 +1,14 @@
 <?php
 
-namespace App\Events\Model;
+namespace App\Events\Models;
 
 use App\Events\ContextEvent;
-use App\Models\Interfaces\EventModelInterface;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 abstract class ContextModelEvent extends ContextEvent
 {
-    public function __construct(Model $context, User $user, protected EventModelInterface $model)
+    public function __construct(Model $context, User $user, protected Model $model)
     {
         parent::__construct($context, $user);
     }
@@ -19,7 +18,6 @@ public function broadcastWith(): array
         return array_merge(parent::broadcastWith(), [
             'model'       => $this->model,
             'model_class' => $this->model::class,
-            'model_data'  => $this->model->getEventData(),
         ]);
     }
 }

app/Events/Models/DungeonFloorSwitchMarker/DungeonFloorSwitchMarkerChangedEvent.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Events\Models\DungeonFloorSwitchMarker;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\DungeonFloorSwitchMarker;
+
+/**
+ * @property DungeonFloorSwitchMarker $model
+ */
+class DungeonFloorSwitchMarkerChangedEvent extends ModelChangedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'dungeonfloorswitchmarker-changed';
+    }
+}

app/Events/Models/DungeonFloorSwitchMarker/DungeonFloorSwitchMarkerDeletedEvent.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Events\Models\DungeonFloorSwitchMarker;
+
+use App\Events\Models\ModelDeletedEvent;
+
+class DungeonFloorSwitchMarkerDeletedEvent extends ModelDeletedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'dungeonfloorswitchmarker-deleted';
+    }
+}

app/Events/Models/Enemy/EnemyChangedEvent.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Events\Models\Enemy;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\Enemy;
+use App\Models\User;
+use App\Service\Coordinates\CoordinatesServiceInterface;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property Enemy $model
+ */
+class EnemyChangedEvent extends ModelChangedEvent
+{
+    /**
+     * @param CoordinatesServiceInterface $coordinatesService
+     * @param Model                       $context
+     * @param User                        $user
+     * @param Enemy|Model                 $model
+     */
+    public function __construct(
+        private readonly CoordinatesServiceInterface $coordinatesService,
+        Model                                        $context,
+        User                                         $user,
+        protected Enemy|Model                        $model
+    ) {
+        parent::__construct($context, $user, $model);
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'enemy-changed';
+    }
+
+    public function broadcastWith(): array
+    {
+        return array_merge(
+            parent::broadcastWith(), [
+                'model_data' => $this->model->getCoordinatesData($this->coordinatesService),
+            ]
+        );
+    }
+}

app/Events/Models/Enemy/EnemyDeletedEvent.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Events\Models\Enemy;
+
+use App\Events\Models\ModelDeletedEvent;
+
+class EnemyDeletedEvent extends ModelDeletedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'enemy-deleted';
+    }
+}

app/Events/Models/EnemyPack/EnemyPackChangedEvent.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Events\Models\EnemyPack;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\EnemyPack;
+
+/**
+ * @property EnemyPack $model
+ */
+class EnemyPackChangedEvent extends ModelChangedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'enemypack-changed';
+    }
+}

app/Events/Models/EnemyPack/EnemyPackDeletedEvent.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Events\Models\EnemyPack;
+
+use App\Events\Models\ModelDeletedEvent;
+
+class EnemyPackDeletedEvent extends ModelDeletedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'enemypack-deleted';
+    }
+}

app/Events/Models/EnemyPatrol/EnemyPatrolChangedEvent.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Events\Models\EnemyPatrol;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\EnemyPatrol;
+
+/**
+ * @property EnemyPatrol $model
+ */
+class EnemyPatrolChangedEvent extends ModelChangedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'enemypatrol-changed';
+    }
+}

app/Events/Models/EnemyPatrol/EnemyPatrolDeletedEvent.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Events\Models\EnemyPatrol;
+
+use App\Events\Models\ModelDeletedEvent;
+
+class EnemyPatrolDeletedEvent extends ModelDeletedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'enemypatrol-deleted';
+    }
+}

app/Events/Models/FloorUnion/FloorUnionChangedEvent.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Events\Models\FloorUnion;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\Floor\FloorUnion;
+
+/**
+ * @property FloorUnion $model
+ */
+class FloorUnionChangedEvent extends ModelChangedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'floorunion-changed';
+    }
+}

app/Events/Models/FloorUnion/FloorUnionDeletedEvent.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Events\Models\FloorUnion;
+
+use App\Events\Models\ModelDeletedEvent;
+
+class FloorUnionDeletedEvent extends ModelDeletedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'floorunion-deleted';
+    }
+}

app/Events/Models/FloorUnionArea/FloorUnionAreaChangedEvent.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Events\Models\FloorUnionArea;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\Floor\FloorUnionArea;
+
+/**
+ * @property FloorUnionArea $model
+ */
+class FloorUnionAreaChangedEvent extends ModelChangedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'floorunionarea-changed';
+    }
+}

app/Events/Models/FloorUnionArea/FloorUnionAreaDeletedEvent.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Events\Models\FloorUnionArea;
+
+use App\Events\Models\ModelDeletedEvent;
+
+class FloorUnionAreaDeletedEvent extends ModelDeletedEvent
+{
+    public function broadcastAs(): string
+    {
+        return 'floorunionarea-deleted';
+    }
+}

app/Events/Models/KillZone/KillZoneChangedEvent.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Events\Models\KillZone;
+
+use App\Events\Models\ModelChangedEvent;
+use App\Models\KillZone\KillZone;
+use App\Models\User;
+use App\Service\Coordinates\CoordinatesServiceInterface;
+use Illuminate\Database\Eloquent\Model;
+
+class KillZoneChangedEvent extends ModelChangedEvent
+{
+    /**
+     * @param CoordinatesServiceInterface $coordinatesService
+     * @param Model                       $context
+     * @param User                        $user
+     * @param KillZone|Model              $model
+     */
+    public function __construct(
+        private readonly CoordinatesServiceInterface $coordinatesService,
+        Model                                        $context,
+        User                                         $user,
+        protected KillZone|Model                     $model
+    ) {
+        parent::__construct($context, $user, $model);
+    }
+
+
+    public function broadcastAs(): string
+    {
+        return 'killzone-changed';
+    }
+
+    public function broadcastWith(): array
+    {
+        $parentResult = parent::broadcastWith();
+        if ($this->model->floor_id === null) {
+            return $parentResult;
+        }
+
+        return array_merge(
+            $parentResult, [
+                'model_data' => $this->model->getCoordinatesData($this->coordinatesService),
+            ]
+        );
+    }
+}