Merge pull request #1009 from Heroes-Profile/develop

Heroes Profile v1.0.9
Heroes-Profile · May 16, 2024 · 62a6c57 · 62a6c57
2 parents c25213e + c06d02d
commit 62a6c57
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 # Heroes Profile
 [Master Heroes Profile](https://www.heroesprofile.com/)(master branch)
 
-This public repository is the site re-write for [Heroes Profile](https://www.heroesprofile.com/) and is not currently in production.
-
 # Cloning the Heroes Profile repository
 
 -   `git clone --recursive https://github.com/Heroes-Profile/heroesprofile.git`

diff --git a/app/Http/Controllers/Player/PlayerHeroesMapsRolesController.php b/app/Http/Controllers/Player/PlayerHeroesMapsRolesController.php
@@ -782,7 +782,7 @@ public function getData(Request $request)
 
         if ($minimum_games && $minimum_games > 0) {
             $filteredData = array_filter($returnData, function ($item) use ($minimum_games) {
-                return $item['games_played'] > $minimum_games;
+                return $item['games_played'] >= $minimum_games;
             });
 
             $returnData = array_values($filteredData);

diff --git a/app/Http/Middleware/CheckIfPatreonSupporter.php b/app/Http/Middleware/CheckIfPatreonSupporter.php
@@ -35,6 +35,10 @@ public function handle(Request $request, Closure $next): Response
                 }
             }
 
+            if($user->flair_adfree_override == 1){
+              session(['patreonSubscriberAdFree' => true]);
+              session(['patreonSubscriberSiteFlair' => true]);
+            }
         }
 
         return $next($request);

diff --git a/app/Http/Middleware/LogIPAndUserAgent.php b/app/Http/Middleware/LogIPAndUserAgent.php
@@ -7,6 +7,8 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cookie;
 use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Support\Facades\Auth;
+use App\Models\BattlenetAccount;
 
 class LogIPAndUserAgent
 {
@@ -17,6 +19,10 @@ class LogIPAndUserAgent
      */
     public function handle(Request $request, Closure $next): Response
     {
+
+        //$user = BattlenetAccount::find(1);
+        //Auth::login($user);
+
         try {
             Cookie::queue(Cookie::forget('additional-battletags'));
             $ip = '';

diff --git a/app/Models/BattlenetAccount.php b/app/Models/BattlenetAccount.php
@@ -28,6 +28,7 @@ class BattlenetAccount extends Authenticatable
         'updated_at',
         'created_at',
         'private',
+        'flair_adfree_override',
     ];
 
     public function patreonAccount()