Skip to content

Commit b6ddc89

Browse files
notbakanekonotbakaneko
authored
Merge branch 'master' into beatmap-scores-count
2 parents da8cbdd + 63290b6 commit b6ddc89

File tree

13 files changed

+79
-31
lines changed

13 files changed

+79
-31
lines changed

‎app/Http/Controllers/BeatmapsController.php

+10-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class BeatmapsController extends Controller
2525
{
26-
const DEFAULT_API_INCLUDES = ['beatmapset.ratings', 'failtimes', 'max_combo', 'owners'];
26+
const DEFAULT_API_INCLUDES = ['beatmapset.ratings', 'current_user_playcount', 'failtimes', 'max_combo', 'owners'];
2727
const DEFAULT_SCORE_INCLUDES = ['user', 'user.country', 'user.cover', 'user.team'];
2828

2929
public function __construct()
@@ -216,6 +216,7 @@ public function index()
216216
$beatmaps = Beatmap
217217
::whereIn('beatmap_id', $ids)
218218
->whereHas('beatmapset')
219+
->withUserPlaycount(\Auth::id())
219220
->with([
220221
'beatmapOwners.user',
221222
'beatmapset',
@@ -259,7 +260,10 @@ public function lookup()
259260
$params = get_params(request()->all(), null, ['checksum:string', 'filename:string', 'id:int']);
260261

261262
foreach ($params as $key => $value) {
262-
$beatmap = Beatmap::whereHas('beatmapset')->firstWhere($keyMap[$key], $value);
263+
$beatmap = Beatmap
264+
::whereHas('beatmapset')
265+
->withUserPlaycount(\Auth::id())
266+
->firstWhere($keyMap[$key], $value);
263267

264268
if ($beatmap !== null) {
265269
break;
@@ -297,7 +301,10 @@ public function lookup()
297301
*/
298302
public function show($id)
299303
{
300-
$beatmap = Beatmap::whereHas('beatmapset')->findOrFail($id);
304+
$beatmap = Beatmap
305+
::whereHas('beatmapset')
306+
->withUserPlaycount(\Auth::id())
307+
->findOrFail($id);
301308

302309
if (is_api_request()) {
303310
return json_item($beatmap, new BeatmapTransformer(), static::DEFAULT_API_INCLUDES);

‎app/Http/Controllers/BeatmapsetsController.php

+2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ public function show($id)
112112
}
113113

114114
/**
115+
* Search Beatmapset
116+
*
115117
* TODO: documentation
116118
*
117119
* @usesCursor

‎app/Models/Beatmap.php

+34-15
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use App\Jobs\EsDocument;
1010
use App\Libraries\Transactions\AfterCommit;
1111
use App\Traits\Memoizes;
12-
use DB;
1312
use Illuminate\Database\Eloquent\Builder;
1413
use Illuminate\Database\Eloquent\Collection;
1514
use Illuminate\Database\Eloquent\SoftDeletes;
@@ -166,21 +165,32 @@ public function scopeScoreable($query)
166165

167166
public function scopeWithMaxCombo($query)
168167
{
169-
$mods = BeatmapDifficultyAttrib::NO_MODS;
170-
$attrib = BeatmapDifficultyAttrib::MAX_COMBO;
171-
$attribTable = (new BeatmapDifficultyAttrib())->tableName();
172-
$mode = $this->qualifyColumn('playmode');
173-
$id = $this->qualifyColumn('beatmap_id');
168+
$valueQuery = BeatmapDifficultyAttrib
169+
::select('value')
170+
->whereColumn([
171+
'beatmap_id' => $this->qualifyColumn('beatmap_id'),
172+
'mode' => $this->qualifyColumn('playmode'),
173+
])
174+
->where([
175+
'attrib_id' => BeatmapDifficultyAttrib::MAX_COMBO,
176+
'mods' => BeatmapDifficultyAttrib::NO_MODS,
177+
]);
174178

175-
return $query
176-
->select(DB::raw("*, (
177-
SELECT value
178-
FROM {$attribTable}
179-
WHERE beatmap_id = {$id}
180-
AND mode = {$mode}
181-
AND mods = {$mods}
182-
AND attrib_id = {$attrib}
183-
) AS attrib_max_combo"));
179+
return $query->addSelect(['attrib_max_combo' => $valueQuery]);
180+
}
181+
182+
public function scopeWithUserPlaycount(Builder $query, ?int $userId): Builder
183+
{
184+
if ($userId === null) {
185+
$countQuery = \DB::query()->selectRaw('null');
186+
} else {
187+
$countQuery = BeatmapPlaycount
188+
::where('user_id', $userId)
189+
->whereColumn('beatmap_id', $this->qualifyColumn('beatmap_id'))
190+
->select('playcount');
191+
}
192+
193+
return $query->addSelect(['user_playcount' => $countQuery]);
184194
}
185195

186196
public function scopeWithUserTagIds($query, ?int $userId)
@@ -309,6 +319,15 @@ public function getAttribute($key)
309319
};
310320
}
311321

322+
public function getUserPlaycount(): int
323+
{
324+
if (!array_key_exists('user_playcount', $this->attributes)) {
325+
throw new \Exception('withUserPlaycount scope is required');
326+
}
327+
328+
return $this->attributes['user_playcount'] ?? 0;
329+
}
330+
312331
/**
313332
* Requires calling withUserTagIds scope to populate user_tag_ids
314333
*

‎app/Transformers/BeatmapCompactTransformer.php

+7
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
use App\Models\BeatmapFailtimes;
1010
use App\Models\DeletedUser;
1111
use App\Models\User;
12+
use League\Fractal\Resource\ResourceInterface;
1213

1314
class BeatmapCompactTransformer extends TransformerAbstract
1415
{
1516
protected array $availableIncludes = [
1617
'beatmapset',
1718
'checksum',
19+
'current_user_playcount',
1820
'current_user_tag_ids',
1921
'failtimes',
2022
'max_combo',
@@ -53,6 +55,11 @@ public function includeChecksum(Beatmap $beatmap)
5355
return $this->primitive($beatmap->checksum);
5456
}
5557

58+
public function includeCurrentUserPlaycount(Beatmap $beatmap): ResourceInterface
59+
{
60+
return $this->primitive($beatmap->getUserPlaycount());
61+
}
62+
5663
public function includeCurrentUserTagIds(Beatmap $beatmap)
5764
{
5865
return $this->primitive($beatmap->getUserTagIds());

‎app/Transformers/BeatmapsetTransformer.php

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public function transform(Beatmapset $beatmapset)
4040
'nominations_summary' => $nominationsSummary,
4141
'ranked' => $beatmapset->approved,
4242
'ranked_date' => $beatmapset->approved_date_json,
43+
'rating' => $beatmapset->rating,
4344
'storyboard' => $beatmapset->storyboard,
4445
'submitted_date' => $beatmapset->submit_date_json,
4546
'tags' => $beatmapset->tags,

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

-4
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,5 @@
7676

7777
&__actor {
7878
color: @osu-colour-l1;
79-
80-
&::before {
81-
content: "";
82-
}
8379
}
8480
}

‎resources/js/beatmapsets-show/stats.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ export default class Stats extends React.Component<Props> {
6767

6868
{this.props.controller.beatmapset.is_scoreable &&
6969
<div className='beatmapset-stats__row beatmapset-stats__row--rating'>
70-
<div className='beatmapset-stats__rating-header'>{trans('beatmapsets.show.stats.user-rating')}</div>
70+
<div className='beatmapset-stats__rating-header'>
71+
{trans('beatmapsets.show.stats.user-rating')}
72+
{' '}
73+
({formatNumber(this.props.controller.beatmapset.rating, 2)})
74+
</div>
7175

7276
{this.renderRatingBar()}
7377

‎resources/js/interfaces/beatmapset-extended-json.ts

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ interface BeatmapsetExtendedJsonAdditionalAttributes {
2727
nominations_summary: NominationsSummary;
2828
ranked: number;
2929
ranked_date: string | null;
30+
rating: number;
3031
storyboard: boolean;
3132
submitted_date: string | null;
3233
tags: string;

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

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const ColumnDescription = ({ history }: ColumnProps) => (
4343

4444
{history.actor != null && (
4545
<span className={`${bn}__actor`}>
46+
{' '}
4647
<StringWithComponent
4748
mappings={{ username: <UserLink user={history.actor} /> }}
4849
pattern={trans('users.show.extra.account_standing.recent_infringements.actor')}

‎resources/lang/en/teams.php

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
'applications' => [
9797
'empty' => 'No join requests at the moment.',
9898
'empty_slots' => 'Available slots',
99+
'empty_slots_overflow' => ':count_delimited user overflow|:count_delimited users overflow',
99100
'title' => 'Join Requests',
100101
'created_at' => 'Requested At',
101102
],

‎resources/views/docs/_structures/beatmap.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ version | string | |
1515

1616
Optional attributes:
1717

18-
Field | Type | Description
19-
----------- | -------------------------------------------------------------------------- | -----------
20-
beatmapset | [Beatmapset](#beatmapset)\|[BeatmapsetExtended](#beatmapsetextended)\|null | `Beatmapset` for `Beatmap` object, `BeatmapsetExtended` for `BeatmapExtended` object. `null` if the beatmap doesn't have associated beatmapset (e.g. deleted).
21-
checksum | string? | |
22-
failtimes | [Failtimes](#beatmap-failtimes) | |
23-
max_combo | integer | |
24-
owners | [BeatmapOwner](#beatmapowner)[] | List of owners (mappers) for the Beatmap.
18+
Field | Type | Description
19+
---------------------- | -------------------------------------------------------------------------- | -----------
20+
beatmapset | [Beatmapset](#beatmapset)\|[BeatmapsetExtended](#beatmapsetextended)\|null | `Beatmapset` for `Beatmap` object, `BeatmapsetExtended` for `BeatmapExtended` object. `null` if the beatmap doesn't have associated beatmapset (e.g. deleted).
21+
checksum | string? | |
22+
current_user_playcount | integer | |
23+
failtimes | [Failtimes](#beatmap-failtimes) | |
24+
max_combo | integer | |
25+
owners | [BeatmapOwner](#beatmapowner)[] | List of owners (mappers) for the Beatmap.
2526

2627
<div id="beatmap-failtimes" data-unique="beatmap-failtimes"></div>
2728

‎resources/views/docs/_structures/beatmapset_extended.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ nominations_summary.current | integer | |
2020
nominations_summary.required | integer | |
2121
ranked | integer | See [Rank status](#beatmapset-rank-status) for list of possible values.
2222
ranked_date | [Timestamp](#timestamp)? | |
23+
rating | float | |
2324
source | string | |
2425
storyboard | boolean | |
2526
submitted_date | [Timestamp](#timestamp)? | |

‎resources/views/teams/members/index.blade.php

+8-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,14 @@ class="btn-osu-big btn-osu-big--rounded-small"
8484
{{ osu_trans('teams.members.index.applications.title') }}
8585
</h2>
8686
<p>
87-
{{ osu_trans('teams.members.index.applications.empty_slots') }}: {{ i18n_number_format($team->emptySlots()) }}
87+
{{ osu_trans('teams.members.index.applications.empty_slots') }}:
88+
@php
89+
$emptySlots = $team->emptySlots();
90+
@endphp
91+
{{ i18n_number_format(max(0, $emptySlots)) }}
92+
@if ($emptySlots < 0)
93+
({{ osu_trans_choice('teams.members.index.applications.empty_slots_overflow', -$emptySlots) }})
94+
@endif
8895
</p>
8996
@if ($team->applications->isEmpty())
9097
{{ osu_trans('teams.members.index.applications.empty') }}

0 commit comments

Comments
 (0)