Merge pull request #580 from Heroes-Profile/develop

Heroes Profile v0.5.3
Heroes-Profile · Dec 7, 2023 · 4b5ed53 · 4b5ed53
2 parents 4970a53 + 204bc77
commit 4b5ed53
Show file tree

Hide file tree

Showing 51 changed files with 330 additions and 130 deletions.
diff --git a/app/Http/Controllers/CompareController.php b/app/Http/Controllers/CompareController.php
@@ -35,7 +35,7 @@ public function show(Request $request, $hero = null)
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 'userinput' => $userinput,
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("single"),
             ]);
     }
 

diff --git a/app/Http/Controllers/Esports/EsportsController.php b/app/Http/Controllers/Esports/EsportsController.php
@@ -45,11 +45,6 @@ public function show(Request $request)
         return view('Esports.esportsMain')
             ->with([
                 'regions' => $this->globalDataService->getRegionIDtoString(),
-                //'filters' => $this->globalDataService->getFilterData(),
-                //'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
-                //'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
-                //'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],
-                //'defaultbuildtype' => $this->globalDataService->getDefaultBuildType()
             ]);
     }
 

diff --git a/app/Http/Controllers/Global/GlobalCompositionsController.php b/app/Http/Controllers/Global/GlobalCompositionsController.php
@@ -19,7 +19,7 @@ public function show(Request $request)
             ->with([
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
                 'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
                 'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
                 'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalDraftController.php b/app/Http/Controllers/Global/GlobalDraftController.php
@@ -31,7 +31,7 @@ public function show(Request $request, $hero = null)
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 'userinput' => $userinput,
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
                 'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
                 'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
                 'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalHeroMapStatsController.php b/app/Http/Controllers/Global/GlobalHeroMapStatsController.php
@@ -33,7 +33,7 @@ public function show(Request $request, $hero = null)
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 'userinput' => $userinput,
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
                 'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
                 'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
                 'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalHeroMatchupStatsController.php b/app/Http/Controllers/Global/GlobalHeroMatchupStatsController.php
@@ -33,7 +33,7 @@ public function show(Request $request, $hero = null, $allyenemy = null)
             'regions' => $this->globalDataService->getRegionIDtoString(),
             'userinput' => $userinput,
             'filters' => $this->globalDataService->getFilterData(),
-            'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
             'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
             'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
             'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalHeroMatchupsTalentsController.php b/app/Http/Controllers/Global/GlobalHeroMatchupsTalentsController.php
@@ -62,7 +62,7 @@ public function show(Request $request, $hero = null, $allyenemy = null)
             'regions' => $this->globalDataService->getRegionIDtoString(),
             'heroes' => $this->globalDataService->getHeroes(),
             'filters' => $this->globalDataService->getFilterData(),
-            'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
             'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
             'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
             'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalHeroStatsController.php b/app/Http/Controllers/Global/GlobalHeroStatsController.php
@@ -21,7 +21,7 @@ public function show(Request $request)
             ->with([
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
                 'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
                 'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
                 'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalLeaderboardController.php b/app/Http/Controllers/Global/GlobalLeaderboardController.php
@@ -29,7 +29,7 @@ public function show(Request $request)
         return view('Global.Leaderboard.globalLeaderboard')->with([
             'regions' => $this->globalDataService->getRegionIDtoString(),
             'filters' => $this->globalDataService->getFilterData(),
-            'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("single"),
             'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
             'defaultseason' => (string) $this->globalDataService->getDefaultSeason(),
             'weekssincestart' => $this->globalDataService->getWeeksSinceSeasonStart(),

diff --git a/app/Http/Controllers/Global/GlobalPartyStatsController.php b/app/Http/Controllers/Global/GlobalPartyStatsController.php
@@ -17,7 +17,7 @@ public function show(Request $request)
             ->with([
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
                 'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
                 'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
                 'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalTalentBuilderController.php b/app/Http/Controllers/Global/GlobalTalentBuilderController.php
@@ -33,7 +33,7 @@ public function show(Request $request, $hero = null)
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 'userinput' => $userinput,
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
                 'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
                 'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
                 'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Global/GlobalTalentStatsController.php b/app/Http/Controllers/Global/GlobalTalentStatsController.php
@@ -37,7 +37,7 @@ public function show(Request $request, $hero = null)
                 'heroes' => $this->globalDataService->getHeroes(),
                 'userinput' => $userinput,
                 'filters' => $this->globalDataService->getFilterData(),
-                'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+                'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
                 'defaulttimeframetype' => $this->globalDataService->getDefaultTimeframeType(),
                 'advancedfiltering' => $this->globalDataService->getAdvancedFilterShowDefault(),
                 'defaulttimeframe' => [$this->globalDataService->getDefaultTimeframe()],

diff --git a/app/Http/Controllers/Player/FriendFoeController.php b/app/Http/Controllers/Player/FriendFoeController.php
@@ -57,7 +57,7 @@ public function show(Request $request, $battletag, $blizz_id, $region)
             'season' => $season,
             'game_type' => $game_type,
             'game_map' => $game_map,
-            'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
             'filters' => $this->globalDataService->getFilterData(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
         ]);

diff --git a/app/Http/Controllers/Player/PlayerController.php b/app/Http/Controllers/Player/PlayerController.php
@@ -34,9 +34,6 @@ public function show(Request $request, $battletag, $blizz_id, $region)
             'region' => 'required|integer',
         ];
 
-        if (request()->has('game_type')) {
-            $validationRules['game_type'] = ['sometimes', 'nullable', new GameTypeInputValidation()];
-        }
         if (request()->has('season')) {
             $validationRules['season'] = ['sometimes', 'nullable', new SeasonInputValidation()];
         }
@@ -64,7 +61,6 @@ public function show(Request $request, $battletag, $blizz_id, $region)
         }
 
         $season = $request['season'];
-        $game_type = $request['game_type'];
 
         return view('Player.player')->with([
             'regions' => $this->globalDataService->getRegionIDtoString(),
@@ -73,7 +69,7 @@ public function show(Request $request, $battletag, $blizz_id, $region)
             'blizz_id' => $blizz_id,
             'region' => $region,
             'season' => $season,
-            'game_type' => $game_type,
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("single"),
             'filters' => $this->globalDataService->getFilterData(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
         ]);

diff --git a/app/Http/Controllers/Player/PlayerHeroesController.php b/app/Http/Controllers/Player/PlayerHeroesController.php
@@ -41,6 +41,7 @@ public function showAll(Request $request, $battletag, $blizz_id, $region)
             'region' => $region,
             'filters' => $this->globalDataService->getFilterData(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
         ]);
 
     }
@@ -73,6 +74,7 @@ public function showSingle(Request $request, $battletag, $blizz_id, $region, $he
             'filters' => $this->globalDataService->getFilterData(),
             'regions' => $this->globalDataService->getRegionIDtoString(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("single"),
         ]);
     }
 }
diff --git a/app/Http/Controllers/Player/PlayerMMRController.php b/app/Http/Controllers/Player/PlayerMMRController.php
@@ -39,7 +39,7 @@ public function show(Request $request, $battletag, $blizz_id, $region)
             'blizz_id' => $blizz_id,
             'region' => $region,
             'filters' => $this->globalDataService->getFilterData(),
-            'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("single"),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
         ]);
     }

diff --git a/app/Http/Controllers/Player/PlayerMapsController.php b/app/Http/Controllers/Player/PlayerMapsController.php
@@ -42,6 +42,8 @@ public function showAll(Request $request, $battletag, $blizz_id, $region)
             'region' => $region,
             'filters' => $this->globalDataService->getFilterData(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
+
         ]);
     }
 
@@ -76,6 +78,8 @@ public function showSingle(Request $request, $battletag, $blizz_id, $region, $ma
             'filters' => $this->globalDataService->getFilterData(),
             'regions' => $this->globalDataService->getRegionIDtoString(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("single"),
+
         ]);
     }
 }
diff --git a/app/Http/Controllers/Player/PlayerMatchHistory.php b/app/Http/Controllers/Player/PlayerMatchHistory.php
@@ -40,7 +40,7 @@ public function show(Request $request, $battletag, $blizz_id, $region)
             'blizz_id' => $blizz_id,
             'region' => $region,
             'filters' => $this->globalDataService->getFilterData(),
-            'gametypedefault' => $this->globalDataService->getGameTypeDefault(),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
         ]);
     }

diff --git a/app/Http/Controllers/Player/PlayerMatchupsController.php b/app/Http/Controllers/Player/PlayerMatchupsController.php
@@ -39,6 +39,8 @@ public function show(Request $request, $battletag, $blizz_id, $region)
             'region' => $region,
             'filters' => $this->globalDataService->getFilterData(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
+
         ]);
     }
 

diff --git a/app/Http/Controllers/Player/PlayerRolesController.php b/app/Http/Controllers/Player/PlayerRolesController.php
@@ -36,6 +36,8 @@ public function showAll(Request $request, $battletag, $blizz_id, $region)
             'region' => $region,
             'filters' => $this->globalDataService->getFilterData(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
+
         ]);
     }
 
@@ -66,6 +68,8 @@ public function showSingle(Request $request, $battletag, $blizz_id, $region, $ro
             'filters' => $this->globalDataService->getFilterData(),
             'regions' => $this->globalDataService->getRegionIDtoString(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("single"),
+
         ]);
     }
 }
diff --git a/app/Http/Controllers/Player/PlayerTalentsController.php b/app/Http/Controllers/Player/PlayerTalentsController.php
@@ -52,6 +52,7 @@ public function show(Request $request, $battletag, $blizz_id, $region)
             'talentimages' => $this->globalDataService->getPreloadTalentImageUrls(),
             'patreon' => $this->globalDataService->checkIfSiteFlair($blizz_id, $region),
             'heroes' => $this->globalDataService->getHeroes(),
+            'gametypedefault' => $this->globalDataService->getGameTypeDefault("multi"),
         ]);
     }
 

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
@@ -7,6 +7,8 @@
 use App\Models\Hero;
 use App\Models\PatreonAccount;
 use App\Rules\GameTypeInputValidation;
+use App\Rules\TalentBuildTypeInputValidation;
+
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
@@ -31,6 +33,7 @@ public function saveSettings(Request $request)
         $validationRules = [
             'userhero' => 'nullable|numeric',
             'usergametype' => ['sometimes', 'nullable', new GameTypeInputValidation()],
+            'talentbuildtype' => ['sometimes', 'nullable', new TalentBuildTypeInputValidation()],
         ];
 
         $validator = Validator::make($request->all(), $validationRules);
@@ -59,21 +62,33 @@ public function saveSettings(Request $request)
                 ['value' => $userhero]
             );
         }
-
+        
         if (! is_null($request['usergametype'])) {
             $user = BattlenetAccount::find($request['userid']);
 
-            $userGameTypes = $request['usergametype'];
+            $usergametype = $request['usergametype'];
+
+            $user->userSettings()->updateOrCreate(
+                ['setting' => 'game_type'],
+                ['value' => $usergametype]
+            );
+        }
+
+
+        if (! is_null($request['usermultigametype'])) {
+            $user = BattlenetAccount::find($request['userid']);
+
+            $userGameTypes = $request['usermultigametype'];
             $existingGameTypes = GameType::whereIn('short_name', $userGameTypes)->pluck('short_name')->all();
             if (count($existingGameTypes) === count($userGameTypes)) {
-                $usergametype = $request['usergametype'];
+                $usergametype = $request['usermultigametype'];
             } else {
                 return ['success' => false];
             }
 
             $user->userSettings()->updateOrCreate(
-                ['setting' => 'game_type'],
-                ['value' => implode(',', $usergametype)]
+                ['setting' => 'multi_game_type'],
+                ['value' => implode(',', $userGameTypes)]
             );
         }
 
@@ -88,6 +103,16 @@ public function saveSettings(Request $request)
             );
         }
 
+        if (! is_null($request['talentbuildtype'])) {
+            $user = BattlenetAccount::find($request['userid']);
+
+            $talentbuildtype = $request['talentbuildtype'];
+
+            $user->userSettings()->updateOrCreate(
+                ['setting' => 'talentbuildtype'],
+                ['value' => $talentbuildtype]
+            );
+        }
         return ['success' => true];
     }
 

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -21,6 +21,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \App\Http\Middleware\SetGlobalDataValues::class,
     ];
 
     /**

diff --git a/app/Http/Middleware/SetGlobalDataValues.php b/app/Http/Middleware/SetGlobalDataValues.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Services\GlobalDataService;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class SetGlobalDataValues
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        $globalDataService = new GlobalDataService();
+        $globalDataService->calculateMaxReplayNumber();
+        $globalDataService->getLatestPatch();
+        $globalDataService->getLatestGameDate();
+        $globalDataService->getHeaderAlert();
+
+        return $next($request);
+    }
+}