From 28c1306f6d5b8bd5873630fff30fea21771b0243 Mon Sep 17 00:00:00 2001
From: Wotuu <wouter.koppenol@gmail.com>
Date: Fri, 31 Jan 2025 12:47:26 +0100
Subject: [PATCH 1/6] #2693 Hotfix for GameServerRegions not working properly.

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

diff --git a/app/Models/GameServerRegion.php b/app/Models/GameServerRegion.php
index 75a85d11e..78bfdf4a2 100644
--- a/app/Models/GameServerRegion.php
+++ b/app/Models/GameServerRegion.php
@@ -115,6 +115,6 @@ public function getRegionEpochByDate(Carbon $dateTime): ?Carbon
             return Carbon::parse(self::EU_EPOCH_CHANGE_DATE);
         }
 
-        return $this->epoch_start;
+        return Carbon::parse($this->epoch_start);
     }
 }

From 2c0a1b4595e043b2bdf418bf14267ecc72d0c727 Mon Sep 17 00:00:00 2001
From: Wouter Koppenol <wouter.koppenol@gmail.com>
Date: Fri, 31 Jan 2025 14:21:10 +0100
Subject: [PATCH 2/6] #2682 Explore embed page can now be controlled through an
 iframe.

---
 .../js/custom/inline/base/searchinlinebase.js | 17 ++++++
 .../common/maps/heatmapsearchsidebar.js       | 10 +++-
 .../dungeon/explore/gameversion/embed.js      | 56 +++++++++++++++++++
 .../explore/gameversion/embed.blade.php       |  6 +-
 resources/views/misc/embed.blade.php          | 12 +++-
 resources/views/misc/embedexplore.blade.php   |  8 ++-
 6 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 resources/assets/js/custom/inline/dungeon/explore/gameversion/embed.js

diff --git a/resources/assets/js/custom/inline/base/searchinlinebase.js b/resources/assets/js/custom/inline/base/searchinlinebase.js
index 4133b220e..64fa83336 100644
--- a/resources/assets/js/custom/inline/base/searchinlinebase.js
+++ b/resources/assets/js/custom/inline/base/searchinlinebase.js
@@ -26,6 +26,17 @@ class SearchInlineBase extends InlineCode {
         let queryParams = getQueryParams();
 
         // Restore URL -> filters values
+        this._restoreFiltersFromQueryParams(queryParams);
+    }
+
+    /**
+     *
+     * @param queryParams
+     * @protected
+     */
+    _restoreFiltersFromQueryParams(queryParams) {
+        console.assert(this instanceof SearchInlineBase, 'this is not a SearchInlineBase!', this);
+
         for (let key in queryParams) {
             let filtersKey = key.replace('[]', '');
             let valueAssigned = false;
@@ -58,6 +69,8 @@ class SearchInlineBase extends InlineCode {
      * @protected
      */
     _updateFilters() {
+        console.assert(this instanceof SearchInlineBase, 'this is not a SearchInlineBase!', this);
+
         if (typeof this.options.currentFiltersSelector === 'undefined') {
             return;
         }
@@ -97,6 +110,8 @@ class SearchInlineBase extends InlineCode {
      * @protected
      */
     _updateUrl(searchParams, blacklist = []) {
+        console.assert(this instanceof SearchInlineBase, 'this is not a SearchInlineBase!', this);
+
         let urlParams = [];
 
         blacklist.push('offset');
@@ -125,6 +140,8 @@ class SearchInlineBase extends InlineCode {
      * @protected
      */
     _search(options = {}, queryParameters = {}, queryParametersUrlBlacklist = []) {
+        console.assert(this instanceof SearchInlineBase, 'this is not a SearchInlineBase!', this);
+
         let searchParams = new SearchParams(this.filters, queryParameters);
 
         this._updateFilters();
diff --git a/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js b/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js
index e1f420d5b..c8ce7d202 100644
--- a/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js
+++ b/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js
@@ -104,8 +104,6 @@ class CommonMapsHeatmapsearchsidebar extends SearchInlineBase {
             'duration': new SearchFilterDuration(this.options.filterDurationSelector, this._search.bind(this), this.options.durationMin, this.options.durationMax),
         };
 
-        console.log($(this.options.filterWeeklyAffixGroupsSelector).length);
-
         this._setupFilterCollapseCookies();
         this._setupLeafletHeatOptions();
     }
@@ -205,6 +203,12 @@ class CommonMapsHeatmapsearchsidebar extends SearchInlineBase {
         this._search();
     }
 
+    searchWithFilters(filters) {
+        this._restoreFiltersFromQueryParams(filters);
+
+        this._search();
+    }
+
     _toggleHeatmap(enabled) {
         console.assert(this instanceof CommonMapsHeatmapsearchsidebar, 'this is not a CommonMapsHeatmapsearchsidebar', this);
         this.map.pluginHeat.toggle(enabled);
@@ -212,7 +216,7 @@ class CommonMapsHeatmapsearchsidebar extends SearchInlineBase {
         Cookies.set(this.options.enabledStateCookie, (enabled ? 1 : 0) + '', cookieDefaultAttributes);
     }
 
-    _search(queryParameters, options) {
+    _search() {
         console.assert(this instanceof CommonMapsHeatmapsearchsidebar, 'this is not a CommonMapsHeatmapsearchsidebar', this);
 
         if (this.initializing) {
diff --git a/resources/assets/js/custom/inline/dungeon/explore/gameversion/embed.js b/resources/assets/js/custom/inline/dungeon/explore/gameversion/embed.js
new file mode 100644
index 000000000..93c915be9
--- /dev/null
+++ b/resources/assets/js/custom/inline/dungeon/explore/gameversion/embed.js
@@ -0,0 +1,56 @@
+class DungeonExploreGameversionEmbed extends InlineCode {
+
+    /**
+     */
+    activate() {
+        super.activate();
+
+        let validHostnames = [
+            'localhost',
+            'keystone.guru',
+            'raider.io'
+        ];
+
+        window.addEventListener('message', (event) => {
+            let hostname = (new URL(event.origin)).hostname;
+
+            let isValidHostname = false;
+            for (let index in validHostnames) {
+                let validHostname = validHostnames[index];
+                if (hostname.endsWith(`.${validHostname}`) || hostname === validHostname) {
+                    isValidHostname = true;
+                    break;
+                }
+            }
+
+            if (!isValidHostname) {
+                console.warn('Invalid hostname - not processing message!');
+                return false;
+            }
+
+            if (typeof event.data.function === 'undefined' || event.data.function === null) {
+                console.error(`Must pass a function to call!`);
+                return false;
+            }
+
+            if (event.data.function === 'setFilters') {
+                /** @type CommonMapsHeatmapsearchsidebar|false */
+                let inlineCode = _inlineManager.getInlineCode('common/maps/heatmapsearchsidebar');
+                if (!inlineCode) {
+                    console.error('Unable to find sidebar!');
+                    return false;
+                }
+
+                delete event.data.function;
+
+                console.log('Applying filters', event.data);
+                inlineCode.searchWithFilters(event.data);
+            }
+
+            return true;
+        });
+    }
+
+    cleanup() {
+    }
+}
diff --git a/resources/views/dungeon/explore/gameversion/embed.blade.php b/resources/views/dungeon/explore/gameversion/embed.blade.php
index f99710b64..5b9034b4e 100644
--- a/resources/views/dungeon/explore/gameversion/embed.blade.php
+++ b/resources/views/dungeon/explore/gameversion/embed.blade.php
@@ -35,11 +35,15 @@
     'cookieConsent' => false,
 ])
 
+@include('common.general.inline', ['path' => 'dungeon/explore/gameversion/embed', 'options' => [
+    'dependencies' => ['common/maps/map'],
+]])
+
 @include('common.general.inline', ['path' => 'common/maps/embedtopbar', 'options' => [
     'dependencies' => ['common/maps/map'],
     'switchDungeonFloorSelect' => '#map_floor_selection_dropdown',
     'defaultSelectedFloorId' => $floor->id,
-    'mdtStringCopyEnabled' => $dungeon->mdt_supported,
+    'mdtStringCopyEnabled' => false,
 ]])
 
 @section('content')
diff --git a/resources/views/misc/embed.blade.php b/resources/views/misc/embed.blade.php
index 551ecbfc1..c443cd238 100644
--- a/resources/views/misc/embed.blade.php
+++ b/resources/views/misc/embed.blade.php
@@ -18,7 +18,9 @@
     <div class="row justify-content-center">
         <div class="col-6">
             @if(!empty($parameters))
-                <iframe src="{{ route('dungeonroute.embed', array_merge([
+                <iframe
+                    id="ksg_iframe"
+                    src="{{ route('dungeonroute.embed', array_merge([
                         'dungeon' => $model->dungeon,
                         'dungeonroute' => $model,
                         'title' => Str::slug($model->title)],
@@ -26,7 +28,9 @@
                     )) }}"
                         style="width: 800px; height: 600px; border: none;"></iframe>
             @elseif($showStyle === 'compact')
-                <iframe src="{{ route('dungeonroute.embed', [
+                <iframe
+                    id="ksg_iframe"
+                    src="{{ route('dungeonroute.embed', [
                         'dungeon' => $model->dungeon,
                         'dungeonroute' => $model,
                         'title' => Str::slug($model->title),
@@ -42,7 +46,9 @@
                     ]) }}"
                         style="width: 800px; height: 600px; border: none;"></iframe>
             @elseif($showStyle === 'regular')
-                <iframe src="{{ route('dungeonroute.embed', [
+                <iframe
+                    id="ksg_iframe"
+                    src="{{ route('dungeonroute.embed', [
                         'dungeon' => $model->dungeon,
                         'dungeonroute' => $model,
                         'title' => Str::slug($model->title),
diff --git a/resources/views/misc/embedexplore.blade.php b/resources/views/misc/embedexplore.blade.php
index dc362e2f9..25731de24 100644
--- a/resources/views/misc/embedexplore.blade.php
+++ b/resources/views/misc/embedexplore.blade.php
@@ -19,13 +19,17 @@
     <div class="row justify-content-center">
         <div class="col-6">
             @if(!empty($parameters))
-                <iframe src="{{ route('dungeon.explore.gameversion.embed', array_merge([
+                <iframe
+                    id="ksg_iframe"
+                    src="{{ route('dungeon.explore.gameversion.embed', array_merge([
                         'gameVersion' => $gameVersion,
                         'dungeon' => $model
                     ], $parameters)) }}"
                         style="width: 800px; height: 600px; border: none;"></iframe>
             @elseif($showStyle === 'compact')
-                <iframe src="{{ route('dungeon.explore.gameversion.embed', [
+                <iframe
+                    id="ksg_iframe"
+                    src="{{ route('dungeon.explore.gameversion.embed', [
                         'gameVersion' => $gameVersion,
                         'dungeon' => $model,
                         'style' => 'compact',

From c2fcee53c9dfe6d29cebfa4ca28b7e00eff7a46e Mon Sep 17 00:00:00 2001
From: Wouter Koppenol <wouter.koppenol@gmail.com>
Date: Fri, 31 Jan 2025 14:24:34 +0100
Subject: [PATCH 3/6] #2695 Added release v11.9.6

---
 database/seeders/releases/v11.9.6.json | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 database/seeders/releases/v11.9.6.json

diff --git a/database/seeders/releases/v11.9.6.json b/database/seeders/releases/v11.9.6.json
new file mode 100644
index 000000000..1415be5ab
--- /dev/null
+++ b/database/seeders/releases/v11.9.6.json
@@ -0,0 +1,25 @@
+{
+    "id": 272,
+    "release_changelog_id": 279,
+    "version": "v11.9.6",
+    "title": "Final heatmap push",
+    "backup_db": 1,
+    "silent": 1,
+    "spotlight": 0,
+    "released": 0,
+    "created_at": "2025-01-31T13:23:59+00:00",
+    "updated_at": "2025-01-31T13:23:59+00:00",
+    "changelog": {
+        "id": 279,
+        "release_id": 272,
+        "description": null,
+        "changes": [
+            {
+                "release_changelog_id": 279,
+                "release_changelog_category_id": 13,
+                "ticket_id": 2682,
+                "change": "Embedded heatmaps can now be controlled through postMessage."
+            }
+        ]
+    }
+}

From 047ef6663afadafac1eedc6e9e9f54183e14880b Mon Sep 17 00:00:00 2001
From: Wouter Koppenol <wouter.koppenol@gmail.com>
Date: Fri, 31 Jan 2025 15:17:43 +0100
Subject: [PATCH 4/6] #2660 Added FE for the specialization filter

---
 app/Logic/MapContext/MapContext.php           |  2 +
 app/Providers/KeystoneGuruServiceProvider.php |  4 +-
 app/Service/View/ViewService.php              |  4 +-
 lang/de_DE/js.php                             |  2 +-
 lang/en_US/js.php                             |  9 +-
 lang/en_US/specializations.php                |  2 +-
 lang/en_US/view_common.php                    | 52 +++++------
 lang/es_ES/js.php                             |  2 +-
 lang/fr_FR/js.php                             |  2 +-
 lang/ho_HO/js.php                             |  2 +-
 lang/it_IT/js.php                             |  2 +-
 lang/ko_KR/js.php                             |  2 +-
 lang/pt_PT/js.php                             |  2 +-
 lang/ru_RU/js.php                             |  2 +-
 lang/uk_UA/js.php                             |  2 +-
 lang/zh_CN/js.php                             |  2 +-
 .../common/maps/heatmapsearchsidebar.js       |  2 +
 .../filters/filterinputspecializations.js     | 53 +++++++++++
 .../filters/filterinputweeklyaffixgroups.js   |  2 +-
 .../assets/js/custom/mapcontext/mapcontext.js |  8 ++
 .../maps/controls/heatmapsearch.blade.php     | 88 ++++++++++++-------
 21 files changed, 170 insertions(+), 76 deletions(-)
 create mode 100644 resources/assets/js/custom/inline/common/search/filters/filterinputspecializations.js

diff --git a/app/Logic/MapContext/MapContext.php b/app/Logic/MapContext/MapContext.php
index 62813e019..3f30ffab8 100644
--- a/app/Logic/MapContext/MapContext.php
+++ b/app/Logic/MapContext/MapContext.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Traits\ListsEnemies;
 use App\Models\CharacterClass;
+use App\Models\CharacterClassSpecialization;
 use App\Models\Dungeon;
 use App\Models\Faction;
 use App\Models\Floor\Floor;
@@ -117,6 +118,7 @@ function () use ($mapFacadeStyle) {
             'unknownMapIconType'                => MapIconType::find(MapIconType::ALL[MapIconType::MAP_ICON_TYPE_UNKNOWN]),
             'awakenedObeliskGatewayMapIconType' => MapIconType::find(MapIconType::ALL[MapIconType::MAP_ICON_TYPE_GATEWAY]),
             'classColors'                       => CharacterClass::all()->pluck('color'),
+            'characterClassSpecializations'     => CharacterClassSpecialization::all(),
             'raidMarkers'                       => RaidMarker::all(),
             'factions'                          => Faction::where('name', '<>', 'Unspecified')->with('iconfile')->get(),
             'publishStates'                     => PublishedState::all(),
diff --git a/app/Providers/KeystoneGuruServiceProvider.php b/app/Providers/KeystoneGuruServiceProvider.php
index 2fd0d1f11..03fd07990 100644
--- a/app/Providers/KeystoneGuruServiceProvider.php
+++ b/app/Providers/KeystoneGuruServiceProvider.php
@@ -493,12 +493,14 @@ static function (View $view) use ($globalViewVariables) {
         });
 
         // Maps
-        view()->composer('common.maps.controls.heatmapsearch', static function (View $view) use ($viewService, &$userOrDefaultRegion) {
+        view()->composer('common.maps.controls.heatmapsearch', static function (View $view) use ($viewService, $globalViewVariables, &$userOrDefaultRegion) {
             $userOrDefaultRegion ??= GameServerRegion::getUserOrDefaultRegion();
             $regionViewVariables = $viewService->getGameServerRegionViewVariables($userOrDefaultRegion);
             $view->with('showAllEnabled', $_COOKIE['dungeon_speedrun_required_npcs_show_all'] ?? '0');
             $view->with('allAffixGroupsByActiveExpansion', $regionViewVariables['allAffixGroupsByActiveExpansion']);
             $view->with('featuredAffixesByActiveExpansion', $regionViewVariables['featuredAffixesByActiveExpansion']);
+
+            $view->with('characterClassSpecializations', $globalViewVariables['characterClassSpecializations']);
         });
         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/View/ViewService.php b/app/Service/View/ViewService.php
index 4789c3dd9..71110c797 100644
--- a/app/Service/View/ViewService.php
+++ b/app/Service/View/ViewService.php
@@ -51,7 +51,7 @@ public function getGlobalViewVariables(bool $useCache = true): array
             $dungeonsSelectQuery = Dungeon::select('dungeons.*')
                 ->join('expansions', 'dungeons.expansion_id', '=', 'expansions.id')
                 ->orderByRaw('expansions.released_at DESC, dungeons.name');
-            $raidsSelectQuery = $dungeonsSelectQuery->clone()
+            $raidsSelectQuery    = $dungeonsSelectQuery->clone()
                 ->where('dungeons.raid', true);
 
             $allDungeonsByExpansionId = $dungeonsSelectQuery
@@ -132,7 +132,7 @@ public function getGlobalViewVariables(bool $useCache = true): array
                 'releaseChangelogCategories'      => ReleaseChangelogCategory::all(),
 
                 // Map
-                'characterClassSpecializations'   => CharacterClassSpecialization::all(),
+                'characterClassSpecializations'   => CharacterClassSpecialization::with('class')->get(),
                 'characterClasses'                => CharacterClass::with('specializations')->get(),
                 // @TODO Classes are loaded fully inside $raceClasses, this shouldn't happen. Find a way to exclude them
                 'characterRacesClasses'           => CharacterRace::with(['classes:character_classes.id'])->orderBy('faction_id')->get(),
diff --git a/lang/de_DE/js.php b/lang/de_DE/js.php
index 35385a148..b716a63f9 100644
--- a/lang/de_DE/js.php
+++ b/lang/de_DE/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/lang/en_US/js.php b/lang/en_US/js.php
index 751946001..58a0a5f31 100644
--- a/lang/en_US/js.php
+++ b/lang/en_US/js.php
@@ -441,11 +441,12 @@
     'filter_enemy_forces_header_complete'                                  => 'Enemy forces: complete',
     'filter_image_select_affixes_header'                                   => 'Affixes: :number selected',
     'filter_image_select_dungeons_header'                                  => 'Dungeons: :number selected',
-    'filter_image_select_weekly_affix_groups_header'                       => 'Week: :week',
+    'filter_input_select_weekly_affix_groups_header'                       => 'Week: :week',
     'filter_input_affix_group_header'                                      => 'Affix groups: :number selected',
-    'filter_input_key_level_header'     => 'Key level: :value',
-    'filter_input_item_level_header'    => 'Item level: :value',
-    'filter_input_player_deaths_header' => 'Player deaths: :value',
+    'filter_input_select_specializations_header'                           => 'Specializations: :specializations',
+    'filter_input_key_level_header'                                        => 'Key level: :value',
+    'filter_input_item_level_header'                                       => 'Item level: :value',
+    'filter_input_player_deaths_header'                                    => 'Player deaths: :value',
     'filter_input_rating_header'                                           => 'Rating: :value and higher',
     'filter_input_title_header'                                            => 'Title: :value',
     'filter_input_expansion_header'                                        => 'Expansion: :value',
diff --git a/lang/en_US/specializations.php b/lang/en_US/specializations.php
index 0a3017405..08096e26c 100644
--- a/lang/en_US/specializations.php
+++ b/lang/en_US/specializations.php
@@ -24,7 +24,7 @@
     ],
     'hunter'       => [
         'beast_mastery' => 'Beast Mastery',
-        'marksman'      => 'Marksman',
+        'marksmanship'  => 'Marksmanship',
         'survival'      => 'Survival',
     ],
     'mage'         => [
diff --git a/lang/en_US/view_common.php b/lang/en_US/view_common.php
index 43899cc25..7fa8f8308 100644
--- a/lang/en_US/view_common.php
+++ b/lang/en_US/view_common.php
@@ -315,31 +315,31 @@
                 'report_an_issue' => 'Report an issue',
             ],
             'heatmapsearch'  => [
-                'settings_title'            => 'Map settings',
-                'enabled'                   => 'Enabled',
-                'disabled'                  => 'Disabled',
-                'event_type'                => 'Event type',
-                'data_type'                 => 'Data type',
-                'npc_death_alt'             => 'Enemy death',
-                'player_death_alt'          => 'Player death',
-                'bloodlust_alt'             => 'Bloodlust',
-                'data_type_title'           => 'Enemy position uses the original position of the enemy that was engaged (powered by Auto-Route Creator), player position uses the position of the player when an enemy was engaged (combat log position).',
-                'filter'                    => 'Filter',
-                'loading'                   => 'Loading',
-                'key_level'                 => 'Key level',
-                'item_level'                => 'Item level',
-                'player_deaths'             => 'Player deaths',
-                'affixes'                   => 'Affixes',
-                'affixes_title'             => 'Affixes',
-                'affixes_selected'          => '{0} affixes selected',
-                'weekly_affix_groups'       => 'Week',
-                'weekly_affix_groups_title' => 'Week',
-                'date_range'                => 'Date range',
-                'date_range_from'           => 'From',
-                'date_range_to'             => 'To',
-                'duration'                  => 'Duration',
-                'heat_options'              => 'Leaflet.heat Options',
-                'heat_option'               => [
+                'settings_title'      => 'Map settings',
+                'enabled'             => 'Enabled',
+                'disabled'            => 'Disabled',
+                'event_type'          => 'Event type',
+                'data_type'           => 'Data type',
+                'npc_death_alt'       => 'Enemy death',
+                'player_death_alt'    => 'Player death',
+                'bloodlust_alt'       => 'Bloodlust',
+                'data_type_title'     => 'Enemy position uses the original position of the enemy that was engaged (powered by Auto-Route Creator), player position uses the position of the player when an enemy was engaged (combat log position).',
+                'filter'              => 'Filter',
+                'loading'             => 'Loading',
+                'key_level'           => 'Key level',
+                'item_level'          => 'Item level',
+                'player_deaths'       => 'Player deaths',
+                'affixes'             => 'Affixes',
+                'affixes_title'       => 'Affixes',
+                'affixes_selected'    => '{0} affixes selected',
+                'weekly_affix_groups' => 'Week',
+                'specializations'     => 'Specializations',
+                'date_range'          => 'Date range',
+                'date_range_from'     => 'From',
+                'date_range_to'       => 'To',
+                'duration'            => 'Duration',
+                'heat_options'        => 'Leaflet.heat Options',
+                'heat_option'         => [
                     'min_opacity' => 'Min opacity',
                     'max_zoom'    => 'Max zoom',
                     'max'         => 'Max',
@@ -348,7 +348,7 @@
                     'gradient'    => 'Gradient',
                     'pane'        => 'Pane',
                 ],
-                'data'                      => [
+                'data'                => [
                     'dungeon_routes' => 'Showing data from :count runs',
                 ],
             ],
diff --git a/lang/es_ES/js.php b/lang/es_ES/js.php
index 35385a148..b716a63f9 100644
--- a/lang/es_ES/js.php
+++ b/lang/es_ES/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/lang/fr_FR/js.php b/lang/fr_FR/js.php
index 35385a148..b716a63f9 100644
--- a/lang/fr_FR/js.php
+++ b/lang/fr_FR/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/lang/ho_HO/js.php b/lang/ho_HO/js.php
index 0aae6ee40..edb688e09 100644
--- a/lang/ho_HO/js.php
+++ b/lang/ho_HO/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => 'Hodor',
     'filter_image_select_affixes_header'                                   => 'Hodor',
     'filter_image_select_dungeons_header'                                  => 'Hodor',
-    'filter_image_select_weekly_affix_groups_header'                       => 'Hodor',
+    'filter_input_select_weekly_affix_groups_header'                       => 'Hodor',
     'filter_input_affix_group_header'                                      => 'Hodor',
     'filter_input_key_level_header' => 'Hodor',
     'filter_input_rating_header'                                           => 'Hodor',
diff --git a/lang/it_IT/js.php b/lang/it_IT/js.php
index 35385a148..b716a63f9 100644
--- a/lang/it_IT/js.php
+++ b/lang/it_IT/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/lang/ko_KR/js.php b/lang/ko_KR/js.php
index 35385a148..b716a63f9 100644
--- a/lang/ko_KR/js.php
+++ b/lang/ko_KR/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/lang/pt_PT/js.php b/lang/pt_PT/js.php
index 35385a148..b716a63f9 100644
--- a/lang/pt_PT/js.php
+++ b/lang/pt_PT/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/lang/ru_RU/js.php b/lang/ru_RU/js.php
index 8fd684647..5ff5225d2 100644
--- a/lang/ru_RU/js.php
+++ b/lang/ru_RU/js.php
@@ -430,7 +430,7 @@
     'filter_enemy_forces_header_complete'                                  => 'Отряд противника: Завершенный',
     'filter_image_select_affixes_header'                                   => 'Аффиксы: :number выбрано',
     'filter_image_select_dungeons_header'                                  => 'Подземелье: :number выбрано',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => 'Группы аффиксов: :number выбрано',
     'filter_input_key_level_header' => 'Уровень: :value',
     'filter_input_rating_header'                                           => 'Рейтинг: :value и выше',
diff --git a/lang/uk_UA/js.php b/lang/uk_UA/js.php
index 35385a148..b716a63f9 100644
--- a/lang/uk_UA/js.php
+++ b/lang/uk_UA/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/lang/zh_CN/js.php b/lang/zh_CN/js.php
index 35385a148..b716a63f9 100644
--- a/lang/zh_CN/js.php
+++ b/lang/zh_CN/js.php
@@ -429,7 +429,7 @@
     'filter_enemy_forces_header_complete'                                  => '',
     'filter_image_select_affixes_header'                                   => '',
     'filter_image_select_dungeons_header'                                  => '',
-    'filter_image_select_weekly_affix_groups_header'                       => '',
+    'filter_input_select_weekly_affix_groups_header'                       => '',
     'filter_input_affix_group_header'                                      => '',
     'filter_input_key_level_header' => '',
     'filter_input_rating_header'                                           => '',
diff --git a/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js b/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js
index c8ce7d202..36e3db6b3 100644
--- a/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js
+++ b/resources/assets/js/custom/inline/common/maps/heatmapsearchsidebar.js
@@ -30,6 +30,7 @@
  * @property {String} filterPlayerDeathsSelector
  * @property {String} filterAffixesSelector
  * @property {String} filterWeeklyAffixGroupsSelector
+ * @property {String} filterSpecializationsSelector
  * @property {String} filterDurationSelector
  *
  * @property {String} filterCollapseNames
@@ -101,6 +102,7 @@ class CommonMapsHeatmapsearchsidebar extends SearchInlineBase {
 
                 self._search();
             }),
+            'includeSpecIds': new SearchFilterSpecializations(this.options.filterSpecializationsSelector, self._search.bind(this)),
             'duration': new SearchFilterDuration(this.options.filterDurationSelector, this._search.bind(this), this.options.durationMin, this.options.durationMax),
         };
 
diff --git a/resources/assets/js/custom/inline/common/search/filters/filterinputspecializations.js b/resources/assets/js/custom/inline/common/search/filters/filterinputspecializations.js
new file mode 100644
index 000000000..c27c1d78f
--- /dev/null
+++ b/resources/assets/js/custom/inline/common/search/filters/filterinputspecializations.js
@@ -0,0 +1,53 @@
+class SearchFilterSpecializations extends SearchFilterInput {
+    constructor(selector, onChange) {
+        super(selector, onChange);
+    }
+
+    activate() {
+        super.activate();
+
+        let self = this;
+
+        // Grouped affixes
+        $(this.selector).off('change').on('change', function () {
+            self.onChange();
+
+            refreshSelectPickers();
+        });
+    }
+
+    getDefaultValue() {
+        return [];
+    }
+
+    getFilterHeaderText() {
+        let value = this.getValue();
+
+        let specializationNames = [];
+
+        let characterClassSpecializations = getState().getMapContext().getStaticCharacterClassSpecializations();
+
+        for (let index in value) {
+            let specializationId = parseInt(value[index]);
+
+            let characterClassSpecialization = null;
+            for (let characterClassSpecializationsIndex in characterClassSpecializations) {
+                let characterClassSpecializationCandidate = characterClassSpecializations[characterClassSpecializationsIndex];
+                if (characterClassSpecializationCandidate.specialization_id === specializationId) {
+                    characterClassSpecialization = characterClassSpecializationCandidate;
+                    break;
+                }
+            }
+
+            if (characterClassSpecialization === null) {
+                console.error(`Unable to find character class specialization for ID ${specializationId}`, characterClassSpecializations);
+                continue;
+            }
+
+            specializationNames.push(lang.get(characterClassSpecialization.name))
+        }
+
+        return lang.get('messages.filter_input_select_specializations_header')
+            .replace(':specializations', specializationNames.join(', '));
+    }
+}
diff --git a/resources/assets/js/custom/inline/common/search/filters/filterinputweeklyaffixgroups.js b/resources/assets/js/custom/inline/common/search/filters/filterinputweeklyaffixgroups.js
index 9c350929f..50002744b 100644
--- a/resources/assets/js/custom/inline/common/search/filters/filterinputweeklyaffixgroups.js
+++ b/resources/assets/js/custom/inline/common/search/filters/filterinputweeklyaffixgroups.js
@@ -21,7 +21,7 @@ class SearchFilterWeeklyAffixGroups extends SearchFilterInput {
 
         let displayValue = value.length > 0 ? `${value[0]} - ${value[value.length - 1]}` : '';
 
-        return lang.get('messages.filter_image_select_weekly_affix_groups_header')
+        return lang.get('messages.filter_input_select_weekly_affix_groups_header')
             .replace(':week', '' + displayValue);
     }
 
diff --git a/resources/assets/js/custom/mapcontext/mapcontext.js b/resources/assets/js/custom/mapcontext/mapcontext.js
index 6261051c3..32b8efeb9 100644
--- a/resources/assets/js/custom/mapcontext/mapcontext.js
+++ b/resources/assets/js/custom/mapcontext/mapcontext.js
@@ -134,6 +134,14 @@ class MapContext extends Signalable {
         return this._options.static.classColors;
     }
 
+    /**
+     *
+     * @returns {[]}
+     */
+    getStaticCharacterClassSpecializations() {
+        return this._options.static.characterClassSpecializations;
+    }
+
     /**
      *
      * @returns {[]}
diff --git a/resources/views/common/maps/controls/heatmapsearch.blade.php b/resources/views/common/maps/controls/heatmapsearch.blade.php
index 762b5ef8d..b7dd4ad81 100644
--- a/resources/views/common/maps/controls/heatmapsearch.blade.php
+++ b/resources/views/common/maps/controls/heatmapsearch.blade.php
@@ -2,6 +2,7 @@
 
 use App\Models\Affix;
 use App\Models\AffixGroup\AffixGroup;
+use App\Models\CharacterClassSpecialization;
 use App\Models\CombatLog\CombatLogEventDataType;
 use App\Models\CombatLog\CombatLogEventEventType;
 use App\Models\Dungeon;
@@ -10,39 +11,32 @@
 use Illuminate\Support\Collection;
 
 /**
- * @var bool                         $showAds
- * @var Dungeon                      $dungeon
- * @var Season                       $season
- * @var bool                         $embed
- * @var string                       $embedStyle
- * @var bool                         $isMobile
- * @var integer                      $defaultState
- * @var bool                         $hideOnMove
- * @var bool                         $showAllEnabled
- * @var Collection<AffixGroup>       $allAffixGroupsByActiveExpansion
- * @var Collection<Affix>            $featuredAffixesByActiveExpansion
- * @var int                          $keyLevelMin
- * @var int                          $keyLevelMax
- * @var int                          $itemLevelMin
- * @var int                          $itemLevelMax
- * @var int                          $playerDeathsMin
- * @var int                          $playerDeathsMax
- * @var Collection<WeeklyAffixGroup> $seasonWeeklyAffixGroups
+ * @var bool                                     $showAds
+ * @var Dungeon                                  $dungeon
+ * @var Season                                   $season
+ * @var bool                                     $embed
+ * @var string                                   $embedStyle
+ * @var bool                                     $isMobile
+ * @var integer                                  $defaultState
+ * @var bool                                     $hideOnMove
+ * @var bool                                     $showAllEnabled
+ * @var Collection<AffixGroup>                   $allAffixGroupsByActiveExpansion
+ * @var Collection<Affix>                        $featuredAffixesByActiveExpansion
+ * @var int                                      $keyLevelMin
+ * @var int                                      $keyLevelMax
+ * @var int                                      $itemLevelMin
+ * @var int                                      $itemLevelMax
+ * @var int                                      $playerDeathsMin
+ * @var int                                      $playerDeathsMax
+ * @var Collection<WeeklyAffixGroup>             $seasonWeeklyAffixGroups
+ * @var Collection<CharacterClassSpecialization> $characterClassSpecializations
  */
 
 // By default, show it if we're not mobile, but allow overrides
 $heatmapSearchSidebarState = (int)($_COOKIE['heatmap_search_sidebar_state'] ?? 1);
 $defaultState              ??= $isMobile ? 0 : $heatmapSearchSidebarState;
 $heatmapSearchEnabled      = (bool)($_COOKIE['heatmap_search_enabled'] ?? 1);
-
 $filterExpandedCookiePrefix = 'heatmap_search_expanded';
-$expandedDataType           = (bool)($_COOKIE[sprintf('%s_data_type', $filterExpandedCookiePrefix)] ?? 0); // Hide by default
-$expandedKeyLevel           = (bool)($_COOKIE[sprintf('%s_key_level', $filterExpandedCookiePrefix)] ?? 1);
-$expandedItemLevel          = (bool)($_COOKIE[sprintf('%s_item_level', $filterExpandedCookiePrefix)] ?? 1);
-$expandedPlayerDeaths       = (bool)($_COOKIE[sprintf('%s_player_deaths', $filterExpandedCookiePrefix)] ?? 1);
-$expandedAffixes            = (bool)($_COOKIE[sprintf('%s_affixes', $filterExpandedCookiePrefix)] ?? 1);
-$expandedAffixWeek          = (bool)($_COOKIE[sprintf('%s_weekly_affix_groups', $filterExpandedCookiePrefix)] ?? 1);
-$expandedDuration           = (bool)($_COOKIE[sprintf('%s_duration', $filterExpandedCookiePrefix)] ?? 1);
 
 $shouldShowHeatmapSearchSidebar = $defaultState === 1;
 $hideOnMove                     ??= $isMobile;
@@ -81,6 +75,7 @@
     'filterPlayerDeathsSelector' => '#filter_player_deaths',
     'filterAffixesSelector' => '.select_icon.class_icon.selectable',
     'filterWeeklyAffixGroupsSelector' => '#filter_weekly_affix_groups',
+    'filterSpecializationsSelector' => '#filter_specializations',
     'filterDurationSelector' => '#filter_duration',
 
     'filterCollapseNames' => ['keyLevel', 'includeAffixIds', 'duration'],
@@ -260,11 +255,12 @@ class="{{ CombatLogEventDataType::PlayerPosition->value }}"
                                         $seasonWeeklyAffixGroups->mapWithKeys(function(WeeklyAffixGroup $seasonWeeklyAffixGroup){
                                             return [$seasonWeeklyAffixGroup->week => $seasonWeeklyAffixGroup->affixGroup->text];
                                         }), [],
-                                        ['id' => 'filter_weekly_affix_groups',
-                                        'name' => 'weekly_affix_groups',
-                                        'class' => 'form-control affixselect selectpicker',
-                                        'multiple' => 'multiple',
-                                        'title' => __('view_common.maps.controls.heatmapsearch.weekly_affix_groups_title')]
+                                        [
+                                            'id' => 'filter_weekly_affix_groups',
+                                            'name' => 'weekly_affix_groups',
+                                            'class' => 'form-control affixselect selectpicker',
+                                            'multiple' => 'multiple'
+                                        ]
                                     )
                                  !!}
                             </div>
@@ -272,6 +268,36 @@ class="{{ CombatLogEventDataType::PlayerPosition->value }}"
                     </div>
                 @endcomponent
 
+                @component('common.forms.labelinput', [
+                    'name' => 'filter_specializations',
+                    'label' => __('view_common.maps.controls.heatmapsearch.specializations'),
+                ])
+                    {!!
+                        Form::select(
+                            'filter_specializations[]',
+                            $characterClassSpecializations->groupBy(function(CharacterClassSpecialization $characterClassSpecialization) {
+                                return __($characterClassSpecialization->class->name);
+                            })->mapWithKeys(function (Collection $specializations, string $className) {
+                                return [
+                                    $className => $specializations->mapWithKeys(function(CharacterClassSpecialization $characterClassSpecialization){
+                                        return [
+                                            // No translation is intended!
+                                            $characterClassSpecialization->specialization_id => __($characterClassSpecialization->name)
+                                        ];
+                                    })
+                                ];
+                            })->toArray(),
+                            [],
+                            [
+                                'id' => 'filter_specializations',
+                                'name' => 'specializations',
+                                'class' => 'form-control selectpicker',
+                                'multiple' => 'multiple'
+                            ]
+                        )
+                     !!}
+                @endcomponent
+
                 @if($dungeon->gameVersion->has_seasons)
                     {{--                    @component('common.forms.labelinput', ['key' => 'season', 'text' => __('view_common.maps.controls.heatmapsearch.season'), 'expanded' => $expandedAffixWeek])--}}
                     {{--                        <div class="filter_affix">--}}

From 05c69cd8ef7d27197e24dcaacc47f443abc60b1a Mon Sep 17 00:00:00 2001
From: Wouter Koppenol <wouter.koppenol@gmail.com>
Date: Fri, 31 Jan 2025 15:28:24 +0100
Subject: [PATCH 5/6] #2660 Added BE for the specialization filter

---
 .../Heatmap/AjaxGetDataFormRequest.php        |  4 ++
 .../Heatmap/ExploreUrlFormRequest.php         |  3 +-
 .../Dtos/CombatLogEventFilter.php             | 41 +++++++++++++++++-
 .../RaiderIO/Dtos/HeatmapDataFilter.php       | 42 ++++++++++++++++++-
 4 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/Heatmap/AjaxGetDataFormRequest.php b/app/Http/Requests/Heatmap/AjaxGetDataFormRequest.php
index f67843811..2132ec0d9 100644
--- a/app/Http/Requests/Heatmap/AjaxGetDataFormRequest.php
+++ b/app/Http/Requests/Heatmap/AjaxGetDataFormRequest.php
@@ -3,6 +3,7 @@
 namespace App\Http\Requests\Heatmap;
 
 use App\Models\Affix;
+use App\Models\CharacterClassSpecialization;
 use App\Models\Dungeon;
 use Illuminate\Validation\Rule;
 
@@ -29,6 +30,9 @@ public function rules(): array
             // These are overrides since it's easier to split the csv as an array for this endpoint
             'includeAffixIds'   => ['nullable', 'array'],
             'includeAffixIds.*' => ['integer', Rule::exists(Affix::class, 'affix_id')],
+            // These are overrides since it's easier to split the csv as an array for this endpoint
+            'includeSpecIds'    => ['nullable', 'array'],
+            'includeSpecIds.*'  => ['integer', Rule::exists(CharacterClassSpecialization::class, 'specialization_id')],
         ]);
     }
 }
diff --git a/app/Http/Requests/Heatmap/ExploreUrlFormRequest.php b/app/Http/Requests/Heatmap/ExploreUrlFormRequest.php
index 30b8de312..5af729801 100644
--- a/app/Http/Requests/Heatmap/ExploreUrlFormRequest.php
+++ b/app/Http/Requests/Heatmap/ExploreUrlFormRequest.php
@@ -34,7 +34,8 @@ public function rules(): array
             'maxItemLevel'     => ['nullable', 'integer'],
             'minPlayerDeaths'  => ['nullable', 'integer'],
             'maxPlayerDeaths'  => ['nullable', 'integer'],
-            'includeAffixIds'  => ['nullable', 'string'],
+            'includeAffixIds'  => ['nullable', 'string'], // csv
+            'includeSpecIds'   => ['nullable', 'string'], // csv
             'minPeriod'        => ['nullable', 'integer'],
             'maxPeriod'        => ['nullable', 'integer'],
             'minTimerFraction' => ['nullable', 'numeric'],
diff --git a/app/Service/CombatLogEvent/Dtos/CombatLogEventFilter.php b/app/Service/CombatLogEvent/Dtos/CombatLogEventFilter.php
index 505cc806f..5992dfbe2 100644
--- a/app/Service/CombatLogEvent/Dtos/CombatLogEventFilter.php
+++ b/app/Service/CombatLogEvent/Dtos/CombatLogEventFilter.php
@@ -3,6 +3,7 @@
 namespace App\Service\CombatLogEvent\Dtos;
 
 use App\Models\Affix;
+use App\Models\CharacterClassSpecialization;
 use App\Models\CombatLog\CombatLogEventDataType;
 use App\Models\CombatLog\CombatLogEventEventType;
 use App\Models\Dungeon;
@@ -33,6 +34,9 @@ class CombatLogEventFilter implements Arrayable
 
     /** @var Collection<Affix> */
     private Collection $affixes;
+
+    /** @var Collection<CharacterClassSpecialization> */
+    private Collection $specializations;
     private ?int       $periodMin   = null;
     private ?int       $periodMax   = null;
     private ?int       $durationMin = null;
@@ -44,7 +48,8 @@ public function __construct(
         private readonly CombatLogEventEventType $eventType,
         private readonly CombatLogEventDataType  $dataType
     ) {
-        $this->affixes = collect();
+        $this->affixes         = collect();
+        $this->specializations = collect();
     }
 
     public function getDungeon(): Dungeon
@@ -153,6 +158,25 @@ public function setAffixes(Collection $affixes): CombatLogEventFilter
         return $this;
     }
 
+    /**
+     * @return Collection<CharacterClassSpecialization>
+     */
+    public function getSpecializations(): Collection
+    {
+        return $this->specializations;
+    }
+
+    /**
+     * @param Collection<CharacterClassSpecialization> $specializations
+     * @return CombatLogEventFilter
+     */
+    public function setSpecializations(Collection $specializations): CombatLogEventFilter
+    {
+        $this->specializations = $specializations;
+
+        return $this;
+    }
+
     public function getPeriodMin(): ?int
     {
         return $this->periodMin;
@@ -212,6 +236,9 @@ public function toArray(): array
             'affixes'           => $this->affixes->map(function (Affix $affix) {
                 return __($affix->name, [], 'en_US');
             }),
+            'specializations'   => $this->specializations->map(function (CharacterClassSpecialization $characterClassSpecialization) {
+                return __($characterClassSpecialization->name, [], 'en_US');
+            }),
             'period_min'        => $this->periodMin,
             'period_max'        => $this->periodMax,
             'duration_min'      => $this->durationMin,
@@ -283,6 +310,17 @@ public function toOpensearchQuery(array $must = []): array
             ]);
         }
 
+        // @TODO Add nested query for specializations - it's nested in the character data
+//        if ($this->specializations->isNotEmpty()) {
+//            $must[] = BoolQuery::make([
+//                Should::make(
+//                    $this->specializations->map(function (CharacterClassSpecialization $characterClassSpecialization) {
+//                        return MatchOne::make('spec_id', $characterClassSpecialization->specialization_id);
+//                    })->toArray()
+//                ),
+//            ]);
+//        }
+
         // Add an AffixGroup filter
         $mostRecentSeason = $this->seasonService->getMostRecentSeasonForDungeon($dungeon);
 
@@ -336,6 +374,7 @@ public static function fromHeatmapDataFilter(SeasonServiceInterface $seasonServi
         $combatLogEventFilter->setPlayerDeathsMin($heatmapDataFilter->getPlayerDeathsMin());
         $combatLogEventFilter->setPlayerDeathsMax($heatmapDataFilter->getPlayerDeathsMax());
         $combatLogEventFilter->setAffixes($heatmapDataFilter->getIncludeAffixIds());
+        $combatLogEventFilter->setSpecializations($heatmapDataFilter->getIncludeSpecIds());
         $combatLogEventFilter->setPeriodMin($heatmapDataFilter->getMinPeriod());
         $combatLogEventFilter->setPeriodMax($heatmapDataFilter->getMaxPeriod());
 
diff --git a/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php b/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php
index f48b28b51..c3a07f5e9 100644
--- a/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php
+++ b/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php
@@ -4,6 +4,7 @@
 
 
 use App\Models\Affix;
+use App\Models\CharacterClassSpecialization;
 use App\Models\CombatLog\CombatLogEventDataType;
 use App\Models\CombatLog\CombatLogEventEventType;
 use App\Models\Dungeon;
@@ -25,6 +26,8 @@ class HeatmapDataFilter implements Arrayable
     private ?int $playerDeathsMax = null;
     /** @var Collection<Affix> */
     private Collection $includeAffixIds;
+    /** @var Collection<CharacterClassSpecialization> */
+    private Collection $includeSpecIds;
     private ?int       $minPeriod        = null;
     private ?int       $maxPeriod        = null;
     private ?int       $timerFractionMin = null;
@@ -36,6 +39,7 @@ public function __construct(
         private readonly CombatLogEventDataType  $dataType
     ) {
         $this->includeAffixIds = collect();
+        $this->includeSpecIds  = collect();
     }
 
     public function getDungeon(): Dungeon
@@ -144,6 +148,25 @@ public function setIncludeAffixIds(Collection $includeAffixIds): HeatmapDataFilt
         return $this;
     }
 
+    /**
+     * @return Collection<CharacterClassSpecialization>
+     */
+    public function getIncludeSpecIds(): Collection
+    {
+        return $this->includeSpecIds;
+    }
+
+    /**
+     * @param Collection<CharacterClassSpecialization> $includeSpecIds
+     * @return HeatmapDataFilter
+     */
+    public function setIncludeSpecIds(Collection $includeSpecIds): HeatmapDataFilter
+    {
+        $this->includeSpecIds = $includeSpecIds;
+
+        return $this;
+    }
+
     public function getMinPeriod(): ?int
     {
         return $this->minPeriod;
@@ -188,6 +211,12 @@ public function setTimerFractionMax(?int $timerFractionMAx): HeatmapDataFilter
         return $this;
     }
 
+    /**
+     * Converts the filter into an array that will be passed to the Raider.io API in the URL
+     *
+     * @param Season|null $mostRecentSeason
+     * @return array
+     */
     public function toArray(Season $mostRecentSeason = null): array
     {
         $result = [
@@ -206,7 +235,15 @@ public function toArray(Season $mostRecentSeason = null): array
         $result['maxTimerFraction'] = $this->getTimerFractionMax();
 
         if ($this->getIncludeAffixIds()->isNotEmpty()) {
-            $result['includeAffixIds'] = implode(',', $this->getIncludeAffixIds()->map(fn(Affix $affix) => $affix->affix_id)->toArray());
+            $result['includeAffixIds'] = implode(',', $this->getIncludeAffixIds()->map(
+                fn(Affix $affix) => $affix->affix_id
+            )->toArray());
+        }
+
+        if ($this->getIncludeSpecIds()->isNotEmpty()) {
+            $result['includeSpecIds'] = implode(',', $this->getIncludeSpecIds()->map(
+                fn(CharacterClassSpecialization $characterClassSpecialization) => $characterClassSpecialization->specialization_id
+            )->toArray());
         }
 
         if ($this->getMinPeriod() !== null && $this->getMaxPeriod() !== null) {
@@ -238,6 +275,9 @@ public static function fromArray(array $requestArray): HeatmapDataFilter
         $heatmapDataFilter->setIncludeAffixIds(isset($requestArray['includeAffixIds']) ?
             Affix::whereIn('affix_id', $requestArray['includeAffixIds'])->get() : collect());
 
+        $heatmapDataFilter->setIncludeSpecIds(isset($requestArray['includeSpecIds']) ?
+            CharacterClassSpecialization::whereIn('specialization_id', $requestArray['includeSpecIds'])->get() : collect());
+
         if (isset($requestArray['minPeriod']) && (int)$requestArray['minPeriod'] > 0) {
             $heatmapDataFilter->setMinPeriod($requestArray['minPeriod']);
         }

From 7e21ce86d137a549a78c3a4a69c12d794a522928 Mon Sep 17 00:00:00 2001
From: Wouter Koppenol <wouter.koppenol@gmail.com>
Date: Fri, 31 Jan 2025 15:33:57 +0100
Subject: [PATCH 6/6] #2669 Updated release v11.9.6

---
 database/seeders/releases/v11.9.6.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/database/seeders/releases/v11.9.6.json b/database/seeders/releases/v11.9.6.json
index 1415be5ab..3c6195a29 100644
--- a/database/seeders/releases/v11.9.6.json
+++ b/database/seeders/releases/v11.9.6.json
@@ -19,6 +19,12 @@
                 "release_changelog_category_id": 13,
                 "ticket_id": 2682,
                 "change": "Embedded heatmaps can now be controlled through postMessage."
+            },
+            {
+                "release_changelog_id": 279,
+                "release_changelog_category_id": 13,
+                "ticket_id": 2660,
+                "change": "Added a filter for specializations."
             }
         ]
     }