Merge branch 'master' into beatmapset-search-docs-title

Author: notbakaneko

app/Models/Beatmap.php

@@ -9,7 +9,6 @@
 use App\Jobs\EsDocument;
 use App\Libraries\Transactions\AfterCommit;
 use App\Traits\Memoizes;
-use DB;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -166,21 +165,18 @@ public function scopeScoreable($query)
 
     public function scopeWithMaxCombo($query)
     {
-        $mods = BeatmapDifficultyAttrib::NO_MODS;
-        $attrib = BeatmapDifficultyAttrib::MAX_COMBO;
-        $attribTable = (new BeatmapDifficultyAttrib())->tableName();
-        $mode = $this->qualifyColumn('playmode');
-        $id = $this->qualifyColumn('beatmap_id');
-
-        return $query
-            ->addSelect(['attrib_max_combo' => DB::raw("(
-                SELECT value
-                FROM {$attribTable}
-                WHERE beatmap_id = {$id}
-                    AND mode = {$mode}
-                    AND mods = {$mods}
-                    AND attrib_id = {$attrib}
-            )")]);
+        $valueQuery = BeatmapDifficultyAttrib
+            ::select('value')
+            ->whereColumn([
+                'beatmap_id' => $this->qualifyColumn('beatmap_id'),
+                'mode' => $this->qualifyColumn('playmode'),
+            ])
+            ->where([
+                'attrib_id' => BeatmapDifficultyAttrib::MAX_COMBO,
+                'mods' => BeatmapDifficultyAttrib::NO_MODS,
+            ]);
+
+        return $query->addSelect(['attrib_max_combo' => $valueQuery]);
     }
 
     public function scopeWithUserPlaycount(Builder $query, ?int $userId): Builder

resources/css/bem/profile-extra-recent-infringements.less

@@ -76,9 +76,5 @@
 
   &__actor {
     color: @osu-colour-l1;
-
-    &::before {
-      content: "";
-    }
   }
 }

resources/js/profile-page/account-standing.tsx

@@ -43,6 +43,7 @@ const ColumnDescription = ({ history }: ColumnProps) => (
 
     {history.actor != null && (
       <span className={`${bn}__actor`}>
+        {' '}
         <StringWithComponent
           mappings={{ username: <UserLink user={history.actor} /> }}
           pattern={trans('users.show.extra.account_standing.recent_infringements.actor')}