Merge pull request #2699 from RaiderIO/development

Release v11.9.7 - Even more heatmap changes
RaiderIO · Jan 31, 2025 · 59476eb · 59476eb
2 parents 8994a86 + cc66beb
commit 59476eb
Show file tree

Hide file tree

Showing 21 changed files with 187 additions and 39 deletions.
diff --git a/app/Http/Controllers/Dungeon/DungeonExploreController.php b/app/Http/Controllers/Dungeon/DungeonExploreController.php
@@ -182,6 +182,7 @@ public function embed(
         $mapBackgroundColor    = $request->get('mapBackgroundColor');
         $showEnemyInfo         = $request->get('showEnemyInfo', false);
         $showTitle             = $request->get('showTitle', true);
+        $defaultZoom           = $request->get('defaultZoom', 1);
 
         $parameters = [
             'type'             => $request->get('type'),
@@ -217,6 +218,7 @@ public function embed(
                 $seasonService->getWeeklyAffixGroupsSinceStart($mostRecentSeason, GameServerRegion::getUserOrDefaultRegion()) :
                 collect(),
             'parameters'              => $parameters,
+            'defaultZoom'             => $defaultZoom,
             'embedOptions'            => [
                 'style'                 => $style,
                 'headerBackgroundColor' => $headerBackgroundColor,

diff --git a/app/Http/Requests/Heatmap/ExploreEmbedUrlFormRequest.php b/app/Http/Requests/Heatmap/ExploreEmbedUrlFormRequest.php
@@ -29,6 +29,7 @@ public function rules(): array
             'mapBackgroundColor'    => ['nullable', 'regex:/^#([a-f0-9]{6}|[a-f0-9]{3})$/i'],
             'showEnemyInfo'         => 'nullable|bool',
             'showTitle'             => 'nullable|bool',
+            'defaultZoom'           => 'nullable|numeric',
         ]);
     }
 }
diff --git a/app/Http/Requests/Heatmap/ExploreUrlFormRequest.php b/app/Http/Requests/Heatmap/ExploreUrlFormRequest.php
@@ -5,6 +5,7 @@
 use App\Http\Requests\DungeonRoute\DungeonRouteBaseUrlFormRequest;
 use App\Models\CombatLog\CombatLogEventDataType;
 use App\Models\CombatLog\CombatLogEventEventType;
+use App\Models\GameServerRegion;
 use Illuminate\Validation\Rule;
 
 /**
@@ -28,6 +29,7 @@ public function rules(): array
         return array_merge(parent::rules(), [
             'type'             => ['nullable', Rule::in(CombatLogEventEventType::cases())],
             'dataType'         => ['nullable', Rule::in(CombatLogEventDataType::cases())],
+            'region'           => ['nullable', Rule::exists(GameServerRegion::class, 'short')],
             'minMythicLevel'   => ['nullable', 'integer'],
             'maxMythicLevel'   => ['nullable', 'integer'],
             'minItemLevel'     => ['nullable', 'integer'],

diff --git a/app/Models/GameServerRegion.php b/app/Models/GameServerRegion.php
@@ -46,6 +46,7 @@ class GameServerRegion extends CacheModel
     public const CHINA    = 'cn';
     public const TAIWAN   = 'tw';
     public const KOREA    = 'kr';
+    public const WORLD    = 'world';
 
     public const DEFAULT_REGION = GameServerRegion::AMERICAS;
 
@@ -55,6 +56,7 @@ class GameServerRegion extends CacheModel
         self::CHINA    => 3,
         self::TAIWAN   => 4,
         self::KOREA    => 5,
+        self::WORLD    => 6,
     ];
 
     protected $fillable = ['short', 'name', 'epoch_start', 'timezone', 'reset_day_offset', 'reset_hours_offset'];

diff --git a/app/Providers/KeystoneGuruServiceProvider.php b/app/Providers/KeystoneGuruServiceProvider.php
@@ -501,6 +501,7 @@ static function (View $view) use ($globalViewVariables) {
             $view->with('featuredAffixesByActiveExpansion', $regionViewVariables['featuredAffixesByActiveExpansion']);
 
             $view->with('characterClassSpecializations', $globalViewVariables['characterClassSpecializations']);
+            $view->with('allRegions', $globalViewVariables['allRegions']);
         });
         view()->composer('common.maps.controls.pulls', static function (View $view) {
             $view->with('showAllEnabled', $_COOKIE['dungeon_speedrun_required_npcs_show_all'] ?? '0');

diff --git a/app/Service/CombatLogEvent/Dtos/CombatLogEventFilter.php b/app/Service/CombatLogEvent/Dtos/CombatLogEventFilter.php
@@ -25,12 +25,13 @@
  */
 class CombatLogEventFilter implements Arrayable
 {
-    private ?int $keyLevelMin     = null;
-    private ?int $keyLevelMax     = null;
-    private ?int $itemLevelMin    = null;
-    private ?int $itemLevelMax    = null;
-    private ?int $playerDeathsMin = null;
-    private ?int $playerDeathsMax = null;
+    private ?string $region          = null;
+    private ?int    $keyLevelMin     = null;
+    private ?int    $keyLevelMax     = null;
+    private ?int    $itemLevelMin    = null;
+    private ?int    $itemLevelMax    = null;
+    private ?int    $playerDeathsMin = null;
+    private ?int    $playerDeathsMax = null;
 
     /** @var Collection<Affix> */
     private Collection $affixes;
@@ -67,6 +68,18 @@ public function getDataType(): CombatLogEventDataType
         return $this->dataType;
     }
 
+    public function getRegion(): ?string
+    {
+        return $this->region;
+    }
+
+    public function setRegion(?string $region): CombatLogEventFilter
+    {
+        $this->region = $region;
+
+        return $this;
+    }
+
     public function getKeyLevelMin(): ?int
     {
         return $this->keyLevelMin;
@@ -227,6 +240,7 @@ public function toArray(): array
             'challenge_mode_id' => $this->dungeon->challenge_mode_id,
             'event_type'        => $this->eventType->value,
             'data_type'         => $this->dataType,
+            'region'            => $this->region,
             'key_level_min'     => $this->keyLevelMin,
             'key_level_max'     => $this->keyLevelMax,
             'item_level_min'    => $this->itemLevelMin,
@@ -252,6 +266,17 @@ public function toOpensearchQuery(array $must = []): array
 
         $must[] = MatchOne::make('challenge_mode_id', $dungeon->challenge_mode_id);
         $must[] = MatchOne::make('event_type', $this->eventType->value);
+        // These are raider.io region IDs
+        if ($this->region !== GameServerRegion::WORLD) {
+            $must[] = MatchOne::make('region_id', match ($this->region) {
+                GameServerRegion::EUROPE => 3,
+                GameServerRegion::AMERICAS => 2,
+                GameServerRegion::CHINA => 6,
+                GameServerRegion::KOREA => 4,
+                GameServerRegion::TAIWAN => 5,
+                default => 2, // US
+            });
+        }
 
 //        /** @var Floor $firstFloor */
 //        $firstFloor = $dungeon->floors->first();
@@ -367,6 +392,7 @@ public static function fromHeatmapDataFilter(SeasonServiceInterface $seasonServi
             $heatmapDataFilter->getDataType()
         );
 
+        $combatLogEventFilter->setRegion($heatmapDataFilter->getRegion());
         $combatLogEventFilter->setKeyLevelMin($heatmapDataFilter->getKeyLevelMin());
         $combatLogEventFilter->setKeyLevelMax($heatmapDataFilter->getKeyLevelMax());
         $combatLogEventFilter->setItemLevelMin($heatmapDataFilter->getItemLevelMin());

diff --git a/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php b/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php
@@ -18,12 +18,13 @@
  */
 class HeatmapDataFilter implements Arrayable
 {
-    private ?int $keyLevelMin     = null;
-    private ?int $keyLevelMax     = null;
-    private ?int $itemLevelMin    = null;
-    private ?int $itemLevelMax    = null;
-    private ?int $playerDeathsMin = null;
-    private ?int $playerDeathsMax = null;
+    private ?string $region          = null;
+    private ?int    $keyLevelMin     = null;
+    private ?int    $keyLevelMax     = null;
+    private ?int    $itemLevelMin    = null;
+    private ?int    $itemLevelMax    = null;
+    private ?int    $playerDeathsMin = null;
+    private ?int    $playerDeathsMax = null;
     /** @var Collection<Affix> */
     private Collection $includeAffixIds;
     /** @var Collection<CharacterClassSpecialization> */
@@ -57,6 +58,18 @@ public function getDataType(): CombatLogEventDataType
         return $this->dataType;
     }
 
+    public function getRegion(): ?string
+    {
+        return $this->region;
+    }
+
+    public function setRegion(?string $region): HeatmapDataFilter
+    {
+        $this->region = $region;
+
+        return $this;
+    }
+
     public function getKeyLevelMin(): ?int
     {
         return $this->keyLevelMin;
@@ -225,6 +238,9 @@ public function toArray(Season $mostRecentSeason = null): array
             'dataType'        => $this->getDataType()->value,
         ];
 
+        if ($this->getRegion() !== GameServerRegion::WORLD) {
+            $result['regionId'] = $this->getRegion();
+        }
         $result['minMythicLevel']   = $this->getKeyLevelMin();
         $result['maxMythicLevel']   = $this->getKeyLevelMax();
         $result['minItemLevel']     = $this->getItemLevelMin();
@@ -263,6 +279,7 @@ public static function fromArray(array $requestArray): HeatmapDataFilter
             dataType: CombatLogEventDataType::from($requestArray['dataType'] ?? CombatLogEventDataType::PlayerPosition->value)
         );
 
+        $heatmapDataFilter->setRegion($requestArray['region'] ?? null);
         $heatmapDataFilter->setKeyLevelMin(isset($requestArray['minMythicLevel']) ? (int)$requestArray['minMythicLevel'] : null);
         $heatmapDataFilter->setKeyLevelMax(isset($requestArray['maxMythicLevel']) ? (int)$requestArray['maxMythicLevel'] : null);
         $heatmapDataFilter->setItemLevelMin(isset($requestArray['minItemLevel']) ? (int)$requestArray['minItemLevel'] : null);

diff --git a/database/seeders/GameServerRegionsSeeder.php b/database/seeders/GameServerRegionsSeeder.php
@@ -57,6 +57,15 @@ public function run(): void
                 'reset_day_offset'   => 2,
                 'reset_hours_offset' => 23,
             ],
+            // https://www.reddit.com/r/wow/comments/9sbujc/korean_wow_user_back_brought_some_korean_wow/e8ntkck/?context=3
+            [
+                'short'              => GameServerRegion::WORLD,
+                'name'               => 'gameserverregions.world',
+                'epoch_start'        => '2005-12-28 23:00:00',
+                'timezone'           => 'Europe/London',
+                'reset_day_offset'   => 2,
+                'reset_hours_offset' => 7,
+            ],
         ];
 
         GameServerRegion::from(DatabaseSeeder::getTempTableName(GameServerRegion::class))->insert($gameServerRegionAttributes);

diff --git a/database/seeders/releases/v11.9.7.json b/database/seeders/releases/v11.9.7.json
@@ -0,0 +1,31 @@
+{
+    "id": 273,
+    "release_changelog_id": 280,
+    "version": "v11.9.7",
+    "title": "Even more heatmap changes",
+    "backup_db": 1,
+    "silent": 1,
+    "spotlight": 0,
+    "released": 0,
+    "created_at": "2025-01-31T15:55:25+00:00",
+    "updated_at": "2025-01-31T15:55:25+00:00",
+    "changelog": {
+        "id": 280,
+        "release_id": 273,
+        "description": null,
+        "changes": [
+            {
+                "release_changelog_id": 280,
+                "release_changelog_category_id": 13,
+                "ticket_id": 2697,
+                "change": "You can now pass a defaultZoom to the explore embeds."
+            },
+            {
+                "release_changelog_id": 280,
+                "release_changelog_category_id": 13,
+                "ticket_id": 2660,
+                "change": "Specialization filters now once again support multiple specs at once"
+            }
+        ]
+    }
+}
diff --git a/lang/en_US/gameserverregions.php b/lang/en_US/gameserverregions.php
@@ -1,11 +1,10 @@
 <?php
 
 return [
-
-    'us' => 'Americas',
-    'eu' => 'Europe',
-    'cn' => 'China',
-    'tw' => 'Taiwan',
-    'kr' => 'Korea',
-
+    'us'    => 'Americas',
+    'eu'    => 'Europe',
+    'cn'    => 'China',
+    'tw'    => 'Taiwan',
+    'kr'    => 'Korea',
+    'world' => 'World',
 ];
diff --git a/lang/en_US/js.php b/lang/en_US/js.php
@@ -454,6 +454,7 @@
     'filter_input_user_header'                                             => 'User: :value',
     'filter_input_event_type_header'                                       => 'Event type: :value',
     'filter_input_data_type_header'                                        => 'Data type: :value',
+    'filter_input_region_header'                                           => 'Region: :value',
     'filter_input_date_header'                                             => 'Date: :value',
     'filter_input_date_from_header'                                        => 'From date: :value',
     'filter_input_date_to_header'                                          => 'To date: :value',

diff --git a/resources/assets/css/map.css b/resources/assets/css/map.css
@@ -1329,3 +1329,8 @@ html, body, #map, #app, .wrapper {
     width: 16px;
     height: 16px;
 }
+
+.filter_region_icon {
+    width: 24px;
+    height: 16px;
+}
diff --git a/resources/assets/images/flags/world.png b/resources/assets/images/flags/world.png
diff --git a/resources/assets/js/custom/inline/common/dungeonroute/handlers/itemlevelhandler.js b/resources/assets/js/custom/inline/common/dungeonroute/handlers/itemlevelhandler.js
@@ -1,7 +1,10 @@
 class ItemLevelHandler {
-    constructor(min, max) {
-        this.min = min;
-        this.max = max;
+    constructor(from, to) {
+        this.min = 400;
+        this.max = 999;
+
+        this.from = from;
+        this.to = to;
 
         this.rangeSlider = null;
     }
@@ -13,8 +16,8 @@ class ItemLevelHandler {
             type: 'double',
             min: this.min,
             max: this.max,
-            from: this.min,
-            to: this.max,
+            from: this.from,
+            to: this.to,
         }, options)).data('ionRangeSlider');
     }
 
@@ -25,8 +28,8 @@ class ItemLevelHandler {
         this.rangeSlider.update({
             min: this.min,
             max: this.max,
-            from: this.min,
-            to: this.max,
+            from: this.from,
+            to: this.to,
         });
     }
 }
diff --git a/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js b/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js
@@ -25,6 +25,8 @@
  * @property {String} filterEventTypeSelector
  * @property {String} filterDataTypeContainerSelector
  * @property {String} filterDataTypeSelector
+ * @property {String} filterRegionContainerSelector
+ * @property {String} filterRegionSelector
  * @property {String} filterKeyLevelSelector
  * @property {String} filterItemLevelSelector
  * @property {String} filterPlayerDeathsSelector
@@ -51,8 +53,6 @@
  * @property {String} edit
  *
  * @property {String[]} filterCollapseNames
- *
- *
  */
 
 /**
@@ -85,6 +85,7 @@ class CommonMapsHeatmapsearchsidebar extends SearchInlineBase {
                 self._search();
             }),
             'dataType': new SearchFilterRadioDataType(this.options.filterDataTypeContainerSelector, this.options.filterDataTypeSelector, this._search.bind(this)),
+            'region': new SearchFilterRadioRegion(this.options.filterRegionContainerSelector, this.options.filterRegionSelector, this._search.bind(this)),
             'keyLevel': new SearchFilterKeyLevel(this.options.filterKeyLevelSelector, this._search.bind(this), this.options.keyLevelMin, this.options.keyLevelMax),
             'itemLevel': new SearchFilterItemLevel(this.options.filterItemLevelSelector, this._search.bind(this), this.options.itemLevelMin, this.options.itemLevelMax),
             'playerDeaths': new SearchFilterPlayerDeaths(this.options.filterPlayerDeathsSelector, this._search.bind(this), this.options.playerDeathsMin, this.options.playerDeathsMax),

diff --git a/resources/assets/js/custom/inline/common/search/filters/filterradioregion.js b/resources/assets/js/custom/inline/common/search/filters/filterradioregion.js
@@ -0,0 +1,6 @@
+class SearchFilterRadioRegion extends SearchFilterRadio {
+    getFilterHeaderText() {
+        return lang.get('messages.filter_input_region_header')
+            .replace(':value', lang.get(`gameserverregions.${this.getValue()}`));
+    }
+}
diff --git a/resources/assets/js/custom/inline/common/search/filters/filterselect.js b/resources/assets/js/custom/inline/common/search/filters/filterselect.js
@@ -0,0 +1,19 @@
+class SearchFilterSelect extends SearchFilter {
+    /**
+     *
+     * @returns {Array}
+     */
+    getValue() {
+        return $(`${this.selector}`).val();
+    }
+
+    /**
+     *
+     * @param value {string}
+     */
+    setValue(value) {
+        let split = value.split(',');
+
+        $(`${this.selector}`).val(split);
+    }
+}
diff --git a/...rch/filters/filterinputspecializations.js → ...ch/filters/filterselectspecializations.js b/...rch/filters/filterinputspecializations.js → ...ch/filters/filterselectspecializations.js
@@ -1,4 +1,4 @@
-class SearchFilterSpecializations extends SearchFilterInput {
+class SearchFilterSpecializations extends SearchFilterSelect {
     constructor(selector, onChange) {
         super(selector, onChange);
     }
@@ -16,10 +16,6 @@ class SearchFilterSpecializations extends SearchFilterInput {
         });
     }
 
-    getDefaultValue() {
-        return [];
-    }
-
     getFilterHeaderText() {
         let value = this.getValue();