Merge pull request #3146 from notbakaneko/fix/modding-history-everyon…

…e-is-the-same Fix modding history not applying user filter
ppy · May 8, 2018 · a4848ae · a4848ae
2 parents 34b3b53 + 056ec2d
commit a4848ae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Controllers/Users/ModdingHistoryController.php b/app/Http/Controllers/Users/ModdingHistoryController.php
@@ -47,7 +47,7 @@ public function __construct()
                 abort(404);
             }
 
-            $this->searchParams = request()->all();
+            $this->searchParams = array_merge(['user' => $this->user->user_id], request()->query());
             $this->searchParams['is_moderator'] = $this->isModerator;
 
             if (!$this->isModerator) {

diff --git a/app/Models/BeatmapDiscussion.php b/app/Models/BeatmapDiscussion.php
@@ -105,7 +105,7 @@ public static function search($rawParams = [])
             $query->withoutDeleted();
         }
 
-        if (!($params['is_moderator'] ?? false)) {
+        if (!($rawParams['is_moderator'] ?? false)) {
             $query->whereHas('user', function ($userQuery) {
                 $userQuery->default();
             });

diff --git a/app/Models/BeatmapDiscussionPost.php b/app/Models/BeatmapDiscussionPost.php
@@ -97,7 +97,7 @@ public static function search($rawParams = [])
             $query->withoutDeleted();
         }
 
-        if (!($params['is_moderator'] ?? false)) {
+        if (!($rawParams['is_moderator'] ?? false)) {
             $query->whereHas('user', function ($userQuery) {
                 $userQuery->default();
             });

diff --git a/app/Models/BeatmapDiscussionVote.php b/app/Models/BeatmapDiscussionVote.php
@@ -115,7 +115,7 @@ public static function search($rawParams = [])
             }
         }
 
-        if (!($params['is_moderator'] ?? false)) {
+        if (!($rawParams['is_moderator'] ?? false)) {
             $query->whereHas('user', function ($userQuery) {
                 $userQuery->default();
             });