From b008e65f9001b55a5e7d253f42a8fdb639710982 Mon Sep 17 00:00:00 2001 From: Xetera Date: Thu, 22 Apr 2021 20:57:15 +0300 Subject: [PATCH 001/470] feature: added english rank_summary translations --- resources/lang/en/users.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/users.php b/resources/lang/en/users.php index 4197692922c..3cc90ad1700 100644 --- a/resources/lang/en/users.php +++ b/resources/lang/en/users.php @@ -141,6 +141,7 @@ ], 'show' => [ 'age' => ':age years old', + 'rank_summary' => ':username is rank :global worldwide and rank :local in :country.', 'change_avatar' => 'change your avatar!', 'first_members' => 'Here since the beginning', 'is_developer' => 'osu!developer', From ad5f2c37047bc802e31de1919d810752bcf8ca0f Mon Sep 17 00:00:00 2001 From: Xetera Date: Thu, 22 Apr 2021 20:57:44 +0300 Subject: [PATCH 002/470] feature: updated user profile template --- resources/views/users/show.blade.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php index 227b8546a0c..ed6f6abedf9 100644 --- a/resources/views/users/show.blade.php +++ b/resources/views/users/show.blade.php @@ -3,8 +3,19 @@ See the LICENCE file in the repository root for full licence text. --}} @extends('master', [ + 'canonicalUrl' => $user->url(), 'titlePrepend' => blade_safe(str_replace(' ', ' ', e($user->username))), - 'pageDescription' => page_description($user->username), + 'pageDescription' => trans('users.show.rank_summary', [ + 'username' => $user->username, + 'global' => $data["statistics"]["global_rank"], + 'local' => $data["statistics"]["country_rank"], + 'country' => $data["country"]["name"], + ]), + 'opengraph' => [ + 'title' => $user->username . "'s Profile", + 'image' => str_replace('http://localhost:8080', 'https://ffvyiglk.tunnelto.dev', $data["avatar_url"]) + // 'image' => json_encode($data), + ] ]) @section('content') From 22429d4971f34474d8e80c23d9207e513bd75388 Mon Sep 17 00:00:00 2001 From: Xetera Date: Thu, 22 Apr 2021 21:00:30 +0300 Subject: [PATCH 003/470] refactor: moved hardcoded title to translations --- resources/views/users/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php index ed6f6abedf9..d4834439c1a 100644 --- a/resources/views/users/show.blade.php +++ b/resources/views/users/show.blade.php @@ -12,7 +12,7 @@ 'country' => $data["country"]["name"], ]), 'opengraph' => [ - 'title' => $user->username . "'s Profile", + 'title' => trans('users.show.title', ["username" => $user->username]), 'image' => str_replace('http://localhost:8080', 'https://ffvyiglk.tunnelto.dev', $data["avatar_url"]) // 'image' => json_encode($data), ] From 52ed55cc99048fe11bc274696e694165963ef467 Mon Sep 17 00:00:00 2001 From: Xetera Date: Thu, 22 Apr 2021 21:04:58 +0300 Subject: [PATCH 004/470] refactor: cleaned up template --- resources/views/users/show.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php index d4834439c1a..1a14db4d3ff 100644 --- a/resources/views/users/show.blade.php +++ b/resources/views/users/show.blade.php @@ -13,8 +13,7 @@ ]), 'opengraph' => [ 'title' => trans('users.show.title', ["username" => $user->username]), - 'image' => str_replace('http://localhost:8080', 'https://ffvyiglk.tunnelto.dev', $data["avatar_url"]) - // 'image' => json_encode($data), + 'image' => $data["avatar_url"] ] ]) From 47cea08f6d73ef6347015aa34d49e76caca08fcf Mon Sep 17 00:00:00 2001 From: Xetera Date: Sat, 24 Apr 2021 03:19:58 +0300 Subject: [PATCH 005/470] refactor: changed description formatting --- resources/views/users/show.blade.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php index 1a14db4d3ff..ea82e06cf0a 100644 --- a/resources/views/users/show.blade.php +++ b/resources/views/users/show.blade.php @@ -2,21 +2,27 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} + +@php + $userData = $jsonChunks["user"]; + $stats = $userData["statistics"]; + $globalRankLabel = trans('users.show.rank.global_simple'); + $globalRankValue = number_format($stats["global_rank"]); + $countryRankLabel = trans('users.show.rank.country_simple'); + $countryRankValue = number_format($stats["country_rank"]); +@endphp + @extends('master', [ 'canonicalUrl' => $user->url(), 'titlePrepend' => blade_safe(str_replace(' ', ' ', e($user->username))), - 'pageDescription' => trans('users.show.rank_summary', [ - 'username' => $user->username, - 'global' => $data["statistics"]["global_rank"], - 'local' => $data["statistics"]["country_rank"], - 'country' => $data["country"]["name"], - ]), + 'pageDescription' => "{$globalRankLabel}: #{$globalRankValue}\n{$countryRankLabel}: #{$countryRankValue}", 'opengraph' => [ 'title' => trans('users.show.title', ["username" => $user->username]), - 'image' => $data["avatar_url"] + 'image' => $userData["avatar_url"] ] ]) + @section('content') @if (Auth::user() && Auth::user()->isAdmin() && $user->isRestricted()) @include('objects._notification_banner', [ @@ -29,6 +35,7 @@
@endsection + @section ("script") @parent From b09612429e48b6c67bf9da33bdd915cadda35b1c Mon Sep 17 00:00:00 2001 From: Xetera Date: Sat, 24 Apr 2021 03:46:32 +0300 Subject: [PATCH 006/470] cleanup: extra spacing --- resources/views/users/show.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php index ea82e06cf0a..dc21bf15b54 100644 --- a/resources/views/users/show.blade.php +++ b/resources/views/users/show.blade.php @@ -22,7 +22,6 @@ ] ]) - @section('content') @if (Auth::user() && Auth::user()->isAdmin() && $user->isRestricted()) @include('objects._notification_banner', [ @@ -35,7 +34,6 @@
@endsection - @section ("script") @parent From bd1c78eb6d370563313722c29c53339841e44caf Mon Sep 17 00:00:00 2001 From: Xetera Date: Sat, 24 Apr 2021 03:48:28 +0300 Subject: [PATCH 007/470] cleanup: removed unused translation --- resources/lang/en/users.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/lang/en/users.php b/resources/lang/en/users.php index 3cc90ad1700..4197692922c 100644 --- a/resources/lang/en/users.php +++ b/resources/lang/en/users.php @@ -141,7 +141,6 @@ ], 'show' => [ 'age' => ':age years old', - 'rank_summary' => ':username is rank :global worldwide and rank :local in :country.', 'change_avatar' => 'change your avatar!', 'first_members' => 'Here since the beginning', 'is_developer' => 'osu!developer', From ab4404590b2e335e33fd2021d403adaa6b83057e Mon Sep 17 00:00:00 2001 From: clayton Date: Sun, 6 Nov 2022 12:24:17 -0800 Subject: [PATCH 008/470] Clean up GithubUser model and transformer --- app/Models/GithubUser.php | 52 ++++++++++++++++------ app/Transformers/GithubUserTransformer.php | 8 ++-- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/app/Models/GithubUser.php b/app/Models/GithubUser.php index b293e7fbf83..5fa43465bb0 100644 --- a/app/Models/GithubUser.php +++ b/app/Models/GithubUser.php @@ -3,21 +3,28 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. +declare(strict_types=1); + namespace App\Models; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; + /** * @property int|null $canonical_id - * @property \Illuminate\Database\Eloquent\Collection $changelogEntries ChangelogEntry + * @property-read \Illuminate\Database\Eloquent\Collection $changelogEntries * @property \Carbon\Carbon|null $created_at + * @property-read string|null $created_at_json * @property int $id * @property \Carbon\Carbon|null $updated_at - * @property User $user + * @property-read string|null $updated_at_json + * @property-read User|null $user * @property int|null $user_id * @property string|null $username */ class GithubUser extends Model { - public static function importFromGithub($data) + public static function importFromGithub(array $data): static { $githubUser = static::where('canonical_id', '=', $data['id'])->first(); @@ -39,39 +46,58 @@ public static function importFromGithub($data) return $githubUser; } - public function user() + public function changelogEntries(): HasMany { - return $this->belongsTo(User::class, 'user_id'); + return $this->hasMany(ChangelogEntry::class); } - public function changelogEntries() + public function user(): BelongsTo { - return $this->hasMany(ChangelogEntry::class); + return $this->belongsTo(User::class, 'user_id'); } - public function displayName() + public function displayName(): string { return presence($this->username) - ?? optional($this->user)->username + ?? $this->osuUsername() ?? '[no name]'; } - public function githubUrl() + public function githubUrl(): ?string { if (present($this->username)) { return "https://github.com/{$this->username}"; } } - public function userUrl() + public function osuUsername(): ?string + { + return $this->user?->username; + } + + public function userUrl(): ?string { if ($this->user_id !== null) { return route('users.show', $this->user_id); } } - public function url() + public function getAttribute($key) { - return $this->githubUrl() ?? $this->userUrl(); + return match ($key) { + 'canonical_id', + 'id', + 'user_id', + 'username' => $this->getRawAttribute($key), + + 'created_at', + 'updated_at' => $this->getTimeFast($key), + + 'created_at_json', + 'updated_at_json' => $this->getJsonTimeFast($key), + + 'changelogEntries', + 'user' => $this->getRelationValue($key), + }; } } diff --git a/app/Transformers/GithubUserTransformer.php b/app/Transformers/GithubUserTransformer.php index 14470631888..291743f891a 100644 --- a/app/Transformers/GithubUserTransformer.php +++ b/app/Transformers/GithubUserTransformer.php @@ -3,19 +3,21 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. +declare(strict_types=1); + namespace App\Transformers; use App\Models\GithubUser; class GithubUserTransformer extends TransformerAbstract { - public function transform(GithubUser $githubUser) + public function transform(GithubUser $githubUser): array { return [ - 'id' => $githubUser->getKey(), 'display_name' => $githubUser->displayName(), 'github_url' => $githubUser->githubUrl(), - 'osu_username' => optional($githubUser->user)->username, + 'id' => $githubUser->getKey(), + 'osu_username' => $githubUser->osuUsername(), 'user_id' => $githubUser->user_id, 'user_url' => $githubUser->userUrl(), ]; From d478ea9078a9c803a40a533cb118e63bdd821fb8 Mon Sep 17 00:00:00 2001 From: clayton Date: Sun, 6 Nov 2022 12:24:18 -0800 Subject: [PATCH 009/470] Add User associate option to `GithubUser::importFromGithub()` --- app/Models/GithubUser.php | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/app/Models/GithubUser.php b/app/Models/GithubUser.php index 5fa43465bb0..764206d569d 100644 --- a/app/Models/GithubUser.php +++ b/app/Models/GithubUser.php @@ -24,26 +24,25 @@ */ class GithubUser extends Model { - public static function importFromGithub(array $data): static + public static function importFromGithub(array $apiUser, ?User $user = null): static { - $githubUser = static::where('canonical_id', '=', $data['id'])->first(); + $params = [ + 'canonical_id' => $apiUser['id'], + 'username' => $apiUser['login'], + ]; + if ($user !== null) { + $params['user_id'] = $user->getKey(); + } + + $githubUser = static::where('canonical_id', $params['canonical_id'])->first() + ?? static::where('username', $params['username'])->last(); - if (isset($githubUser)) { - $githubUser->update(['username' => $data['login']]); + if ($githubUser === null) { + return static::create($params); } else { - $githubUser = static::where('username', '=', $data['login'])->last(); - - if (isset($githubUser)) { - $githubUser->update(['canonical_id' => $data['id']]); - } else { - $githubUser = static::create([ - 'canonical_id' => $data['id'], - 'username' => $data['login'], - ]); - } + $githubUser->update($params); + return $githubUser; } - - return $githubUser; } public function changelogEntries(): HasMany From 72dd9ce34e7c017c1861fd29e125433cb8520bd2 Mon Sep 17 00:00:00 2001 From: clayton Date: Sun, 6 Nov 2022 12:24:18 -0800 Subject: [PATCH 010/470] Add endpoints to link and unlink GitHub accounts from users --- .env.example | 4 + .../Account/GithubUsersController.php | 100 ++++++++++++++++++ config/osu.php | 4 + routes/web.php | 3 + 4 files changed, 111 insertions(+) create mode 100644 app/Http/Controllers/Account/GithubUsersController.php diff --git a/.env.example b/.env.example index ab6adaadaee..197e21ac5ca 100644 --- a/.env.example +++ b/.env.example @@ -104,6 +104,10 @@ PUSHER_SECRET= # GITHUB_TOKEN= +# GitHub client for users to associate their GitHub accounts +# GITHUB_CLIENT_ID= +# GITHUB_CLIENT_SECRET= + # DATADOG_ENABLED=true # DATADOG_PREFIX=osu.web # DATADOG_API_KEY= diff --git a/app/Http/Controllers/Account/GithubUsersController.php b/app/Http/Controllers/Account/GithubUsersController.php new file mode 100644 index 00000000000..b09d30d940b --- /dev/null +++ b/app/Http/Controllers/Account/GithubUsersController.php @@ -0,0 +1,100 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +namespace App\Http\Controllers\Account; + +use App\Http\Controllers\Controller; +use App\Models\GithubUser; +use Github\Client as GithubClient; +use GuzzleHttp\Client as HttpClient; + +class GithubUsersController extends Controller +{ + public function __construct() + { + $this->middleware('auth'); + $this->middleware('verify-user'); + + parent::__construct(); + } + + public function callback() + { + $params = get_params(request()->all(), null, [ + 'code:string', + 'state:string', + ]); + + abort_unless(isset($params['code']), 422, 'Invalid code.'); + abort_unless( + isset($params['state']) && $params['state'] === session()->pull('github_auth_state'), + 403, + 'Invalid state.', + ); + + $tokenResponseBody = (new HttpClient()) + ->request('POST', 'https://github.com/login/oauth/access_token', [ + 'query' => [ + 'client_id' => config('osu.github.client_id'), + 'client_secret' => config('osu.github.client_secret'), + 'code' => $params['code'], + ], + ]) + ->getBody() + ->getContents(); + parse_str($tokenResponseBody, $tokenResponseBodyParams); + $token = $tokenResponseBodyParams['access_token'] ?? null; + + abort_if($token === null, 500, 'Invalid response from GitHub API.'); + + $githubClient = new GithubClient(); + $githubClient->authenticate($token, null, GithubClient::AUTH_ACCESS_TOKEN); + $githubApiUser = $githubClient->currentUser()->show(); + + GithubUser::importFromGithub($githubApiUser, auth()->user()); + + return redirect(route('account.edit').'#github'); + } + + public function create() + { + abort_if( + config('osu.github.client_id') === null || config('osu.github.client_secret') === null, + 404, + ); + abort_if( + auth()->user()->githubUsers()->count() >= 10, + 403, + 'Too many GitHub accounts.', + ); + + $state = bin2hex(random_bytes(32)); + session()->put('github_auth_state', $state); + + return redirect('https://github.com/login/oauth/authorize?'.http_build_query([ + 'allow_signup' => 'false', + 'client_id' => config('osu.github.client_id'), + 'scope' => '', + 'state' => $state, + ])); + } + + public function destroy(int $id) + { + $githubUser = auth()->user()->githubUsers()->findOrFail($id); + + abort_if( + $githubUser->canonical_id === null || $githubUser->username === null, + 422, + 'Cannot unassociate user from GitHub user without a valid ID or username.', + ); + + $githubUser->update(['user_id' => null]); + + return response(null, 204); + } +} diff --git a/config/osu.php b/config/osu.php index cfd52460fb0..2f3c33c7e50 100644 --- a/config/osu.php +++ b/config/osu.php @@ -123,6 +123,10 @@ 'git-sha' => presence(env('GIT_SHA')) ?? (file_exists(__DIR__.'/../version') ? trim(file_get_contents(__DIR__.'/../version')) : null) ?? 'unknown-version', + 'github' => [ + 'client_id' => presence(env('GITHUB_CLIENT_ID')), + 'client_secret' => presence(env('GITHUB_CLIENT_SECRET')), + ], 'is_development_deploy' => get_bool(env('IS_DEVELOPMENT_DEPLOY')) ?? true, 'landing' => [ 'video_url' => env('LANDING_VIDEO_URL', 'https://assets.ppy.sh/media/landing.mp4'), diff --git a/routes/web.php b/routes/web.php index 70def786b13..ec1bd4d906a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -214,6 +214,9 @@ Route::get('verify', 'AccountController@verifyLink'); Route::post('verify', 'AccountController@verify')->name('verify'); Route::put('/', 'AccountController@update')->name('update'); + + Route::get('github-users/callback', 'Account\GithubUsersController@callback'); + Route::resource('github-users', 'Account\GithubUsersController', ['only' => ['create', 'destroy']]); }); Route::get('quick-search', 'HomeController@quickSearch')->name('quick-search'); From 63178a8cf4c28967886c833d4218e3b9a22631d3 Mon Sep 17 00:00:00 2001 From: clayton Date: Sun, 6 Nov 2022 12:24:18 -0800 Subject: [PATCH 011/470] Add GitHub account options to account edit page --- app/Http/Controllers/AccountController.php | 9 +++ app/Transformers/GithubUserTransformer.php | 1 + resources/assets/less/bem-index.less | 1 + resources/assets/less/bem/github-user.less | 15 +++++ .../assets/lib/account-edit/github-user.tsx | 64 +++++++++++++++++++ .../assets/lib/account-edit/github-users.tsx | 53 +++++++++++++++ .../assets/lib/entrypoints/account-edit.tsx | 7 +- .../assets/lib/interfaces/github-user-json.ts | 17 +++++ resources/lang/en/accounts.php | 7 ++ .../accounts/_edit_github_users.blade.php | 24 +++++++ resources/views/accounts/edit.blade.php | 8 +++ 11 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 resources/assets/less/bem/github-user.less create mode 100644 resources/assets/lib/account-edit/github-user.tsx create mode 100644 resources/assets/lib/account-edit/github-users.tsx create mode 100644 resources/assets/lib/interfaces/github-user-json.ts create mode 100644 resources/views/accounts/_edit_github_users.blade.php diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 27635db31e0..37184dddc96 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -113,10 +113,19 @@ public function edit() $notificationOptions = $user->notificationOptions->keyBy('name'); + $githubUsers = json_collection( + $user + ->githubUsers() + ->whereNotNull(['canonical_id', 'username']) + ->get(), + 'GithubUser', + ); + return ext_view('accounts.edit', compact( 'authorizedClients', 'blocks', 'currentSessionId', + 'githubUsers', 'notificationOptions', 'ownClients', 'sessions' diff --git a/app/Transformers/GithubUserTransformer.php b/app/Transformers/GithubUserTransformer.php index 291743f891a..cb8bec41606 100644 --- a/app/Transformers/GithubUserTransformer.php +++ b/app/Transformers/GithubUserTransformer.php @@ -16,6 +16,7 @@ public function transform(GithubUser $githubUser): array return [ 'display_name' => $githubUser->displayName(), 'github_url' => $githubUser->githubUrl(), + 'github_username' => $githubUser->username, 'id' => $githubUser->getKey(), 'osu_username' => $githubUser->osuUsername(), 'user_id' => $githubUser->user_id, diff --git a/resources/assets/less/bem-index.less b/resources/assets/less/bem-index.less index e5e911710b8..9146f5ffd32 100644 --- a/resources/assets/less/bem-index.less +++ b/resources/assets/less/bem-index.less @@ -182,6 +182,7 @@ @import "bem/gallery-thumbnails"; @import "bem/game-mode"; @import "bem/game-mode-link"; +@import "bem/github-user"; @import "bem/grid"; @import "bem/grid-cell"; @import "bem/grid-items"; diff --git a/resources/assets/less/bem/github-user.less b/resources/assets/less/bem/github-user.less new file mode 100644 index 00000000000..c3bf787d90f --- /dev/null +++ b/resources/assets/less/bem/github-user.less @@ -0,0 +1,15 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +.github-user { + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1px solid @osu-colour-b5; + margin-bottom: 10px; + padding-bottom: 10px; + + &__name { + font-size: @font-size--title-small-3; + } +} diff --git a/resources/assets/lib/account-edit/github-user.tsx b/resources/assets/lib/account-edit/github-user.tsx new file mode 100644 index 00000000000..fd5dc4e924f --- /dev/null +++ b/resources/assets/lib/account-edit/github-user.tsx @@ -0,0 +1,64 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +import BigButton from 'components/big-button'; +import { GithubUserJsonForAccountEdit } from 'interfaces/github-user-json'; +import { route } from 'laroute'; +import { action, makeObservable, observable } from 'mobx'; +import { observer } from 'mobx-react'; +import * as React from 'react'; +import { onErrorWithCallback } from 'utils/ajax'; + +interface Props { + onDelete: (id: number) => void; + user: GithubUserJsonForAccountEdit; +} + +@observer +export default class GithubUser extends React.Component { + @observable private deleting = false; + private xhr?: JQuery.jqXHR; + + constructor(props: Props) { + super(props); + makeObservable(this); + } + + componentWillUnmount() { + this.xhr?.abort(); + } + + render() { + return ( + + ); + } + + @action + private onDeleteButtonClick = () => { + this.xhr?.abort(); + this.deleting = true; + + this.xhr = $.ajax( + route('account.github-users.destroy', { github_user: this.props.user.id }), + { method: 'DELETE' }, + ) + .done(() => this.props.onDelete(this.props.user.id)) + .fail(onErrorWithCallback(this.onDeleteButtonClick)) + .always(action(() => this.deleting = false)); + }; +} diff --git a/resources/assets/lib/account-edit/github-users.tsx b/resources/assets/lib/account-edit/github-users.tsx new file mode 100644 index 00000000000..74e99689746 --- /dev/null +++ b/resources/assets/lib/account-edit/github-users.tsx @@ -0,0 +1,53 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +import BigButton from 'components/big-button'; +import { GithubUserJsonForAccountEdit } from 'interfaces/github-user-json'; +import { route } from 'laroute'; +import { action, makeObservable, observable } from 'mobx'; +import { observer } from 'mobx-react'; +import * as React from 'react'; +import GithubUser from './github-user'; + +interface Props { + users: GithubUserJsonForAccountEdit[]; +} + +@observer +export default class GithubUsers extends React.Component { + @observable private users: GithubUserJsonForAccountEdit[]; + + constructor(props: Props) { + super(props); + + this.users = props.users; + + makeObservable(this); + } + + render() { + return ( + <> + {this.users.length === 0 + ?
{osu.trans('accounts.github_users.none')}
+ : this.users.map((user) => ( + + ))} + + + ); + } + + @action + private onDelete = (id: number) => { + this.users = this.users.filter((user) => user.id !== id); + }; +} diff --git a/resources/assets/lib/entrypoints/account-edit.tsx b/resources/assets/lib/entrypoints/account-edit.tsx index 919250dfd24..d4ca2d06b65 100644 --- a/resources/assets/lib/entrypoints/account-edit.tsx +++ b/resources/assets/lib/entrypoints/account-edit.tsx @@ -1,13 +1,14 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. +import GithubUsers from 'account-edit/github-users'; import { ClientJson } from 'interfaces/client-json'; import { OwnClientJson } from 'interfaces/own-client-json'; import { AuthorizedClients } from 'oauth/authorized-clients'; import { OwnClients } from 'oauth/own-clients'; import core from 'osu-core-singleton'; import * as React from 'react'; -import { parseJsonNullable } from 'utils/json'; +import { parseJson, parseJsonNullable } from 'utils/json'; core.reactTurbolinks.register('authorized-clients', () => { const json = parseJsonNullable('json-authorized-clients', true); @@ -18,6 +19,10 @@ core.reactTurbolinks.register('authorized-clients', () => { return ; }); +core.reactTurbolinks.register('github-users', () => ( + +)); + core.reactTurbolinks.register('own-clients', () => { const json = parseJsonNullable('json-own-clients', true); if (json != null) { diff --git a/resources/assets/lib/interfaces/github-user-json.ts b/resources/assets/lib/interfaces/github-user-json.ts new file mode 100644 index 00000000000..f6293aeadf9 --- /dev/null +++ b/resources/assets/lib/interfaces/github-user-json.ts @@ -0,0 +1,17 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +export type GithubUserJsonForAccountEdit = GithubUserJson & { + github_url: string; + github_username: string; +}; + +export default interface GithubUserJson { + display_name: string; + github_url: string | null; + github_username: string | null; + id: number; + osu_username: string | null; + user_id: number | null; + user_url: string | null; +} diff --git a/resources/lang/en/accounts.php b/resources/lang/en/accounts.php index 627d07d9fa9..dd534823187 100644 --- a/resources/lang/en/accounts.php +++ b/resources/lang/en/accounts.php @@ -46,6 +46,13 @@ ], ], + 'github_users' => [ + 'accounts' => 'accounts', + 'link' => 'Link GitHub account', + 'none' => 'No GitHub accounts', + 'title' => 'GitHub', + ], + 'notifications' => [ 'beatmapset_discussion_qualified_problem' => 'receive notifications for new problems on qualified beatmaps of the following modes', 'beatmapset_disqualify' => 'receive notifications for when beatmaps of the following modes are disqualified', diff --git a/resources/views/accounts/_edit_github_users.blade.php b/resources/views/accounts/_edit_github_users.blade.php new file mode 100644 index 00000000000..6f75f11fe02 --- /dev/null +++ b/resources/views/accounts/_edit_github_users.blade.php @@ -0,0 +1,24 @@ +{{-- + Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. + See the LICENCE file in the repository root for full licence text. +--}} + diff --git a/resources/views/accounts/edit.blade.php b/resources/views/accounts/edit.blade.php index d642afc39b9..184f54f8e89 100644 --- a/resources/views/accounts/edit.blade.php +++ b/resources/views/accounts/edit.blade.php @@ -163,6 +163,10 @@ class="js-account-edit-avatar__button fileupload"
@include('accounts._edit_oauth')
+ +
+ @include('accounts._edit_github_users') +
@endsection @section("script") @@ -170,6 +174,10 @@ class="js-account-edit-avatar__button fileupload" {!! json_encode($authorizedClients) !!} + + From 7581e68537b51a6515d664db664c467987e4bf32 Mon Sep 17 00:00:00 2001 From: clayton Date: Sun, 6 Nov 2022 12:24:18 -0800 Subject: [PATCH 012/470] Only show GitHub menu if client info is set --- .../Account/GithubUsersController.php | 5 +---- app/Http/Controllers/AccountController.php | 19 ++++++++++++------- app/Models/GithubUser.php | 6 ++++++ resources/views/accounts/edit.blade.php | 16 ++++++++++------ 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Account/GithubUsersController.php b/app/Http/Controllers/Account/GithubUsersController.php index b09d30d940b..16b1a1b07cc 100644 --- a/app/Http/Controllers/Account/GithubUsersController.php +++ b/app/Http/Controllers/Account/GithubUsersController.php @@ -62,10 +62,7 @@ public function callback() public function create() { - abort_if( - config('osu.github.client_id') === null || config('osu.github.client_secret') === null, - 404, - ); + abort_unless(GithubUser::canAuthenticate(), 404); abort_if( auth()->user()->githubUsers()->count() >= 10, 403, diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 37184dddc96..f8effb7b328 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -11,6 +11,7 @@ use App\Libraries\UserVerificationState; use App\Mail\UserEmailUpdated; use App\Mail\UserPasswordUpdated; +use App\Models\GithubUser; use App\Models\OAuth\Client; use App\Models\UserAccountHistory; use App\Models\UserNotificationOption; @@ -113,13 +114,17 @@ public function edit() $notificationOptions = $user->notificationOptions->keyBy('name'); - $githubUsers = json_collection( - $user - ->githubUsers() - ->whereNotNull(['canonical_id', 'username']) - ->get(), - 'GithubUser', - ); + if (GithubUser::canAuthenticate()) { + $githubUsers = json_collection( + $user + ->githubUsers() + ->whereNotNull(['canonical_id', 'username']) + ->get(), + 'GithubUser', + ); + } else { + $githubUsers = null; + } return ext_view('accounts.edit', compact( 'authorizedClients', diff --git a/app/Models/GithubUser.php b/app/Models/GithubUser.php index 764206d569d..d648f4a08dd 100644 --- a/app/Models/GithubUser.php +++ b/app/Models/GithubUser.php @@ -24,6 +24,12 @@ */ class GithubUser extends Model { + public static function canAuthenticate(): bool + { + return config('osu.github.client_id') !== null + && config('osu.github.client_secret') !== null; + } + public static function importFromGithub(array $apiUser, ?User $user = null): static { $params = [ diff --git a/resources/views/accounts/edit.blade.php b/resources/views/accounts/edit.blade.php index 184f54f8e89..52939d6823e 100644 --- a/resources/views/accounts/edit.blade.php +++ b/resources/views/accounts/edit.blade.php @@ -164,9 +164,11 @@ class="js-account-edit-avatar__button fileupload" @include('accounts._edit_oauth') -
- @include('accounts._edit_github_users') -
+ @if (\App\Models\GithubUser::canAuthenticate()) +
+ @include('accounts._edit_github_users') +
+ @endif @endsection @section("script") @@ -174,9 +176,11 @@ class="js-account-edit-avatar__button fileupload" {!! json_encode($authorizedClients) !!} - + @if (\App\Models\GithubUser::canAuthenticate()) + + @endif @if (\App\Models\GithubUser::canAuthenticate()) - @endif From 542425814e2ae6d218b06c7622098edf75635070 Mon Sep 17 00:00:00 2001 From: clayton Date: Fri, 9 Dec 2022 18:10:51 -0800 Subject: [PATCH 025/470] Use consistent order for FA tracks --- app/Http/Controllers/ArtistsController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ArtistsController.php b/app/Http/Controllers/ArtistsController.php index fb5407f115e..2a2438ad44b 100644 --- a/app/Http/Controllers/ArtistsController.php +++ b/app/Http/Controllers/ArtistsController.php @@ -40,7 +40,10 @@ public function show($id) ->where('visible', true) ->orderBy('id', 'desc') ->with(['tracks' => function ($query) { - $query->orderBy('display_order', 'ASC'); + $query + ->orderBy('display_order', 'asc') + ->orderBy('exclusive', 'desc') + ->orderBy('id', 'desc'); }]) ->with('tracks.artist') ->get(); @@ -49,6 +52,8 @@ public function show($id) ->tracks() ->whereNull('album_id') ->with('artist') + ->orderBy('display_order', 'asc') + ->orderBy('exclusive', 'desc') ->orderBy('id', 'desc') ->get(); From 4f2f872aa3441c06134856a2cd150541cefb9611 Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Fri, 19 May 2023 04:11:47 +0200 Subject: [PATCH 026/470] dim forum entry content for old posts --- app/Models/Forum/Topic.php | 5 +++++ config/osu.php | 1 + resources/css/bem/forum-topic-entry.less | 7 +++++++ resources/views/forum/forums/_topic.blade.php | 1 + 4 files changed, 14 insertions(+) diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php index 9aa811f627b..6f3f41a7c2f 100644 --- a/app/Models/Forum/Topic.php +++ b/app/Models/Forum/Topic.php @@ -482,6 +482,11 @@ public function deletedPostsCount() }); } + public function isOld() + { + return $this->topic_last_post_time < Carbon::now()->subMonths(config('osu.forum.old_months')); + } + public function isLocked() { // not checking STATUS_LOCK because there's another diff --git a/config/osu.php b/config/osu.php index 74e0948949b..b752b5c2e08 100644 --- a/config/osu.php +++ b/config/osu.php @@ -113,6 +113,7 @@ 'max_post_length' => get_int(env('FORUM_POST_MAX_LENGTH')) ?? 60000, 'minimum_plays' => get_int(env('FORUM_POST_MINIMUM_PLAYS')) ?? 200, 'necropost_months' => 6, + 'old_months' => 1, 'poll_edit_hours' => get_int(env('FORUM_POLL_EDIT_HOURS')) ?? 1, 'double_post_time' => [ diff --git a/resources/css/bem/forum-topic-entry.less b/resources/css/bem/forum-topic-entry.less index 7c456b104f8..d84fb5729a8 100644 --- a/resources/css/bem/forum-topic-entry.less +++ b/resources/css/bem/forum-topic-entry.less @@ -23,6 +23,10 @@ margin-right: -@forum-item-overflow-desktop; padding-left: @forum-item-overflow-desktop; } + + &--old { + color: darkgray; + } &--deleted { opacity: 0.5; @@ -176,6 +180,9 @@ color: @osu-colour-c1; word-wrap: break-word; + .@{_top}--old & { + color: grey; + } .link-hover({ color: @osu-colour-c1; }); diff --git a/resources/views/forum/forums/_topic.blade.php b/resources/views/forum/forums/_topic.blade.php index 3c9804f9146..ea521ba73c2 100644 --- a/resources/views/forum/forums/_topic.blade.php +++ b/resources/views/forum/forums/_topic.blade.php @@ -9,6 +9,7 @@ class=" forum-topic-entry {{ $topic->trashed() ? 'forum-topic-entry--deleted' : '' }} + {{ $topic->isOld() ? 'forum-topic-entry--old' : '' }} clickable-row js-forum-topic-entry " From 465c6151ee59d359fde5e093de249ba0de1bd440 Mon Sep 17 00:00:00 2001 From: clayton Date: Fri, 19 May 2023 19:32:27 -0700 Subject: [PATCH 027/470] Fix file path for github user component --- resources/js/entrypoints/account-edit.tsx | 2 +- .../account-edit/github-user.tsx => js/github-user/index.tsx} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename resources/{assets/lib/account-edit/github-user.tsx => js/github-user/index.tsx} (96%) diff --git a/resources/js/entrypoints/account-edit.tsx b/resources/js/entrypoints/account-edit.tsx index 9f701094755..ab9ded7e745 100644 --- a/resources/js/entrypoints/account-edit.tsx +++ b/resources/js/entrypoints/account-edit.tsx @@ -1,7 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. -import GithubUser from 'account-edit/github-user'; +import GithubUser from 'github-user'; import { ClientJson } from 'interfaces/client-json'; import { OwnClientJson } from 'interfaces/own-client-json'; import LegacyApiKey from 'legacy-api-key'; diff --git a/resources/assets/lib/account-edit/github-user.tsx b/resources/js/github-user/index.tsx similarity index 96% rename from resources/assets/lib/account-edit/github-user.tsx rename to resources/js/github-user/index.tsx index 177f19908a4..773cdbc7636 100644 --- a/resources/assets/lib/account-edit/github-user.tsx +++ b/resources/js/github-user/index.tsx @@ -15,7 +15,7 @@ interface Props { } @observer -export default class GithubUsers extends React.Component { +export default class GithubUser extends React.Component { @observable private deleting = false; @observable private user: GithubUserJson | null | undefined; private xhr?: JQuery.jqXHR; From a90f572e658faa8179bf444deb136d5fefe5baf0 Mon Sep 17 00:00:00 2001 From: clayton Date: Fri, 19 May 2023 19:32:27 -0700 Subject: [PATCH 028/470] Prevent re-assigning same GitHub account --- app/Http/Controllers/Account/GithubUsersController.php | 4 +++- resources/lang/en/accounts.php | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Account/GithubUsersController.php b/app/Http/Controllers/Account/GithubUsersController.php index 97d58a99f7b..8612fbc22b8 100644 --- a/app/Http/Controllers/Account/GithubUsersController.php +++ b/app/Http/Controllers/Account/GithubUsersController.php @@ -45,7 +45,9 @@ public function callback() $apiUser = $client->currentUser()->show(); $user = GithubUser::firstWhere('canonical_id', $apiUser['id']); - abort_if($user === null, 422, osu_trans('accounts.github_user.error_no_contribution')); + abort_if($user === null, 422, osu_trans('accounts.github_user.error.no_contribution')); + + abort_if($user->user_id !== null, 422, osu_trans('accounts.github_user.error.already_linked')); $user->update([ 'user_id' => auth()->id(), diff --git a/resources/lang/en/accounts.php b/resources/lang/en/accounts.php index 45680798d66..96c1e280564 100644 --- a/resources/lang/en/accounts.php +++ b/resources/lang/en/accounts.php @@ -54,9 +54,13 @@ 'github_user' => [ 'account' => 'account', - 'error_no_contribution' => 'Cannot link GitHub account without any contribution history in osu! repositories.', 'link' => 'Link GitHub account', 'title' => 'GitHub', + + 'error' => [ + 'already_linked' => 'This GitHub account is already linked to a different user.', + 'no_contribution' => 'Cannot link GitHub account without any contribution history in osu! repositories.', + ], ], 'notifications' => [ From 17fe25a1f72756cde5e49eb3c3c9597940f68244 Mon Sep 17 00:00:00 2001 From: clayton Date: Fri, 19 May 2023 19:32:27 -0700 Subject: [PATCH 029/470] Fix display of legacy changelog entries basically revert some of the code that assumed GitHub username would never be null. --- app/Models/GithubUser.php | 20 ++++++++++++++----- app/Transformers/GithubUserTransformer.php | 2 +- .../js/components/changelog-entry.coffee | 17 ++++++++++------ resources/js/interfaces/github-user-json.ts | 4 ++++ 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/app/Models/GithubUser.php b/app/Models/GithubUser.php index 687c4e2287a..336c4e57d5a 100644 --- a/app/Models/GithubUser.php +++ b/app/Models/GithubUser.php @@ -11,6 +11,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany; /** + * Note: `$canonical_id`, `$id`, and `$username` are null when this model is + * created for use in legacy changelog entries. + * * @property int $canonical_id * @property-read \Illuminate\Database\Eloquent\Collection $changelogEntries * @property \Carbon\Carbon|null $created_at @@ -57,23 +60,30 @@ public function user(): BelongsTo return $this->belongsTo(User::class, 'user_id'); } - public function githubUrl(): string + public function displayUsername(): string { - return "https://github.com/{$this->username}"; + return $this->username ?? $this->osuUsername() ?? '[no name]'; } - public function osuUsername(): ?string + public function githubUrl(): ?string { - return $this->user?->username; + return $this->username !== null + ? "https://github.com/{$this->username}" + : null; } - public function userUrl(): ?string + public function osuUrl(): ?string { return $this->user_id !== null ? route('users.show', $this->user_id) : null; } + public function osuUsername(): ?string + { + return $this->user?->username; + } + public function getAttribute($key) { return match ($key) { diff --git a/app/Transformers/GithubUserTransformer.php b/app/Transformers/GithubUserTransformer.php index b491ed17e05..a1159d4ba09 100644 --- a/app/Transformers/GithubUserTransformer.php +++ b/app/Transformers/GithubUserTransformer.php @@ -14,7 +14,7 @@ class GithubUserTransformer extends TransformerAbstract public function transform(GithubUser $githubUser): array { return [ - 'display_name' => $githubUser->username, // TODO: can be removed + 'display_name' => $githubUser->displayUsername(), 'github_url' => $githubUser->githubUrl(), 'github_username' => $githubUser->username, 'id' => $githubUser->getKey(), diff --git a/resources/js/components/changelog-entry.coffee b/resources/js/components/changelog-entry.coffee index a5ebc75e265..4a2d18c9866 100644 --- a/resources/js/components/changelog-entry.coffee +++ b/resources/js/components/changelog-entry.coffee @@ -42,13 +42,18 @@ export ChangelogEntry = ({entry}) => "#{entry.repository.replace /^.*\//, ''}##{entry.github_pull_request_id}" ')' do => - user = _.escape(entry.github_user.github_username) + user = _.escape(entry.github_user.display_name) + url = entry.github_user.github_url ? entry.github_user.user_url + link = - "#{user}" + if url? + "#{user}" + else + user span className: 'changelog-entry__user' diff --git a/resources/js/interfaces/github-user-json.ts b/resources/js/interfaces/github-user-json.ts index 429de6635f7..87f381926d1 100644 --- a/resources/js/interfaces/github-user-json.ts +++ b/resources/js/interfaces/github-user-json.ts @@ -1,7 +1,11 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. +// Note: `github_url`, `github_username`, and `id` are null when this model is +// created for use in legacy changelog entries. Typings don't reflect this +// because changelogs are only CoffeeScript for now. export default interface GithubUserJson { + display_name: string; github_url: string; github_username: string; id: number; From 708c5d9fdb7d33d6d7cf817216b32f6d084b0857 Mon Sep 17 00:00:00 2001 From: clayton Date: Fri, 19 May 2023 19:32:28 -0700 Subject: [PATCH 030/470] Redate migration --- ...=> 2023_05_20_023000_require_github_users_id_and_username.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename database/migrations/{2022_12_09_120041_require_github_users_id_and_username.php => 2023_05_20_023000_require_github_users_id_and_username.php} (100%) diff --git a/database/migrations/2022_12_09_120041_require_github_users_id_and_username.php b/database/migrations/2023_05_20_023000_require_github_users_id_and_username.php similarity index 100% rename from database/migrations/2022_12_09_120041_require_github_users_id_and_username.php rename to database/migrations/2023_05_20_023000_require_github_users_id_and_username.php From a06ed1ce66fdb10e7c79bf62fa548f1ee4fd0451 Mon Sep 17 00:00:00 2001 From: clayton Date: Fri, 19 May 2023 19:39:57 -0700 Subject: [PATCH 031/470] Fix url method name --- app/Models/GithubUser.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Models/GithubUser.php b/app/Models/GithubUser.php index 336c4e57d5a..d0823c616a9 100644 --- a/app/Models/GithubUser.php +++ b/app/Models/GithubUser.php @@ -72,16 +72,16 @@ public function githubUrl(): ?string : null; } - public function osuUrl(): ?string + public function osuUsername(): ?string { - return $this->user_id !== null - ? route('users.show', $this->user_id) - : null; + return $this->user?->username; } - public function osuUsername(): ?string + public function userUrl(): ?string { - return $this->user?->username; + return $this->user_id !== null + ? route('users.show', $this->user_id) + : null; } public function getAttribute($key) From 531dc6e68bdb9545c6bf1f0b2b17a17a8ead0966 Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Sat, 27 May 2023 00:07:53 +0200 Subject: [PATCH 032/470] add level 4 red base colour --- resources/css/colors.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/css/colors.less b/resources/css/colors.less index 32515921604..a854d754f29 100644 --- a/resources/css/colors.less +++ b/resources/css/colors.less @@ -145,14 +145,17 @@ --c-saturation-1: 100%; --c-saturation-2: 80%; --c-saturation-3: 60%; + --c-saturation-4: 40%; --c-lightness-1: 70%; --c-lightness-2: 60%; --c-lightness-3: 50%; + --c-lightness-4: 30%; each(@colours, { --colour-@{key}-hue: @value; --hsl-@{key}-1: var(~"--colour-@{key}-hue"), var(--c-saturation-1), var(--c-lightness-1); --hsl-@{key}-2: var(~"--colour-@{key}-hue"), var(--c-saturation-2), var(--c-lightness-2); --hsl-@{key}-3: var(~"--colour-@{key}-hue"), var(--c-saturation-3), var(--c-lightness-3); + --hsl-@{key}-4: var(~"--colour-@{key}-hue"), var(--c-saturation-4), var(--c-lightness-4); }); } // osu!Pink @@ -183,6 +186,7 @@ @osu-colour-red-1: hsl(var(--hsl-red-1)); @osu-colour-red-2: hsl(var(--hsl-red-2)); @osu-colour-red-3: hsl(var(--hsl-red-3)); +@osu-colour-red-4: hsl(var(--hsl-red-4)); // Darkorange @osu-colour-darkorange-1: hsl(var(--hsl-darkorange-1)); @osu-colour-darkorange-2: hsl(var(--hsl-darkorange-2)); From 6f1aa4b60730cff1711d3cd398be5e68c75c98fb Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Sat, 27 May 2023 00:08:32 +0200 Subject: [PATCH 033/470] use figma design colours --- resources/css/bem/forum-item-stripe.less | 6 +++--- resources/css/bem/forum-topic-entry.less | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/resources/css/bem/forum-item-stripe.less b/resources/css/bem/forum-item-stripe.less index 7a663db369e..9f8ece1a3cd 100644 --- a/resources/css/bem/forum-item-stripe.less +++ b/resources/css/bem/forum-item-stripe.less @@ -17,7 +17,7 @@ content: ''; .full-size(); border-radius: @border-radius-base 0 0 @border-radius-base; - background-color: @forum-item-background-color; + background-color: var(--forum-item-background-color); top: 0; will-change: transform; transition: @forum-item-animate; @@ -36,11 +36,11 @@ } .forum-item:hover &, .forum-topic-entry:hover & { - color: @forum-item-background-color-hover; + color: var(--forum-item-background-color-hover); width: 25px; &::after { - background-color: @forum-item-background-color-hover; + background-color: var(--forum-item-background-color-hover); @media @desktop { transform: translateX(15px); diff --git a/resources/css/bem/forum-topic-entry.less b/resources/css/bem/forum-topic-entry.less index d84fb5729a8..a168d69d09c 100644 --- a/resources/css/bem/forum-topic-entry.less +++ b/resources/css/bem/forum-topic-entry.less @@ -4,10 +4,13 @@ .forum-topic-entry { @_top: forum-topic-entry; + --forum-item-background-color: @osu-colour-b4; + --forum-item-background-color-hover: @osu-colour-b3; + font-size: @font-size--normal; display: flex; margin: 2px -@forum-item-overflow; - background-color: @forum-item-background-color; + background-color: var(--forum-item-background-color); .default-border-radius(); padding: 7px 0 7px @forum-item-overflow; color: @osu-colour-c2; @@ -15,7 +18,7 @@ position: relative; &:hover { - background-color: @forum-item-background-color-hover; + background-color: var(--forum-item-background-color-hover); } @media @desktop { @@ -25,7 +28,10 @@ } &--old { - color: darkgray; + --forum-item-background-color: @osu-colour-red-4; + --forum-item-background-color-hover: @osu-colour-red-3; + + opacity: 0.5; } &--deleted { @@ -180,9 +186,6 @@ color: @osu-colour-c1; word-wrap: break-word; - .@{_top}--old & { - color: grey; - } .link-hover({ color: @osu-colour-c1; }); From 3698002682b0ff3b36bf0327761ff3b5214bfaaa Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Sat, 27 May 2023 00:12:05 +0200 Subject: [PATCH 034/470] apply color to correct element --- resources/css/bem/forum-topic-entry.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/css/bem/forum-topic-entry.less b/resources/css/bem/forum-topic-entry.less index a168d69d09c..7ada6dacbc8 100644 --- a/resources/css/bem/forum-topic-entry.less +++ b/resources/css/bem/forum-topic-entry.less @@ -28,13 +28,13 @@ } &--old { - --forum-item-background-color: @osu-colour-red-4; - --forum-item-background-color-hover: @osu-colour-red-3; - opacity: 0.5; } &--deleted { + --forum-item-background-color: @osu-colour-red-4; + --forum-item-background-color-hover: @osu-colour-red-3; + opacity: 0.5; } From 9c5e16be63992f9f56c89750622950b8a297a095 Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Sat, 27 May 2023 06:35:08 +0200 Subject: [PATCH 035/470] Add tiered level badge colouring --- public/images/backgrounds/level-hexagon.svg | 1 - resources/css/bem/user-level.less | 66 +++++++++++++++++++-- resources/css/variables.less | 10 ++++ resources/js/components/user-level.tsx | 29 ++++++++- 4 files changed, 99 insertions(+), 7 deletions(-) delete mode 100644 public/images/backgrounds/level-hexagon.svg diff --git a/public/images/backgrounds/level-hexagon.svg b/public/images/backgrounds/level-hexagon.svg deleted file mode 100644 index 96610a3a14d..00000000000 --- a/public/images/backgrounds/level-hexagon.svg +++ /dev/null @@ -1 +0,0 @@ -Artboard 1 \ No newline at end of file diff --git a/resources/css/bem/user-level.less b/resources/css/bem/user-level.less index 02969494af5..1edb5955dcd 100644 --- a/resources/css/bem/user-level.less +++ b/resources/css/bem/user-level.less @@ -6,7 +6,65 @@ width: 50px; height: $width; font-size: @font-size--large; - background-image: url('~@images/backgrounds/level-hexagon.svg'); - background-position: center; - background-repeat: no-repeat; -} + position: relative; + + &__icon { + position: absolute; + width: 100%; + height: 100%; + + .stop-1 { + stop-color: var(--level-tier-stop-1, black); + } + + .stop-2 { + stop-color: var(--level-tier-stop-2, black); + } + } + + &__level { + position: absolute; + } + + &--tier { + &-iron { + --level-tier-stop-1: extract(@level-tier-iron, 1); + --level-tier-stop-2: extract(@level-tier-iron, 2); + } + + &-bronze { + --level-tier-stop-1: extract(@level-tier-bronze, 1); + --level-tier-stop-2: extract(@level-tier-bronze, 2); + } + + &-silver { + --level-tier-stop-1: extract(@level-tier-silver, 1); + --level-tier-stop-2: extract(@level-tier-silver, 2); + } + + &-gold { + --level-tier-stop-1: extract(@level-tier-gold, 1); + --level-tier-stop-2: extract(@level-tier-gold, 2); + } + + &-platinum { + --level-tier-stop-1: extract(@level-tier-platinum, 1); + --level-tier-stop-2: extract(@level-tier-platinum, 2); + } + + &-rhodium { + --level-tier-stop-1: extract(@level-tier-rhodium, 1); + --level-tier-stop-2: extract(@level-tier-rhodium, 2); + } + + &-radiant { + --level-tier-stop-1: extract(@level-tier-radiant, 1); + --level-tier-stop-2: extract(@level-tier-radiant, 2); + } + + &-lustrous { + --level-tier-stop-1: extract(@level-tier-lustrous, 1); + --level-tier-stop-2: extract(@level-tier-lustrous, 2); + } + } +} \ No newline at end of file diff --git a/resources/css/variables.less b/resources/css/variables.less index 31d0f5ce3d1..6d25abc7f42 100644 --- a/resources/css/variables.less +++ b/resources/css/variables.less @@ -317,3 +317,13 @@ @user-card-height: 120px; @user-list-icon-size: 20px; + +// level tier gradients +@level-tier-iron: #BAB3AB, #BAB3AB; +@level-tier-bronze: #B88F7A, #855C47; +@level-tier-silver: #E0E0EB, #A3A3C2; +@level-tier-gold: #F0E4A8, #E0C952; +@level-tier-platinum: #A8F0EF, #52E0DF; +@level-tier-rhodium: #D9F8D3, #A0CF96; +@level-tier-radiant: #97DCFF, #ED82FF; +@level-tier-lustrous: #FFE600, #ED82FF; diff --git a/resources/js/components/user-level.tsx b/resources/js/components/user-level.tsx index 67b733f13cd..3b286d5aed9 100644 --- a/resources/js/components/user-level.tsx +++ b/resources/js/components/user-level.tsx @@ -2,15 +2,40 @@ // See the LICENCE file in the repository root for full licence text. import * as React from 'react'; +import { classWithModifiers } from 'utils/css'; import { trans } from 'utils/lang'; export default function UserLevel({ level }: { level: number }) { + let tier = 'iron'; + + if (level >= 110) { + tier = 'lustrous'; + } else if (level >= 105) { + tier = 'radiant'; + } else if (level >= 100) { + tier = 'rhodium'; + } else if (level >= 80) { + tier = 'platinum'; + } else if (level >= 60) { + tier = 'gold'; + } else if (level >= 40) { + tier = 'silver'; + } else if (level >= 20) { + tier = 'bronze'; + } + + const blockClass = classWithModifiers('user-level', `tier-${tier}`); + + // using tier as a modifier in the linear gradient is required to ensure that + // if multiple level components are on one page they will only use matching gradients + return (
- {level} + {level} +
); } From 45ec957eb8ab314b98ac9d68262984835cb18cb1 Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 08:24:09 +0200 Subject: [PATCH 036/470] apply code review --- public/images/backgrounds/level-hexagon.svg | 7 ++++ resources/css/bem/user-level.less | 38 ++++++--------------- resources/js/components/user-level.tsx | 2 +- 3 files changed, 19 insertions(+), 28 deletions(-) create mode 100644 public/images/backgrounds/level-hexagon.svg diff --git a/public/images/backgrounds/level-hexagon.svg b/public/images/backgrounds/level-hexagon.svg new file mode 100644 index 00000000000..1be2e0ebfce --- /dev/null +++ b/public/images/backgrounds/level-hexagon.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/resources/css/bem/user-level.less b/resources/css/bem/user-level.less index 1edb5955dcd..edd7d3ee471 100644 --- a/resources/css/bem/user-level.less +++ b/resources/css/bem/user-level.less @@ -9,17 +9,9 @@ position: relative; &__icon { - position: absolute; - width: 100%; - height: 100%; - - .stop-1 { - stop-color: var(--level-tier-stop-1, black); - } - - .stop-2 { - stop-color: var(--level-tier-stop-2, black); - } + .full-size(); + clip-path: url('~@images/backgrounds/level-hexagon.svg#clip'); + background: linear-gradient(var(--bg)); } &__level { @@ -28,43 +20,35 @@ &--tier { &-iron { - --level-tier-stop-1: extract(@level-tier-iron, 1); - --level-tier-stop-2: extract(@level-tier-iron, 2); + --bg: @level-tier-iron; } &-bronze { - --level-tier-stop-1: extract(@level-tier-bronze, 1); - --level-tier-stop-2: extract(@level-tier-bronze, 2); + --bg: @level-tier-bronze; } &-silver { - --level-tier-stop-1: extract(@level-tier-silver, 1); - --level-tier-stop-2: extract(@level-tier-silver, 2); + --bg: @level-tier-silver; } &-gold { - --level-tier-stop-1: extract(@level-tier-gold, 1); - --level-tier-stop-2: extract(@level-tier-gold, 2); + --bg: @level-tier-gold; } &-platinum { - --level-tier-stop-1: extract(@level-tier-platinum, 1); - --level-tier-stop-2: extract(@level-tier-platinum, 2); + --bg: @level-tier-platinum; } &-rhodium { - --level-tier-stop-1: extract(@level-tier-rhodium, 1); - --level-tier-stop-2: extract(@level-tier-rhodium, 2); + --bg: @level-tier-rhodium; } &-radiant { - --level-tier-stop-1: extract(@level-tier-radiant, 1); - --level-tier-stop-2: extract(@level-tier-radiant, 2); + --bg: @level-tier-radiant; } &-lustrous { - --level-tier-stop-1: extract(@level-tier-lustrous, 1); - --level-tier-stop-2: extract(@level-tier-lustrous, 2); + --bg: @level-tier-lustrous; } } } \ No newline at end of file diff --git a/resources/js/components/user-level.tsx b/resources/js/components/user-level.tsx index 3b286d5aed9..5d8e733e1da 100644 --- a/resources/js/components/user-level.tsx +++ b/resources/js/components/user-level.tsx @@ -35,7 +35,7 @@ export default function UserLevel({ level }: { level: number }) { title={trans('users.show.stats.level', { level })} > {level} - +
); } From a21c8c4a8eca75cfb441d1d10cd0bf4eeaf4194d Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 08:26:36 +0200 Subject: [PATCH 037/470] dont skip tpying "--tier" --- resources/css/bem/user-level.less | 62 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/resources/css/bem/user-level.less b/resources/css/bem/user-level.less index edd7d3ee471..b4f7e490e02 100644 --- a/resources/css/bem/user-level.less +++ b/resources/css/bem/user-level.less @@ -18,37 +18,35 @@ position: absolute; } - &--tier { - &-iron { - --bg: @level-tier-iron; - } - - &-bronze { - --bg: @level-tier-bronze; - } - - &-silver { - --bg: @level-tier-silver; - } - - &-gold { - --bg: @level-tier-gold; - } - - &-platinum { - --bg: @level-tier-platinum; - } - - &-rhodium { - --bg: @level-tier-rhodium; - } - - &-radiant { - --bg: @level-tier-radiant; - } - - &-lustrous { - --bg: @level-tier-lustrous; - } + &--tier-iron { + --bg: @level-tier-iron; + } + + &--tier-bronze { + --bg: @level-tier-bronze; + } + + &--tier-silver { + --bg: @level-tier-silver; + } + + &--tier-gold { + --bg: @level-tier-gold; + } + + &--tier-platinum { + --bg: @level-tier-platinum; + } + + &--tier-rhodium { + --bg: @level-tier-rhodium; + } + + &--tier-radiant { + --bg: @level-tier-radiant; + } + + &--tier-lustrous { + --bg: @level-tier-lustrous; } } \ No newline at end of file From 2412e25e0b2478c59dc654c4f0f00eddd534a37a Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 09:07:22 +0200 Subject: [PATCH 038/470] use class with modifiers --- resources/views/forum/forums/_topic.blade.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/views/forum/forums/_topic.blade.php b/resources/views/forum/forums/_topic.blade.php index ea521ba73c2..0123dda4f7c 100644 --- a/resources/views/forum/forums/_topic.blade.php +++ b/resources/views/forum/forums/_topic.blade.php @@ -7,9 +7,7 @@ @endphp
  • Date: Mon, 24 Jul 2023 09:07:29 +0200 Subject: [PATCH 039/470] exclude pinned and announce posts --- app/Models/Forum/Topic.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php index 6f3f41a7c2f..208f057663e 100644 --- a/app/Models/Forum/Topic.php +++ b/app/Models/Forum/Topic.php @@ -484,6 +484,10 @@ public function deletedPostsCount() public function isOld() { + // pinned and announce posts should never be considered old + if($this->topic_type != 0){ + return false; + } return $this->topic_last_post_time < Carbon::now()->subMonths(config('osu.forum.old_months')); } From 1464ef2e8809e273d0a7b149fdc8034949c9e058 Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 09:13:01 +0200 Subject: [PATCH 040/470] increase opacity --- resources/css/bem/forum-topic-entry.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/css/bem/forum-topic-entry.less b/resources/css/bem/forum-topic-entry.less index 7ada6dacbc8..09e419093c8 100644 --- a/resources/css/bem/forum-topic-entry.less +++ b/resources/css/bem/forum-topic-entry.less @@ -28,7 +28,7 @@ } &--old { - opacity: 0.5; + opacity: 0.7; } &--deleted { From c6e0abfe80218203eb5b04f82c46841919c7451c Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 09:13:37 +0200 Subject: [PATCH 041/470] use color directly --- resources/css/bem/forum-topic-entry.less | 2 +- resources/css/colors.less | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/css/bem/forum-topic-entry.less b/resources/css/bem/forum-topic-entry.less index 09e419093c8..23f32e71559 100644 --- a/resources/css/bem/forum-topic-entry.less +++ b/resources/css/bem/forum-topic-entry.less @@ -32,7 +32,7 @@ } &--deleted { - --forum-item-background-color: @osu-colour-red-4; + --forum-item-background-color: hsl(var(--colour-red-hue), 40%, 30%); --forum-item-background-color-hover: @osu-colour-red-3; opacity: 0.5; diff --git a/resources/css/colors.less b/resources/css/colors.less index a854d754f29..32515921604 100644 --- a/resources/css/colors.less +++ b/resources/css/colors.less @@ -145,17 +145,14 @@ --c-saturation-1: 100%; --c-saturation-2: 80%; --c-saturation-3: 60%; - --c-saturation-4: 40%; --c-lightness-1: 70%; --c-lightness-2: 60%; --c-lightness-3: 50%; - --c-lightness-4: 30%; each(@colours, { --colour-@{key}-hue: @value; --hsl-@{key}-1: var(~"--colour-@{key}-hue"), var(--c-saturation-1), var(--c-lightness-1); --hsl-@{key}-2: var(~"--colour-@{key}-hue"), var(--c-saturation-2), var(--c-lightness-2); --hsl-@{key}-3: var(~"--colour-@{key}-hue"), var(--c-saturation-3), var(--c-lightness-3); - --hsl-@{key}-4: var(~"--colour-@{key}-hue"), var(--c-saturation-4), var(--c-lightness-4); }); } // osu!Pink @@ -186,7 +183,6 @@ @osu-colour-red-1: hsl(var(--hsl-red-1)); @osu-colour-red-2: hsl(var(--hsl-red-2)); @osu-colour-red-3: hsl(var(--hsl-red-3)); -@osu-colour-red-4: hsl(var(--hsl-red-4)); // Darkorange @osu-colour-darkorange-1: hsl(var(--hsl-darkorange-1)); @osu-colour-darkorange-2: hsl(var(--hsl-darkorange-2)); From 50a3df7b81d48ebe041efdc0abc62519eb275acf Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 09:17:16 +0200 Subject: [PATCH 042/470] formatting --- app/Models/Forum/Topic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php index 208f057663e..4e0489860fe 100644 --- a/app/Models/Forum/Topic.php +++ b/app/Models/Forum/Topic.php @@ -485,7 +485,7 @@ public function deletedPostsCount() public function isOld() { // pinned and announce posts should never be considered old - if($this->topic_type != 0){ + if ($this->topic_type != 0){ return false; } return $this->topic_last_post_time < Carbon::now()->subMonths(config('osu.forum.old_months')); From c58ed0f2a0624394eaecc0270fdf8f15826d8f6c Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 09:40:38 +0200 Subject: [PATCH 043/470] formatting --- app/Models/Forum/Topic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php index 4e0489860fe..e71b60f15c6 100644 --- a/app/Models/Forum/Topic.php +++ b/app/Models/Forum/Topic.php @@ -485,7 +485,7 @@ public function deletedPostsCount() public function isOld() { // pinned and announce posts should never be considered old - if ($this->topic_type != 0){ + if ($this->topic_type !== 0){ return false; } return $this->topic_last_post_time < Carbon::now()->subMonths(config('osu.forum.old_months')); From 1ae633041c35c82ae1478f46852f14e705ed5348 Mon Sep 17 00:00:00 2001 From: RockRoller01 Date: Mon, 24 Jul 2023 09:49:32 +0200 Subject: [PATCH 044/470] formatting --- app/Models/Forum/Topic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php index e71b60f15c6..ef506e0c5da 100644 --- a/app/Models/Forum/Topic.php +++ b/app/Models/Forum/Topic.php @@ -485,7 +485,7 @@ public function deletedPostsCount() public function isOld() { // pinned and announce posts should never be considered old - if ($this->topic_type !== 0){ + if ($this->topic_type !== 0) { return false; } return $this->topic_last_post_time < Carbon::now()->subMonths(config('osu.forum.old_months')); From f7a561a39128fb961e2095afe7ff600765e65a91 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 26 Jul 2023 02:03:56 +0900 Subject: [PATCH 045/470] Store multiplayer score in solo score table --- .../Rooms/Playlist/ScoresController.php | 117 ++++++------ .../Controllers/Solo/ScoresController.php | 22 +-- app/Libraries/MorphMap.php | 2 + app/Models/Contest.php | 4 +- app/Models/Multiplayer/PlaylistItem.php | 10 +- .../Multiplayer/PlaylistItemUserHighScore.php | 30 +-- app/Models/Multiplayer/Room.php | 43 +++-- app/Models/Multiplayer/Score.php | 157 ---------------- app/Models/Multiplayer/ScoreLink.php | 174 ++++++++++++++++++ app/Models/Multiplayer/UserScoreAggregate.php | 46 ++--- app/Models/Solo/Score.php | 26 ++- app/Models/Solo/ScoreData.php | 8 +- app/Models/Traits/SoloScoreInterface.php | 16 ++ .../Multiplayer/ScoreTransformer.php | 94 ---------- .../CurrentUserAttributesTransformer.php | 3 +- app/Transformers/ScoreTransformer.php | 84 ++++++++- .../factories/Multiplayer/ScoreFactory.php | 53 ------ .../Multiplayer/ScoreLinkFactory.php | 52 ++++++ ..._103744_create_multiplayer_score_links.php | 45 +++++ ...ore_link_id_to_multiplayer_scores_high.php | 35 ++++ ...core_link_id_to_multiplayer_rooms_high.php | 33 ++++ .../ModelSeeders/MultiplayerSeeder.php | 20 +- .../Chat/ChannelsControllerTest.php | 12 +- .../Rooms/Playlist/ScoresControllerTest.php | 22 +-- tests/Models/ContestTest.php | 29 ++- tests/Models/Multiplayer/RoomTest.php | 32 ++-- .../Multiplayer/UserScoreAggregateTest.php | 153 +++++++-------- 27 files changed, 737 insertions(+), 585 deletions(-) delete mode 100644 app/Models/Multiplayer/Score.php create mode 100644 app/Models/Multiplayer/ScoreLink.php create mode 100644 app/Models/Traits/SoloScoreInterface.php delete mode 100644 app/Transformers/Multiplayer/ScoreTransformer.php delete mode 100644 database/factories/Multiplayer/ScoreFactory.php create mode 100644 database/factories/Multiplayer/ScoreLinkFactory.php create mode 100644 database/migrations/2023_07_26_103744_create_multiplayer_score_links.php create mode 100644 database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php create mode 100644 database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index f2bec1bfd6a..3e2ed735a5c 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -5,14 +5,13 @@ namespace App\Http\Controllers\Multiplayer\Rooms\Playlist; -use App\Exceptions\InvariantException; use App\Http\Controllers\Controller as BaseController; use App\Libraries\ClientCheck; use App\Models\Multiplayer\PlaylistItem; use App\Models\Multiplayer\PlaylistItemUserHighScore; use App\Models\Multiplayer\Room; -use App\Transformers\Multiplayer\ScoreTransformer; -use Carbon\Carbon; +use App\Models\Solo\Score; +use App\Transformers\ScoreTransformer; /** * @group Multiplayer @@ -53,14 +52,15 @@ public function index($roomId, $playlistId) [$highScores, $hasMore] = $playlist ->highScores() ->cursorSort($cursorHelper, cursor_from_params($params)) - ->with(ScoreTransformer::BASE_PRELOAD) + ->with(ScoreTransformer::MULTIPLAYER_BASE_PRELOAD) ->limit($limit) ->getWithHasMore(); + $transformer = ScoreTransformer::newSolo(); $scoresJson = json_collection( $highScores->pluck('score'), - 'Multiplayer\Score', - ScoreTransformer::BASE_INCLUDES + $transformer, + ScoreTransformer::MULTIPLAYER_BASE_INCLUDES ); $total = $playlist->highScores()->count(); @@ -70,7 +70,7 @@ public function index($roomId, $playlistId) $userHighScore = $playlist->highScores()->where('user_id', $user->getKey())->first(); if ($userHighScore !== null) { - $userScoreJson = json_item($userHighScore->score, 'Multiplayer\Score', ScoreTransformer::BASE_INCLUDES); + $userScoreJson = json_item($userHighScore->score, $transformer, ScoreTransformer::BASE_INCLUDES); } } @@ -102,12 +102,16 @@ public function show($roomId, $playlistId, $id) { $room = Room::find($roomId) ?? abort(404, 'Invalid room id'); $playlistItem = $room->playlist()->find($playlistId) ?? abort(404, 'Invalid playlist id'); - $score = $playlistItem->scores()->findOrFail($id); + $scoreLinks = $playlistItem->scoreLinks()->findOrFail($id); return json_item( - $score, - 'Multiplayer\Score', - array_merge(['position', 'scores_around'], ScoreTransformer::BASE_INCLUDES) + $scoreLinks, + ScoreTransformer::newSolo(), + [ + ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES, + 'position', + 'scores_around', + ], ); } @@ -134,8 +138,12 @@ public function showUser($roomId, $playlistId, $userId) return json_item( $score, - 'Multiplayer\Score', - array_merge(['position', 'scores_around'], ScoreTransformer::BASE_INCLUDES) + ScoreTransformer::newSolo(), + [ + ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES, + 'position', + 'scores_around', + ], ); } @@ -149,14 +157,12 @@ public function store($roomId, $playlistId) $user = auth()->user(); $params = request()->all(); - ClientCheck::findBuild($user, $params); + $buildId = ClientCheck::findBuild($user, $params)?->getKey() + ?? config('osu.client.default_build_id'); - $score = $room->startPlay($user, $playlistItem); + $score = $room->startPlay($user, $playlistItem, $buildId); - return json_item( - $score, - 'Multiplayer\Score' - ); + return json_item($score, ScoreTransformer::newSolo()); } /** @@ -164,49 +170,40 @@ public function store($roomId, $playlistId) */ public function update($roomId, $playlistId, $scoreId) { - $room = Room::findOrFail($roomId); - - $playlistItem = $room->playlist() - ->where('id', $playlistId) - ->firstOrFail(); - - $roomScore = $playlistItem->scores() - ->where('user_id', auth()->user()->getKey()) - ->where('id', $scoreId) - ->firstOrFail(); - - try { - $score = $room->completePlay( - $roomScore, - $this->extractScoreParams(request()->all(), $playlistItem) - ); - - return json_item( - $score, - 'Multiplayer\Score', - array_merge(['position', 'scores_around'], ScoreTransformer::BASE_INCLUDES) - ); - } catch (InvariantException $e) { - return error_popup($e->getMessage(), $e->getStatusCode()); + $scoreLink = \DB::transaction(function () use ($roomId, $playlistId, $scoreId) { + $room = Room::findOrFail($roomId); + + $scoreLink = $room + ->scoreLinks() + ->where([ + 'user_id' => \Auth::id(), + 'playlist_item_id' => $playlistId, + ])->with('playlistItem') + ->lockForUpdate() + ->findOrFail($scoreId); + + $params = Score::extractParams(\Request::all(), $scoreLink); + + $room->completePlay($scoreLink, $params); + + return $scoreLink; + }); + + $score = $scoreLink->score; + $transformer = ScoreTransformer::newSolo(); + if ($score->wasRecentlyCreated) { + $scoreJson = json_item($score, $transformer); + $score::queueForProcessing($scoreJson); } - } - private function extractScoreParams(array $params, PlaylistItem $playlistItem) - { - $mods = app('mods')->parseInputArray( - $playlistItem->ruleset_id, - $params['mods'] ?? [], + return json_item( + $scoreLink, + $transformer, + [ + ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES, + 'position', + 'scores_around', + ], ); - - return [ - 'rank' => $params['rank'] ?? null, - 'total_score' => get_int($params['total_score'] ?? null), - 'accuracy' => get_float($params['accuracy'] ?? null), - 'max_combo' => get_int($params['max_combo'] ?? null), - 'ended_at' => Carbon::now(), - 'passed' => get_bool($params['passed'] ?? null), - 'mods' => $mods, - 'statistics' => $params['statistics'] ?? null, - ]; } } diff --git a/app/Http/Controllers/Solo/ScoresController.php b/app/Http/Controllers/Solo/ScoresController.php index 3bef06a3722..8de9548e9f0 100644 --- a/app/Http/Controllers/Solo/ScoresController.php +++ b/app/Http/Controllers/Solo/ScoresController.php @@ -29,27 +29,7 @@ public function store($beatmapId, $tokenId) // return existing score otherwise (assuming duplicated submission) if ($scoreToken->score_id === null) { - $params = get_params(request()->all(), null, [ - 'accuracy:float', - 'max_combo:int', - 'maximum_statistics:array', - 'mods:array', - 'passed:bool', - 'rank:string', - 'statistics:array', - 'total_score:int', - ]); - - $params = array_merge($params, [ - 'beatmap_id' => $scoreToken->beatmap_id, - 'build_id' => $scoreToken->build_id, - 'ended_at' => json_time(now()), - 'mods' => app('mods')->parseInputArray($scoreToken->ruleset_id, $params['mods'] ?? []), - 'ruleset_id' => $scoreToken->ruleset_id, - 'started_at' => $scoreToken->created_at_json, - 'user_id' => $scoreToken->user_id, - ]); - + $params = Score::extractParams(\Request::all(), $scoreToken); $score = Score::createFromJsonOrExplode($params); $score->createLegacyEntryOrExplode(); $scoreToken->fill(['score_id' => $score->getKey()])->saveOrExplode(); diff --git a/app/Libraries/MorphMap.php b/app/Libraries/MorphMap.php index 91f41953dae..d79ad41cb88 100644 --- a/app/Libraries/MorphMap.php +++ b/app/Libraries/MorphMap.php @@ -14,6 +14,7 @@ use App\Models\Comment; use App\Models\Forum; use App\Models\LegacyMatch; +use App\Models\Multiplayer\ScoreLink as MultiplayerScoreLink; use App\Models\NewsPost; use App\Models\Score; use App\Models\Solo; @@ -32,6 +33,7 @@ class MorphMap Forum\Topic::class => 'forum_topic', LegacyMatch\Score::class => 'legacy_match_score', Message::class => 'message', + MultiplayerScoreLink::class => 'multiplayer_score_link', NewsPost::class => 'news_post', Score\Best\Fruits::class => 'score_best_fruits', Score\Best\Mania::class => 'score_best_mania', diff --git a/app/Models/Contest.php b/app/Models/Contest.php index aa6c8797c2a..951177f6a04 100644 --- a/app/Models/Contest.php +++ b/app/Models/Contest.php @@ -85,13 +85,13 @@ public function assertVoteRequirement(?User $user): void $mustPass = $requirement['must_pass'] ?? true; $beatmapIdsQuery = Multiplayer\PlaylistItem::whereIn('room_id', $roomIds)->select('beatmap_id'); $requiredBeatmapsetCount = Beatmap::whereIn('beatmap_id', $beatmapIdsQuery)->distinct('beatmapset_id')->count(); - $playedBeatmapIdsQuery = Multiplayer\Score + $playedBeatmapIdsQuery = Multiplayer\ScoreLink ::whereIn('room_id', $roomIds) ->where(['user_id' => $user->getKey()]) ->completed() ->select('beatmap_id'); if ($mustPass) { - $playedBeatmapIdsQuery->where('passed', true); + $playedBeatmapIdsQuery->whereHas('playlistItemUserHighScore'); } $playedBeatmapsetCount = Beatmap::whereIn('beatmap_id', $playedBeatmapIdsQuery)->distinct('beatmapset_id')->count(); diff --git a/app/Models/Multiplayer/PlaylistItem.php b/app/Models/Multiplayer/PlaylistItem.php index cdeceffcdab..12a60be8cad 100644 --- a/app/Models/Multiplayer/PlaylistItem.php +++ b/app/Models/Multiplayer/PlaylistItem.php @@ -23,7 +23,7 @@ * @property Room $room * @property int $room_id * @property int|null $ruleset_id - * @property \Illuminate\Database\Eloquent\Collection $scores Score + * @property \Illuminate\Database\Eloquent\Collection $scoreLinks ScoreLink * @property \Carbon\Carbon|null $updated_at * @property bool expired * @property \Carbon\Carbon|null $played_at @@ -96,17 +96,17 @@ public function highScores() return $this->hasMany(PlaylistItemUserHighScore::class); } - public function scores() + public function scoreLinks() { - return $this->hasMany(Score::class); + return $this->hasMany(ScoreLink::class); } public function topScores() { return $this->highScores() - ->with('score') + ->with('scoreLink.score') ->orderBy('total_score', 'desc') - ->orderBy('score_id', 'asc'); + ->orderBy('score_link_id', 'asc'); } private function assertValidMaxAttempts() diff --git a/app/Models/Multiplayer/PlaylistItemUserHighScore.php b/app/Models/Multiplayer/PlaylistItemUserHighScore.php index 1368b455dd0..1330ab58dbc 100644 --- a/app/Models/Multiplayer/PlaylistItemUserHighScore.php +++ b/app/Models/Multiplayer/PlaylistItemUserHighScore.php @@ -17,9 +17,8 @@ * @property int $id * @property int $playlist_item_id * @property float|null $pp - * @property int $score_id - * @property Score $score - * @property int $total_score + * @property int $score_link_id + * @property ScoreLink $scoreLink * @property \Carbon\Carbon $updated_at * @property int $user_id */ @@ -30,11 +29,11 @@ class PlaylistItemUserHighScore extends Model const SORTS = [ 'score_desc' => [ ['column' => 'total_score', 'order' => 'DESC'], - ['column' => 'score_id', 'order' => 'ASC'], + ['column' => 'score_link_id', 'order' => 'ASC'], ], 'score_asc' => [ ['column' => 'total_score', 'order' => 'ASC'], - ['column' => 'score_id', 'order' => 'DESC'], + ['column' => 'score_link_id', 'order' => 'DESC'], ], ]; @@ -42,11 +41,11 @@ class PlaylistItemUserHighScore extends Model protected $table = 'multiplayer_scores_high'; - public static function lookupOrDefault(Score $score): static + public static function lookupOrDefault(ScoreLink $scoreLink): static { return static::firstOrNew([ - 'playlist_item_id' => $score->playlist_item_id, - 'user_id' => $score->user_id, + 'playlist_item_id' => $scoreLink->playlist_item_id, + 'user_id' => $scoreLink->user_id, ], [ 'accuracy' => 0, 'pp' => 0, @@ -54,18 +53,21 @@ public static function lookupOrDefault(Score $score): static ]); } - public function score() + public function scoreLink() { - return $this->belongsTo(Score::class); + return $this->belongsTo(ScoreLink::class); } - public function updateWithScore(Score $score): void + public function updateWithScoreLink(ScoreLink $scoreLink): void { + $score = $scoreLink->score; + $this->fill([ - 'accuracy' => $score->accuracy, + 'accuracy' => $score->data->accuracy, 'pp' => $score->pp, - 'score_id' => $score->getKey(), - 'total_score' => $score->total_score, + 'score_id' => 0, // TODO: remove after migrated + 'score_link_id' => $scoreLink->getKey(), + 'total_score' => $score->data->totalScore, ])->save(); } } diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php index c310f408a5f..13bc6d99ad0 100644 --- a/app/Models/Multiplayer/Room.php +++ b/app/Models/Multiplayer/Room.php @@ -35,7 +35,7 @@ * @property string $name * @property int $participant_count * @property \Illuminate\Database\Eloquent\Collection $playlist PlaylistItem - * @property \Illuminate\Database\Eloquent\Collection $scores Score + * @property \Illuminate\Database\Eloquent\Collection $scoreLinks ScoreLink * @property-read Collection<\App\Models\Season> $seasons * @property \Carbon\Carbon $starts_at * @property \Carbon\Carbon|null $updated_at @@ -227,9 +227,9 @@ public function playlist() return $this->hasMany(PlaylistItem::class); } - public function scores() + public function scoreLinks() { - return $this->hasMany(Score::class); + return $this->hasMany(ScoreLink::class); } public function seasons() @@ -258,11 +258,9 @@ public function scopeEnded($query) public function scopeHasParticipated($query, User $user) { - return $query->whereIn( - 'id', - // SoftDelete scope is ignored, fixed in 5.8: - // https://github.com/laravel/framework/pull/26198 - Score::withoutTrashed()->where('user_id', $user->getKey())->select('room_id') + return $query->whereHas( + 'scoreLinks', + fn ($q) => $q->where('user_id', $user->getKey()), ); } @@ -386,23 +384,23 @@ public function getRecentParticipantIdsAttribute() public function calculateMissingTopScores() { // just run through all the users, UserScoreAggregate::new will calculate and persist if necessary. - $users = User::whereIn('user_id', Score::where('room_id', $this->getKey())->select('user_id')); + $users = User::whereIn('user_id', ScoreLink::where('room_id', $this->getKey())->select('user_id')); $users->each(function ($user) { UserScoreAggregate::new($user, $this); }); } - public function completePlay(Score $score, array $params) + public function completePlay(ScoreLink $scoreLink, array $params) { - priv_check_user($score->user, 'MultiplayerScoreSubmit')->ensureCan(); + priv_check_user($scoreLink->user, 'MultiplayerScoreSubmit')->ensureCan(); $this->assertValidCompletePlay(); - return $score->getConnection()->transaction(function () use ($params, $score) { - $score->complete($params); - UserScoreAggregate::new($score->user, $this)->addScore($score); + return $scoreLink->getConnection()->transaction(function () use ($params, $scoreLink) { + $scoreLink->complete($params); + UserScoreAggregate::new($scoreLink->user, $this)->addScoreLink($scoreLink); - return $score; + return $scoreLink; }); } @@ -589,13 +587,13 @@ public function startGame(User $host, array $rawParams) return $this->fresh(); } - public function startPlay(User $user, PlaylistItem $playlistItem) + public function startPlay(User $user, PlaylistItem $playlistItem, int $buildId) { priv_check_user($user, 'MultiplayerScoreSubmit')->ensureCan(); $this->assertValidStartPlay($user, $playlistItem); - return $this->getConnection()->transaction(function () use ($user, $playlistItem) { + return $this->getConnection()->transaction(function () use ($buildId, $user, $playlistItem) { $agg = UserScoreAggregate::new($user, $this); if ($agg->wasRecentlyCreated) { $this->incrementInstance('participant_count'); @@ -603,11 +601,12 @@ public function startPlay(User $user, PlaylistItem $playlistItem) $agg->updateUserAttempts(); - return Score::start([ - 'user_id' => $user->getKey(), - 'room_id' => $this->getKey(), - 'playlist_item_id' => $playlistItem->getKey(), + return ScoreLink::create([ 'beatmap_id' => $playlistItem->beatmap_id, + 'build_id' => $buildId, + 'playlist_item_id' => $playlistItem->getKey(), + 'room_id' => $this->getKey(), + 'user_id' => $user->getKey(), ]); }); } @@ -683,7 +682,7 @@ private function assertValidStartPlay(User $user, PlaylistItem $playlistItem) } if ($playlistItem->max_attempts !== null) { - $playlistAttempts = $playlistItem->scores()->where('user_id', $user->getKey())->count(); + $playlistAttempts = $playlistItem->scoreLinks()->where('user_id', $user->getKey())->count(); if ($playlistAttempts >= $playlistItem->max_attempts) { throw new InvariantException('You have reached the maximum number of tries allowed.'); } diff --git a/app/Models/Multiplayer/Score.php b/app/Models/Multiplayer/Score.php deleted file mode 100644 index c321a966689..00000000000 --- a/app/Models/Multiplayer/Score.php +++ /dev/null @@ -1,157 +0,0 @@ -. Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -namespace App\Models\Multiplayer; - -use App\Exceptions\GameCompletedException; -use App\Exceptions\InvariantException; -use App\Models\Model; -use App\Models\Solo\ScoreData; -use App\Models\User; -use Carbon\Carbon; -use Illuminate\Database\Eloquent\SoftDeletes; - -/** - * @property float|null $accuracy - * @property int $beatmap_id - * @property \Carbon\Carbon|null $created_at - * @property \Carbon\Carbon|null $deleted_at - * @property \Carbon\Carbon|null $ended_at - * @property int $id - * @property int|null $max_combo - * @property array|null $mods - * @property bool|null $passed - * @property PlaylistItem $playlistItem - * @property int $playlist_item_id - * @property float|null $pp - * @property mixed|null $rank - * @property Room $room - * @property int $room_id - * @property \Carbon\Carbon $started_at - * @property \stdClass|null $statistics - * @property int|null $total_score - * @property \Carbon\Carbon|null $updated_at - * @property User $user - * @property int $user_id - */ -class Score extends Model -{ - use SoftDeletes; - - protected $casts = [ - 'ended_at' => 'datetime', - 'mods' => 'object', - 'passed' => 'boolean', - 'started_at' => 'datetime', - 'statistics' => 'object', - ]; - protected $table = 'multiplayer_scores'; - - public static function start(array $params) - { - // TODO: move existence checks here? - $score = new static($params); - $score->started_at = Carbon::now(); - - $score->save(); - - return $score; - } - - public function playlistItem() - { - return $this->belongsTo(PlaylistItem::class, 'playlist_item_id'); - } - - public function room() - { - return $this->belongsTo(Room::class, 'room_id'); - } - - public function user() - { - return $this->belongsTo(User::class, 'user_id'); - } - - public function getDataAttribute() - { - // FIXME: convert this class to the new score table layout - $params = $this->getAttributes(); - $params['mods'] = json_decode($params['mods'], true); - $params['passed'] = get_bool($params['passed']); - $params['ruleset_id'] = $this->playlistItem->ruleset_id; - $params['statistics'] = json_decode($params['statistics'], true); - $params['ruleset_id'] = $this->playlistItem->ruleset_id; - - return new ScoreData($params); - } - - public function scopeCompleted($query) - { - return $query->whereNotNull('ended_at'); - } - - public function scopeForPlaylistItem($query, $playlistItemId) - { - return $query->where('playlist_item_id', $playlistItemId); - } - - public function isCompleted() - { - return present($this->ended_at); - } - - public function complete(array $params) - { - if ($this->isCompleted()) { - throw new GameCompletedException('cannot modify score after submission'); - } - - $this->fill($params); - - if (!empty($this->playlistItem->required_mods)) { - $missingMods = array_diff( - array_column($this->playlistItem->required_mods, 'acronym'), - array_column($this->mods, 'acronym') - ); - - if (!empty($missingMods)) { - throw new InvariantException('This play does not include the mods required.'); - } - } - - if (!empty($this->playlistItem->allowed_mods)) { - $missingMods = array_diff( - array_column($this->mods, 'acronym'), - array_column($this->playlistItem->required_mods, 'acronym'), - array_column($this->playlistItem->allowed_mods, 'acronym') - ); - - if (!empty($missingMods)) { - throw new InvariantException('This play includes mods that are not allowed.'); - } - } - - $this->data->assertCompleted(); - - $this->save(); - } - - public function userRank() - { - if ($this->total_score === null || $this->getKey() === null) { - return; - } - - $query = PlaylistItemUserHighScore - ::where('playlist_item_id', $this->playlist_item_id) - ->cursorSort('score_asc', [ - 'total_score' => $this->total_score, - 'score_id' => $this->getKey(), - ]); - - return 1 + $query->count(); - } -} diff --git a/app/Models/Multiplayer/ScoreLink.php b/app/Models/Multiplayer/ScoreLink.php new file mode 100644 index 00000000000..2a686535683 --- /dev/null +++ b/app/Models/Multiplayer/ScoreLink.php @@ -0,0 +1,174 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +namespace App\Models\Multiplayer; + +use App\Exceptions\GameCompletedException; +use App\Exceptions\InvariantException; +use App\Models\Model; +use App\Models\Solo\Score; +use App\Models\Traits\SoloScoreInterface; +use App\Models\User; +use Carbon\Carbon; +use Illuminate\Database\Eloquent\Relations\BelongsTo; + +/** + * @property int $build_id + * @property \Carbon\Carbon|null $created_at + * @property int $id + * @property PlaylistItem $playlistItem + * @property int $playlist_item_id + * @property Room $room + * @property int $room_id + * @property Score $score + * @property int|null $score_id + * @property \Carbon\Carbon|null $updated_at + * @property User $user + * @property int $user_id + */ +class ScoreLink extends Model implements SoloScoreInterface +{ + protected $table = 'multiplayer_score_links'; + + private Score $defaultScore; + + public function playlistItem() + { + return $this->belongsTo(PlaylistItem::class, 'playlist_item_id'); + } + + public function playlistItemUserHighScore() + { + return $this->hasOne(PlaylistItemUserHighScore::class); + } + + public function room() + { + return $this->belongsTo(Room::class, 'room_id'); + } + + public function score(): BelongsTo + { + return $this->belongsTo(Score::class, 'score_id'); + } + + public function user() + { + return $this->belongsTo(User::class, 'user_id'); + } + + public function getAttribute($key) + { + return match ($key) { + 'build_id', + 'id', + 'playlist_item_id', + 'room_id', + 'score_id', + 'user_id' => $this->getRawAttribute($key), + + 'data' => $this->getScoreOrDefault()->data, + 'has_replay' => $this->getScoreOrDefault()->has_replay ?? false, + 'pp' => $this->getScoreOrDefault()->pp ?? 0.0, + + 'beatmap_id' => $this->playlistItem?->beatmap_id, + 'ruleset_id' => $this->playlistItem?->ruleset_id, + + 'created_at', + 'updated_at' => $this->getTimeFast($key), + + 'created_at_json', + 'updated_at_json' => $this->getJsonTimeFast($key), + + 'playlistItem', + 'playlistItemUserHighScore', + 'room', + 'score', + 'user' => $this->getRelationValue($key), + }; + } + + public function scopeCompleted($query) + { + return $query->whereNotNull('score_id'); + } + + public function scopeForPlaylistItem($query, $playlistItemId) + { + return $query->where('playlist_item_id', $playlistItemId); + } + + public function isCompleted(): bool + { + return $this->score_id !== null; + } + + public function complete(array $params) + { + $this->getConnection()->transaction(function () use ($params) { + if ($this->isCompleted()) { + throw new GameCompletedException('cannot modify score after submission'); + } + + $score = Score::createFromJsonOrExplode($params); + $mods = $score->data->mods; + + if (!empty($this->playlistItem->required_mods)) { + $missingMods = array_diff( + array_column($this->playlistItem->required_mods, 'acronym'), + array_column($mods, 'acronym') + ); + + if (!empty($missingMods)) { + throw new InvariantException('This play does not include the mods required.'); + } + } + + if (!empty($this->playlistItem->allowed_mods)) { + $missingMods = array_diff( + array_column($mods, 'acronym'), + array_column($this->playlistItem->required_mods, 'acronym'), + array_column($this->playlistItem->allowed_mods, 'acronym') + ); + + if (!empty($missingMods)) { + throw new InvariantException('This play includes mods that are not allowed.'); + } + } + + $this->score()->associate($score); + $this->save(); + }); + } + + public function position(): ?int + { + $score = $this->score; + + if ($score === null) { + return null; + } + + $query = PlaylistItemUserHighScore + ::where('playlist_item_id', $this->playlist_item_id) + ->cursorSort('score_asc', [ + 'total_score' => $score->data->totalScore, + 'score_link_id' => $this->getKey(), + ]); + + return 1 + $query->count(); + } + + private function getScoreOrDefault(): Score + { + return $this->score ?? ($this->defaultScore ??= new Score([ + 'beatmap_id' => $this->beatmap_id, + 'ruleset_id' => $this->ruleset_id, + 'user_id' => $this->user_id, + 'created_at' => Carbon::now(), + 'data' => [], + ])); + } +} diff --git a/app/Models/Multiplayer/UserScoreAggregate.php b/app/Models/Multiplayer/UserScoreAggregate.php index f0d68ecd52a..472efb6a5a7 100644 --- a/app/Models/Multiplayer/UserScoreAggregate.php +++ b/app/Models/Multiplayer/UserScoreAggregate.php @@ -8,6 +8,7 @@ use App\Models\Model; use App\Models\Traits\WithDbCursorHelper; use App\Models\User; +use Illuminate\Database\Eloquent\Builder; /** * Aggregate root for user multiplayer high scores. @@ -32,7 +33,7 @@ class UserScoreAggregate extends Model const SORTS = [ 'score_asc' => [ ['column' => 'total_score', 'order' => 'ASC'], - ['column' => 'last_score_id', 'order' => 'DESC'], + ['column' => 'last_score_link_id', 'order' => 'DESC'], ], ]; @@ -69,18 +70,19 @@ public static function new(User $user, Room $room): self return $obj; } - public function addScore(Score $score) + public function addScoreLink(ScoreLink $scoreLink) { - return $this->getConnection()->transaction(function () use ($score) { - if (!$score->isCompleted()) { + return $this->getConnection()->transaction(function () use ($scoreLink) { + $score = $scoreLink->score; + if ($score === null) { return false; } - $highestScore = PlaylistItemUserHighScore::lookupOrDefault($score); + $highestScore = PlaylistItemUserHighScore::lookupOrDefault($scoreLink); - if ($score->passed && $score->total_score > $highestScore->total_score) { - $this->updateUserTotal($score, $highestScore); - $highestScore->updateWithScore($score); + if ($score->data->passed && $score->data->totalScore > $highestScore->total_score) { + $this->updateUserTotal($scoreLink, $highestScore); + $highestScore->updateWithScoreLink($scoreLink); } return true; @@ -97,23 +99,21 @@ public function averagePp() return $this->completed > 0 ? $this->pp / $this->completed : 0; } - public function getScores() + public function scoreLinks(): Builder { - return Score + return ScoreLink ::where('room_id', $this->room_id) - ->where('user_id', $this->user_id) - ->get(); + ->where('user_id', $this->user_id); } public function recalculate() { $this->getConnection()->transaction(function () { $this->removeRunningTotals(); - $this->getScores()->each(function ($score) { + foreach ($this->scoreLinks()->with('score.performance')->get() as $scoreLink) { $this->attempts++; - $this->addScore($score); - }); - + $this->addScoreLink($scoreLink); + } $this->save(); }); } @@ -144,7 +144,7 @@ public function scopeForRanking($query) $userQuery->default(); }) ->orderBy('total_score', 'DESC') - ->orderBy('last_score_id', 'ASC'); + ->orderBy('last_score_link_id', 'ASC'); } public function updateUserAttempts() @@ -159,7 +159,7 @@ public function user() public function userRank() { - if ($this->total_score === null || $this->last_score_id === null) { + if ($this->total_score === null || $this->last_score_link_id === null) { return; } @@ -169,7 +169,7 @@ public function userRank() return 1 + $query->count(); } - private function updateUserTotal(Score $current, PlaylistItemUserHighScore $prev) + private function updateUserTotal(ScoreLink $currentScoreLink, PlaylistItemUserHighScore $prev) { if ($prev->exists) { $this->total_score -= $prev->total_score; @@ -178,11 +178,13 @@ private function updateUserTotal(Score $current, PlaylistItemUserHighScore $prev $this->completed--; } - $this->total_score += $current->total_score; - $this->accuracy += $current->accuracy; + $current = $currentScoreLink->score; + + $this->total_score += $current->data->totalScore; + $this->accuracy += $current->data->accuracy; $this->pp += $current->pp; $this->completed++; - $this->last_score_id = $current->getKey(); + $this->last_score_link_id = $currentScoreLink->getKey(); $this->save(); } diff --git a/app/Models/Solo/Score.php b/app/Models/Solo/Score.php index 6bca92c036d..5765d243f4f 100644 --- a/app/Models/Solo/Score.php +++ b/app/Models/Solo/Score.php @@ -11,9 +11,11 @@ use App\Libraries\Search\ScoreSearchParams; use App\Models\Beatmap; use App\Models\Model; +use App\Models\Multiplayer\ScoreLink as MultiplayerScoreLink; use App\Models\Score as LegacyScore; use App\Models\Traits; use App\Models\User; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use LaravelRedis; use Storage; @@ -30,7 +32,7 @@ * @property User $user * @property int $user_id */ -class Score extends Model implements Traits\ReportableInterface +class Score extends Model implements Traits\ReportableInterface, Traits\SoloScoreInterface { use Traits\Reportable, Traits\WithWeightedPp; @@ -66,6 +68,28 @@ public static function createFromJsonOrExplode(array $params) return $score; } + public static function extractParams(array $params, ScoreToken|MultiplayerScoreLink $scoreToken): array + { + return [ + ...get_params($params, null, [ + 'accuracy:float', + 'max_combo:int', + 'maximum_statistics:array', + 'passed:bool', + 'rank:string', + 'statistics:array', + 'total_score:int', + ]), + 'beatmap_id' => $scoreToken->beatmap_id, + 'build_id' => $scoreToken->build_id, + 'ended_at' => json_time(Carbon::now()), + 'mods' => app('mods')->parseInputArray($scoreToken->ruleset_id, get_arr($params['mods'] ?? null) ?? []), + 'ruleset_id' => $scoreToken->ruleset_id, + 'started_at' => $scoreToken->created_at_json, + 'user_id' => $scoreToken->user_id, + ]; + } + /** * Queue the item for score processing * diff --git a/app/Models/Solo/ScoreData.php b/app/Models/Solo/ScoreData.php index 2338fa1d010..5fd564293c4 100644 --- a/app/Models/Solo/ScoreData.php +++ b/app/Models/Solo/ScoreData.php @@ -87,7 +87,13 @@ public function get($model, $key, $value, $attributes) public function set($model, $key, $value, $attributes) { if (!($value instanceof ScoreData)) { - $value = new ScoreData($value); + $value = new ScoreData([ + 'beatmap_id' => $attributes['beatmap_id'] ?? null, + 'ended_at' => $attributes['created_at'] ?? null, + 'ruleset_id' => $attributes['ruleset_id'] ?? null, + 'user_id' => $attributes['user_id'] ?? null, + ...$value, + ]); } return ['data' => json_encode($value)]; diff --git a/app/Models/Traits/SoloScoreInterface.php b/app/Models/Traits/SoloScoreInterface.php new file mode 100644 index 00000000000..3541b877c57 --- /dev/null +++ b/app/Models/Traits/SoloScoreInterface.php @@ -0,0 +1,16 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +namespace App\Models\Traits; + +interface SoloScoreInterface +{ + // Eloquent attributes + // public \App\Models\Solo\ScoreData $data; + // public bool $has_replay + // public float $pp; +} diff --git a/app/Transformers/Multiplayer/ScoreTransformer.php b/app/Transformers/Multiplayer/ScoreTransformer.php deleted file mode 100644 index d5b2e46974a..00000000000 --- a/app/Transformers/Multiplayer/ScoreTransformer.php +++ /dev/null @@ -1,94 +0,0 @@ -. Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -namespace App\Transformers\Multiplayer; - -use App\Models\Multiplayer\PlaylistItemUserHighScore; -use App\Models\Multiplayer\Score; -use App\Transformers\TransformerAbstract; -use App\Transformers\UserCompactTransformer; - -class ScoreTransformer extends TransformerAbstract -{ - // warning: this is actually for PlaylistItemUserHighScore, not for Score - const BASE_PRELOAD = ['score.user.userProfileCustomization', 'score.user.country']; - const BASE_INCLUDES = ['user.country', 'user.cover']; - - protected array $availableIncludes = [ - 'position', - 'scores_around', - 'user', - ]; - - public function transform(Score $score) - { - return [ - 'id' => $score->id, - 'user_id' => $score->user_id, - 'room_id' => $score->room_id, - 'playlist_item_id' => $score->playlist_item_id, - 'beatmap_id' => $score->beatmap_id, - 'rank' => $score->rank, - 'total_score' => $score->total_score, - 'accuracy' => $score->accuracy, - 'max_combo' => $score->max_combo, - 'mods' => $score->mods, - 'statistics' => $score->statistics, - 'passed' => $score->passed, - - 'started_at' => json_time($score->started_at), - 'ended_at' => json_time($score->ended_at), - ]; - } - - public function includePosition(Score $score) - { - return $this->primitive($score->userRank()); - } - - public function includeScoresAround(Score $score) - { - $limit = 10; - - $highScorePlaceholder = new PlaylistItemUserHighScore([ - 'score_id' => $score->getKey(), - 'total_score' => $score->total_score, - ]); - - $typeOptions = [ - 'higher' => 'score_asc', - 'lower' => 'score_desc', - ]; - - $ret = []; - - foreach ($typeOptions as $type => $sortName) { - $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($sortName); - [$highScores, $hasMore] = PlaylistItemUserHighScore - ::cursorSort($cursorHelper, $highScorePlaceholder) - ->with(static::BASE_PRELOAD) - ->where('playlist_item_id', $score->playlist_item_id) - ->where('user_id', '<>', $score->user_id) - ->limit($limit) - ->getWithHasMore(); - - $ret[$type] = [ - 'scores' => json_collection($highScores->pluck('score'), new static(), static::BASE_INCLUDES), - 'params' => ['limit' => $limit, 'sort' => $cursorHelper->getSortName()], - ...cursor_for_response($cursorHelper->next($highScores, $hasMore)), - ]; - } - - return $this->primitive($ret); - } - - public function includeUser(Score $score) - { - return $this->item( - $score->user, - new UserCompactTransformer() - ); - } -} diff --git a/app/Transformers/Score/CurrentUserAttributesTransformer.php b/app/Transformers/Score/CurrentUserAttributesTransformer.php index 5ed7b0fa8b6..ced66eb3dbe 100644 --- a/app/Transformers/Score/CurrentUserAttributesTransformer.php +++ b/app/Transformers/Score/CurrentUserAttributesTransformer.php @@ -10,11 +10,12 @@ use App\Models\LegacyMatch; use App\Models\Score\Model as ScoreModel; use App\Models\Solo\Score as SoloScore; +use App\Models\Traits\SoloScoreInterface; use App\Transformers\TransformerAbstract; class CurrentUserAttributesTransformer extends TransformerAbstract { - public function transform(LegacyMatch\Score|ScoreModel|SoloScore $score): array + public function transform(LegacyMatch\Score|ScoreModel|SoloScoreInterface $score): array { $pinnable = $score instanceof ScoreModel ? $score->best diff --git a/app/Transformers/ScoreTransformer.php b/app/Transformers/ScoreTransformer.php index d0d63f225ed..fcd373fe902 100644 --- a/app/Transformers/ScoreTransformer.php +++ b/app/Transformers/ScoreTransformer.php @@ -10,13 +10,24 @@ use App\Models\Beatmap; use App\Models\DeletedUser; use App\Models\LegacyMatch; +use App\Models\Multiplayer\PlaylistItemUserHighScore; +use App\Models\Multiplayer\ScoreLink as MultiplayerScoreLink; use App\Models\Score\Best\Model as ScoreBest; use App\Models\Score\Model as ScoreModel; use App\Models\Solo\Score as SoloScore; +use App\Models\Traits\SoloScoreInterface; use League\Fractal\Resource\Item; class ScoreTransformer extends TransformerAbstract { + const MULTIPLAYER_BASE_INCLUDES = ['user.country', 'user.cover']; + // warning: the preload is actually for PlaylistItemUserHighScore, not for Score + const MULTIPLAYER_BASE_PRELOAD = [ + 'scoreLink.score.performance', + 'scoreLink.user.country', + 'scoreLink.user.userProfileCustomization', + ]; + const TYPE_LEGACY = 'legacy'; const TYPE_SOLO = 'solo'; @@ -38,6 +49,10 @@ class ScoreTransformer extends TransformerAbstract 'rank_global', 'user', 'weight', + + // Only for MultiplayerScoreLink + 'position', + 'scores_around', ]; protected array $defaultIncludes = [ @@ -46,6 +61,11 @@ class ScoreTransformer extends TransformerAbstract private string $transformFunction; + public static function newSolo(): static + { + return new static(static::TYPE_SOLO); + } + public function __construct(?string $type = null) { $type ??= is_api_request() && api_version() < 20220705 @@ -62,14 +82,14 @@ public function __construct(?string $type = null) } } - public function transform(LegacyMatch\Score|ScoreModel|SoloScore $score) + public function transform(LegacyMatch\Score|ScoreModel|SoloScoreInterface $score) { $fn = $this->transformFunction; return $this->$fn($score); } - public function transformSolo(ScoreModel|SoloScore $score) + public function transformSolo(ScoreModel|SoloScoreInterface $score) { if ($score instanceof ScoreModel) { $legacyPerfect = $score->perfect; @@ -80,19 +100,28 @@ public function transformSolo(ScoreModel|SoloScore $score) $pp = $best->pp; $replay = $best->replay; } - } elseif ($score instanceof SoloScore) { + } elseif ($score instanceof SoloScoreInterface) { $pp = $score->pp; $replay = $score->has_replay; + + if ($score instanceof MultiplayerScoreLink) { + $multiplayerAttributes = [ + 'room_id' => $score->room_id, + 'playlist_item_id' => $score->playlist_item_id, + ]; + } } - return array_merge($score->data->jsonSerialize(), [ + return [ + ...$score->data->jsonSerialize(), + ...($multiplayerAttributes ?? []), 'best_id' => $bestId ?? null, 'id' => $score->getKey(), 'legacy_perfect' => $legacyPerfect ?? null, 'pp' => $pp ?? null, 'replay' => $replay ?? false, 'type' => $score->getMorphClass(), - ]); + ]; } public function transformLegacy(LegacyMatch\Score|ScoreModel|SoloScore $score) @@ -170,7 +199,7 @@ public function includeBeatmapset(LegacyMatch\Score|ScoreModel|SoloScore $score) return $this->item($score->beatmap->beatmapset, new BeatmapsetCompactTransformer()); } - public function includeCurrentUserAttributes(LegacyMatch\Score|ScoreModel|SoloScore $score): Item + public function includeCurrentUserAttributes(LegacyMatch\Score|ScoreModel|SoloScoreInterface $score): Item { return $this->item($score, new Score\CurrentUserAttributesTransformer()); } @@ -184,6 +213,47 @@ public function includeMatch(LegacyMatch\Score $score) ]); } + public function includePosition(MultiplayerScoreLink $scoreLink) + { + return $this->primitive($scoreLink->position()); + } + + public function includeScoresAround(MultiplayerScoreLink $scoreLink) + { + $limit = 10; + + $highScorePlaceholder = new PlaylistItemUserHighScore([ + 'score_link_id' => $scoreLink->getKey(), + 'total_score' => $scoreLink->data->totalScore, + ]); + + $typeOptions = [ + 'higher' => 'score_asc', + 'lower' => 'score_desc', + ]; + + $ret = []; + + foreach ($typeOptions as $type => $sortName) { + $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($sortName); + [$highScores, $hasMore] = PlaylistItemUserHighScore + ::cursorSort($cursorHelper, $highScorePlaceholder) + ->with(static::MULTIPLAYER_BASE_PRELOAD) + ->where('playlist_item_id', $scoreLink->playlist_item_id) + ->where('user_id', '<>', $scoreLink->user_id) + ->limit($limit) + ->getWithHasMore(); + + $ret[$type] = [ + 'scores' => json_collection($highScores->pluck('scoreLink.score'), new static(), static::MULTIPLAYER_BASE_INCLUDES), + 'params' => ['limit' => $limit, 'sort' => $cursorHelper->getSortName()], + ...cursor_for_response($cursorHelper->next($highScores, $hasMore)), + ]; + } + + return $this->primitive($ret); + } + public function includeRankCountry(ScoreBest|SoloScore $score) { return $this->primitive($score->userRank(['type' => 'country'])); @@ -194,7 +264,7 @@ public function includeRankGlobal(ScoreBest|SoloScore $score) return $this->primitive($score->userRank([])); } - public function includeUser(LegacyMatch\Score|ScoreModel|SoloScore $score) + public function includeUser(LegacyMatch\Score|ScoreModel|SoloScoreInterface $score) { return $this->item( $score->user ?? new DeletedUser(['user_id' => $score->user_id]), diff --git a/database/factories/Multiplayer/ScoreFactory.php b/database/factories/Multiplayer/ScoreFactory.php deleted file mode 100644 index e72320d3713..00000000000 --- a/database/factories/Multiplayer/ScoreFactory.php +++ /dev/null @@ -1,53 +0,0 @@ -. Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -declare(strict_types=1); - -namespace Database\Factories\Multiplayer; - -use App\Models\Multiplayer\PlaylistItem; -use App\Models\Multiplayer\Score; -use App\Models\User; -use Carbon\Carbon; -use Database\Factories\Factory; - -class ScoreFactory extends Factory -{ - protected $model = Score::class; - - public function completed(): static - { - return $this->state(['ended_at' => Carbon::now()->subMinutes(1)]); - } - - public function definition(): array - { - return [ - 'playlist_item_id' => PlaylistItem::factory(), - 'beatmap_id' => fn(array $attributes) => PlaylistItem::find($attributes['playlist_item_id'])->beatmap_id, - 'room_id' => fn(array $attributes) => PlaylistItem::find($attributes['playlist_item_id'])->room_id, - 'user_id' => User::factory(), - 'total_score' => 1, - 'started_at' => fn() => Carbon::now()->subMinutes(5), - 'accuracy' => 0.5, - 'pp' => 1, - ]; - } - - public function failed(): static - { - return $this->completed()->state(['passed' => false]); - } - - public function passed(): static - { - return $this->completed()->state(['passed' => true]); - } - - public function scoreless(): static - { - return $this->state(['total_score' => 0]); - } -} diff --git a/database/factories/Multiplayer/ScoreLinkFactory.php b/database/factories/Multiplayer/ScoreLinkFactory.php new file mode 100644 index 00000000000..947d5679632 --- /dev/null +++ b/database/factories/Multiplayer/ScoreLinkFactory.php @@ -0,0 +1,52 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +namespace Database\Factories\Multiplayer; + +use App\Models\Multiplayer\PlaylistItem; +use App\Models\Multiplayer\ScoreLink; +use App\Models\Solo\Score; +use App\Models\User; +use Database\Factories\Factory; + +class ScoreLinkFactory extends Factory +{ + protected $model = ScoreLink::class; + + public function completed(?array $scoreAttr = [], ?array $scoreDataAttr = []): static + { + return $this->state([ + 'score_id' => fn (array $attr) => Score::factory([ + 'beatmap_id' => $attr['beatmap_id'], + 'user_id' => $attr['user_id'], + ...$scoreAttr, + ])->withData($scoreDataAttr), + ]); + } + + public function definition(): array + { + return [ + 'playlist_item_id' => PlaylistItem::factory(), + 'user_id' => User::factory(), + + // depends on PlaylistItem + 'beatmap_id' => fn (array $attr) => PlaylistItem::find($attr['playlist_item_id'])->beatmap_id, + 'room_id' => fn (array $attr) => PlaylistItem::find($attr['playlist_item_id'])->room_id, + ]; + } + + public function failed(): static + { + return $this->completed([], ['passed' => false]); + } + + public function passed(): static + { + return $this->completed([], ['passed' => true]); + } +} diff --git a/database/migrations/2023_07_26_103744_create_multiplayer_score_links.php b/database/migrations/2023_07_26_103744_create_multiplayer_score_links.php new file mode 100644 index 00000000000..56ef5d490cb --- /dev/null +++ b/database/migrations/2023_07_26_103744_create_multiplayer_score_links.php @@ -0,0 +1,45 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; + +return new class extends Migration +{ + /** + * Run the migrations. + */ + public function up(): void + { + Schema::create('multiplayer_score_links', function (Blueprint $table) { + $table->id(); + + $table->unsignedInteger('user_id'); + $table->unsignedBigInteger('room_id'); + $table->unsignedBigInteger('playlist_item_id'); + $table->unsignedMediumInteger('beatmap_id'); + $table->unsignedMediumInteger('build_id')->default(0); + $table->unsignedBigInteger('score_id')->nullable(); + + $table->timestampsTz(); + + $table->index('score_id'); + $table->index(['room_id', 'user_id']); + $table->index('playlist_item_id'); + $table->index('user_id'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('multiplayer_score_links'); + } +}; diff --git a/database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php b/database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php new file mode 100644 index 00000000000..7718661bd61 --- /dev/null +++ b/database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php @@ -0,0 +1,35 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; + +return new class extends Migration +{ + /** + * Run the migrations. + */ + public function up(): void + { + Schema::table('multiplayer_scores_high', function (Blueprint $table) { + $table->unsignedBigInteger('score_link_id')->nullable()->after('score_id'); + $table->index(['playlist_item_id', DB::raw('total_score DESC'), 'score_link_id'], 'top_scores_linked'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('multiplayer_scores_high', function (Blueprint $table) { + $table->dropIndex('top_scores_linked'); + $table->dropColumn('score_link_id'); + }); + } +}; diff --git a/database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php b/database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php new file mode 100644 index 00000000000..55819991c91 --- /dev/null +++ b/database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php @@ -0,0 +1,33 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; + +return new class extends Migration +{ + /** + * Run the migrations. + */ + public function up(): void + { + Schema::table('multiplayer_rooms_high', function (Blueprint $table) { + $table->unsignedBigInteger('last_score_link_id')->nullable()->after('last_score_id'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('multiplayer_rooms_high', function (Blueprint $table) { + $table->dropColumn('last_score_link_id'); + }); + } +}; diff --git a/database/seeders/ModelSeeders/MultiplayerSeeder.php b/database/seeders/ModelSeeders/MultiplayerSeeder.php index 89562aea728..43472f1f026 100644 --- a/database/seeders/ModelSeeders/MultiplayerSeeder.php +++ b/database/seeders/ModelSeeders/MultiplayerSeeder.php @@ -10,7 +10,7 @@ use App\Models\Beatmap; use App\Models\Multiplayer\PlaylistItem; use App\Models\Multiplayer\Room; -use App\Models\Multiplayer\Score; +use App\Models\Multiplayer\ScoreLink; use App\Models\User; use Carbon\Carbon; use Illuminate\Database\Seeder; @@ -39,18 +39,22 @@ public function run() $attempts = rand(1, 10); for ($i = 0; $i < $attempts; $i++) { $completed = rand(0, 100) > 20; - Score::factory()->create([ + $scoreLink = ScoreLink::factory()->make([ 'playlist_item_id' => $playlistItem->getKey(), 'user_id' => $user->getKey(), 'beatmap_id' => $beatmap->getKey(), 'room_id' => $room->getKey(), - 'total_score' => rand(10000, 100000), - 'started_at' => Carbon::now()->subMinutes(5), - 'ended_at' => $completed ? Carbon::now() : null, - 'passed' => $completed ? rand(0, 100) > 20 : null, - 'accuracy' => rand(50, 100) / 100, - 'pp' => rand(100, 200), ]); + if ($completed) { + $scoreLink = $scoreLink->completed([ + 'pp' => rand(100, 200), + ], [ + 'total_score' => rand(10000, 100000), + 'started_at' => Carbon::now()->subMinutes(5), + 'passed' => rand(0, 100) > 20, + 'accuracy' => rand(50, 100) / 100, + ]); + } } } } diff --git a/tests/Controllers/Chat/ChannelsControllerTest.php b/tests/Controllers/Chat/ChannelsControllerTest.php index 519f0fd57af..603879f66db 100644 --- a/tests/Controllers/Chat/ChannelsControllerTest.php +++ b/tests/Controllers/Chat/ChannelsControllerTest.php @@ -10,7 +10,7 @@ use App\Libraries\UserChannelList; use App\Models\Chat\Channel; use App\Models\Chat\Message; -use App\Models\Multiplayer\Score; +use App\Models\Multiplayer\ScoreLink; use App\Models\User; use Illuminate\Testing\AssertableJsonString; use Illuminate\Testing\Fluent\AssertableJson; @@ -181,11 +181,11 @@ public function testChannelJoinPM() // fail public function testChannelJoinMultiplayerWhenNotParticipated() { - $score = Score::factory()->create(); + $scoreLink = ScoreLink::factory()->create(); $this->actAsScopedUser($this->user, ['*']); $request = $this->json('PUT', route('api.chat.channels.join', [ - 'channel' => $score->room->channel_id, + 'channel' => $scoreLink->room->channel_id, 'user' => $this->user->getKey(), ])); @@ -194,15 +194,15 @@ public function testChannelJoinMultiplayerWhenNotParticipated() public function testChannelJoinMultiplayerWhenParticipated() { - $score = Score::factory()->create(['user_id' => $this->user]); + $scoreLink = ScoreLink::factory()->create(['user_id' => $this->user]); $this->actAsScopedUser($this->user, ['*']); $request = $this->json('PUT', route('api.chat.channels.join', [ - 'channel' => $score->room->channel_id, + 'channel' => $scoreLink->room->channel_id, 'user' => $this->user->getKey(), ])); - $request->assertStatus(200)->assertJsonFragment(['channel_id' => $score->room->channel_id, 'type' => Channel::TYPES['multiplayer']]); + $request->assertStatus(200)->assertJsonFragment(['channel_id' => $scoreLink->room->channel_id, 'type' => Channel::TYPES['multiplayer']]); } //endregion diff --git a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php index dc4e6ceec0f..ce254f7eb6d 100644 --- a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php +++ b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php @@ -7,7 +7,7 @@ use App\Models\Build; use App\Models\Multiplayer\PlaylistItem; -use App\Models\Multiplayer\Score; +use App\Models\Multiplayer\ScoreLink; use App\Models\User; use Tests\TestCase; @@ -15,15 +15,15 @@ class ScoresControllerTest extends TestCase { public function testShow() { - $score = Score::factory()->create(); + $scoreLink = ScoreLink::factory()->create(); $user = User::factory()->create(); $this->actAsScopedUser($user, ['*']); $this->json('GET', route('api.rooms.playlist.scores.show', [ - 'room' => $score->room_id, - 'playlist' => $score->playlist_item_id, - 'score' => $score->getKey(), + 'room' => $scoreLink->room_id, + 'playlist' => $scoreLink->playlist_item_id, + 'score' => $scoreLink->getKey(), ]))->assertSuccessful(); } @@ -35,7 +35,6 @@ public function testStore($allowRanking, $hashParam, $status) $user = User::factory()->create(); $playlistItem = PlaylistItem::factory()->create(); $build = Build::factory()->create(['allow_ranking' => $allowRanking]); - $initialScoresCount = Score::count(); $this->actAsScopedUser($user, ['*']); @@ -44,14 +43,13 @@ public function testStore($allowRanking, $hashParam, $status) $params['version_hash'] = $hashParam ? bin2hex($build->hash) : md5('invalid_'); } + $countDiff = ((string) $status)[0] === '2' ? 1 : 0; + $this->expectCountChange(fn () => ScoreLink::count(), $countDiff); + $this->json('POST', route('api.rooms.playlist.scores.store', [ 'room' => $playlistItem->room_id, 'playlist' => $playlistItem->getKey(), ]), $params)->assertStatus($status); - - $countDiff = ((string) $status)[0] === '2' ? 1 : 0; - - $this->assertSame($initialScoresCount + $countDiff, Score::count()); } /** @@ -63,14 +61,14 @@ public function testUpdate($bodyParams, $status) $playlistItem = PlaylistItem::factory()->create(); $room = $playlistItem->room; $build = Build::factory()->create(['allow_ranking' => true]); - $score = $room->startPlay($user, $playlistItem); + $scoreLink = $room->startPlay($user, $playlistItem, 0); $this->actAsScopedUser($user, ['*']); $url = route('api.rooms.playlist.scores.update', [ 'room' => $room, 'playlist' => $playlistItem, - 'score' => $score, + 'score' => $scoreLink, ]); $this->json('PUT', $url, $bodyParams)->assertStatus($status); diff --git a/tests/Models/ContestTest.php b/tests/Models/ContestTest.php index 63626390278..7203182c993 100644 --- a/tests/Models/ContestTest.php +++ b/tests/Models/ContestTest.php @@ -14,8 +14,10 @@ use App\Models\ContestEntry; use App\Models\Multiplayer\PlaylistItem; use App\Models\Multiplayer\Room; -use App\Models\Multiplayer\Score as MultiplayerScore; +use App\Models\Multiplayer\ScoreLink as MultiplayerScoreLink; +use App\Models\Multiplayer\UserScoreAggregate; use App\Models\User; +use Carbon\Carbon; use Tests\TestCase; class ContestTest extends TestCase @@ -56,28 +58,37 @@ public function testAssertVoteRequirementPlaylistBeatmapsets(bool $loggedIn, boo ]); $entries = ContestEntry::factory()->count(2)->create(['contest_id' => $contest->getKey()]); - if (!$canVote) { - $this->expectException(InvariantException::class); - } - $user = $loggedIn ? User::factory()->create() : null; if ($loggedIn && $played) { $userId = $user->getKey(); - $endedAt = now(); + $endedAt = json_time(Carbon::now()); foreach ($beatmapsets as $beatmapset) { $room = array_rand_val($rooms); $playlistItem = $room ->playlist() ->whereIn('beatmap_id', array_column($beatmapset->beatmaps->all(), 'beatmap_id')) ->first(); - MultiplayerScore::factory()->create([ - 'ended_at' => $completed ? $endedAt : null, - 'passed' => $passed, + + $scoreLink = MultiplayerScoreLink::factory()->state([ 'playlist_item_id' => $playlistItem, 'user_id' => $userId, ]); + if ($completed) { + $scoreLink = $scoreLink->completed([], [ + 'ended_at' => $endedAt, + 'passed' => $passed, + ]); + } + $scoreLink->create(); } + foreach ($rooms as $room) { + UserScoreAggregate::lookupOrDefault($user, $room)->recalculate(); + } + } + + if (!$canVote) { + $this->expectException(InvariantException::class); } $contest->assertVoteRequirement($user); diff --git a/tests/Models/Multiplayer/RoomTest.php b/tests/Models/Multiplayer/RoomTest.php index e10a870fe00..29ea49cd44d 100644 --- a/tests/Models/Multiplayer/RoomTest.php +++ b/tests/Models/Multiplayer/RoomTest.php @@ -100,7 +100,7 @@ public function testRoomHasEnded() ]); $this->expectException(InvariantException::class); - $room->startPlay($user, $playlistItem); + $room->startPlay($user, $playlistItem, 0); } public function testStartPlay(): void @@ -111,12 +111,12 @@ public function testStartPlay(): void $this->expectCountChange(fn () => $room->participant_count, 1); $this->expectCountChange(fn () => $room->userHighScores()->count(), 1); - $this->expectCountChange(fn () => $room->scores()->count(), 1); + $this->expectCountChange(fn () => $room->scoreLinks()->count(), 1); - $room->startPlay($user, $playlistItem); + $room->startPlay($user, $playlistItem, 0); $room->refresh(); - $this->assertSame($user->getKey(), $room->scores()->last()->user_id); + $this->assertSame($user->getKey(), $room->scoreLinks()->last()->user_id); } public function testMaxAttemptsReached() @@ -126,14 +126,14 @@ public function testMaxAttemptsReached() $playlistItem1 = PlaylistItem::factory()->create(['room_id' => $room]); $playlistItem2 = PlaylistItem::factory()->create(['room_id' => $room]); - $room->startPlay($user, $playlistItem1); + $room->startPlay($user, $playlistItem1, 0); $this->assertTrue(true); - $room->startPlay($user, $playlistItem2); + $room->startPlay($user, $playlistItem2, 0); $this->assertTrue(true); $this->expectException(InvariantException::class); - $room->startPlay($user, $playlistItem1); + $room->startPlay($user, $playlistItem1, 0); } public function testMaxAttemptsForItemReached() @@ -149,21 +149,21 @@ public function testMaxAttemptsForItemReached() 'max_attempts' => 1, ]); - $initialCount = $room->scores()->count(); - $room->startPlay($user, $playlistItem1); - $this->assertSame($initialCount + 1, $room->scores()->count()); + $initialCount = $room->scoreLinks()->count(); + $room->startPlay($user, $playlistItem1, 0); + $this->assertSame($initialCount + 1, $room->scoreLinks()->count()); - $initialCount = $room->scores()->count(); + $initialCount = $room->scoreLinks()->count(); try { - $room->startPlay($user, $playlistItem1); + $room->startPlay($user, $playlistItem1, 0); } catch (Exception $ex) { $this->assertTrue($ex instanceof InvariantException); } - $this->assertSame($initialCount, $room->scores()->count()); + $this->assertSame($initialCount, $room->scoreLinks()->count()); - $initialCount = $room->scores()->count(); - $room->startPlay($user, $playlistItem2); - $this->assertSame($initialCount + 1, $room->scores()->count()); + $initialCount = $room->scoreLinks()->count(); + $room->startPlay($user, $playlistItem2, 0); + $this->assertSame($initialCount + 1, $room->scoreLinks()->count()); } public function testCannotStartPlayedItem() diff --git a/tests/Models/Multiplayer/UserScoreAggregateTest.php b/tests/Models/Multiplayer/UserScoreAggregateTest.php index 0992b270597..21a8e3ef04b 100644 --- a/tests/Models/Multiplayer/UserScoreAggregateTest.php +++ b/tests/Models/Multiplayer/UserScoreAggregateTest.php @@ -7,7 +7,7 @@ use App\Models\Multiplayer\PlaylistItem; use App\Models\Multiplayer\Room; -use App\Models\Multiplayer\Score; +use App\Models\Multiplayer\ScoreLink; use App\Models\Multiplayer\UserScoreAggregate; use App\Models\User; use Tests\TestCase; @@ -21,7 +21,7 @@ public function testStartingPlayIncreasesAttempts() $user = User::factory()->create(); $playlistItem = $this->playlistItem(); - $this->room->startPlay($user, $playlistItem); + $this->room->startPlay($user, $playlistItem, 0); $agg = UserScoreAggregate::new($user, $this->room); $this->assertSame(1, $agg->attempts); @@ -34,14 +34,14 @@ public function testInCompleteScoresAreNotCounted() $playlistItem = $this->playlistItem(); $agg = UserScoreAggregate::new($user, $this->room); - $score = Score::factory() - ->create([ + $scoreLink = ScoreLink::factory() + ->state([ 'room_id' => $this->room, 'playlist_item_id' => $playlistItem, 'user_id' => $user, - ]); + ])->create(); - $agg->addScore($score); + $agg->addScoreLink($scoreLink); $result = json_item($agg, 'Multiplayer\UserScoreAggregate'); $this->assertSame(0, $result['completed']); @@ -54,24 +54,25 @@ public function testFailedScoresAreAttemptsOnly() $playlistItem = $this->playlistItem(); $agg = UserScoreAggregate::new($user, $this->room); - $agg->addScore( - Score::factory() - ->failed() - ->create([ + $agg->addScoreLink( + ScoreLink + ::factory() + ->state([ 'room_id' => $this->room, 'playlist_item_id' => $playlistItem, 'user_id' => $user, - ]) + ])->failed() + ->create() ); - $agg->addScore( - Score::factory() - ->passed() - ->create([ + $agg->addScoreLink( + ScoreLink::factory() + ->state([ 'room_id' => $this->room, 'playlist_item_id' => $playlistItem, 'user_id' => $user, - ]) + ])->completed([], ['passed' => true, 'total_score' => 1]) + ->create() ); $result = json_item($agg, 'Multiplayer\UserScoreAggregate'); @@ -86,14 +87,14 @@ public function testPassedScoresIncrementsCompletedCount() $playlistItem = $this->playlistItem(); $agg = UserScoreAggregate::new($user, $this->room); - $agg->addScore( - Score::factory() - ->passed() - ->create([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem, - 'user_id' => $user, - ]) + $agg->addScoreLink( + ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem, + 'user_id' => $user, + ])->completed([], ['passed' => true, 'total_score' => 1]) + ->create() ); $result = json_item($agg, 'Multiplayer\UserScoreAggregate'); @@ -109,56 +110,60 @@ public function testPassedScoresAreAveraged() $playlistItem2 = $this->playlistItem(); $agg = UserScoreAggregate::new($user, $this->room); - $agg->addScore( - Score::factory() - ->create([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem, - 'user_id' => $user, - 'total_score' => 1, - 'pp' => 0.2, - 'pp' => 0.2, - ]) - ); - - $agg->addScore( - Score::factory() - ->failed() - ->create([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem, - 'user_id' => $user, - 'total_score' => 1, - 'accuracy' => 0.3, - 'pp' => 0.3, - ]) - ); - - $agg->addScore( - Score::factory() - ->passed() - ->create([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem, - 'user_id' => $user, - 'total_score' => 1, - 'accuracy' => 0.5, - 'pp' => 0.5, - ]) - ); - - $agg->addScore( - Score::factory() - ->passed() - ->create([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem2, - 'user_id' => $user, - 'total_score' => 1, - 'accuracy' => 0.8, - 'pp' => 0.8, - ]) - ); + $agg->addScoreLink(tap( + ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'passed' => false, + ])->create(), + fn ($l) => $l->score->performance()->create(['pp' => 0.2]), + )); + + $agg->addScoreLink(tap( + ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'accuracy' => 0.3, + 'passed' => false, + ])->create(), + fn ($l) => $l->score->performance()->create(['pp' => 0.3]), + )); + + $agg->addScoreLink(tap( + ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'accuracy' => 0.5, + 'passed' => true, + ])->create(), + fn ($l) => $l->score->performance()->create(['pp' => 0.5]), + )); + + $agg->addScoreLink(tap( + ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem2, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'accuracy' => 0.8, + 'passed' => true, + ])->create(), + fn ($l) => $l->score->performance()->create(['pp' => 0.8]), + )); $result = json_item($agg, 'Multiplayer\UserScoreAggregate'); From 5785951927fcc8dda9982992e2b3f210b7dd2866 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 17 Aug 2023 23:49:54 +0900 Subject: [PATCH 046/470] Don't check for average pp The number won't be correct as a lot would be involved to properly fill the data. The column itself may be deleted sometime later. --- .../Multiplayer/UserScoreAggregateTest.php | 97 ++++++++----------- 1 file changed, 42 insertions(+), 55 deletions(-) diff --git a/tests/Models/Multiplayer/UserScoreAggregateTest.php b/tests/Models/Multiplayer/UserScoreAggregateTest.php index 21a8e3ef04b..69433aa6971 100644 --- a/tests/Models/Multiplayer/UserScoreAggregateTest.php +++ b/tests/Models/Multiplayer/UserScoreAggregateTest.php @@ -110,64 +110,51 @@ public function testPassedScoresAreAveraged() $playlistItem2 = $this->playlistItem(); $agg = UserScoreAggregate::new($user, $this->room); - $agg->addScoreLink(tap( - ScoreLink::factory() - ->state([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem, - 'user_id' => $user, - ])->completed([], [ - 'total_score' => 1, - 'passed' => false, - ])->create(), - fn ($l) => $l->score->performance()->create(['pp' => 0.2]), - )); - - $agg->addScoreLink(tap( - ScoreLink::factory() - ->state([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem, - 'user_id' => $user, - ])->completed([], [ - 'total_score' => 1, - 'accuracy' => 0.3, - 'passed' => false, - ])->create(), - fn ($l) => $l->score->performance()->create(['pp' => 0.3]), - )); - - $agg->addScoreLink(tap( - ScoreLink::factory() - ->state([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem, - 'user_id' => $user, - ])->completed([], [ - 'total_score' => 1, - 'accuracy' => 0.5, - 'passed' => true, - ])->create(), - fn ($l) => $l->score->performance()->create(['pp' => 0.5]), - )); - - $agg->addScoreLink(tap( - ScoreLink::factory() - ->state([ - 'room_id' => $this->room, - 'playlist_item_id' => $playlistItem2, - 'user_id' => $user, - ])->completed([], [ - 'total_score' => 1, - 'accuracy' => 0.8, - 'passed' => true, - ])->create(), - fn ($l) => $l->score->performance()->create(['pp' => 0.8]), - )); + $agg->addScoreLink(ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'passed' => false, + ])->create()); + + $agg->addScoreLink(ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'accuracy' => 0.3, + 'passed' => false, + ])->create()); + + $agg->addScoreLink(ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'accuracy' => 0.5, + 'passed' => true, + ])->create()); + + $agg->addScoreLink(ScoreLink::factory() + ->state([ + 'room_id' => $this->room, + 'playlist_item_id' => $playlistItem2, + 'user_id' => $user, + ])->completed([], [ + 'total_score' => 1, + 'accuracy' => 0.8, + 'passed' => true, + ])->create()); $result = json_item($agg, 'Multiplayer\UserScoreAggregate'); - $this->assertSame(0.65, $result['pp']); $this->assertSame(0.65, $result['accuracy']); } From 1cf5b92b94987a2e4e2f3fbf798f0ddbe964316d Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 21 Aug 2023 19:39:40 +0900 Subject: [PATCH 047/470] Pluck correct thing --- .../Controllers/Multiplayer/Rooms/Playlist/ScoresController.php | 2 +- app/Transformers/ScoreTransformer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index 3e2ed735a5c..1fbbd2ad90d 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -58,7 +58,7 @@ public function index($roomId, $playlistId) $transformer = ScoreTransformer::newSolo(); $scoresJson = json_collection( - $highScores->pluck('score'), + $highScores->pluck('scoreLink'), $transformer, ScoreTransformer::MULTIPLAYER_BASE_INCLUDES ); diff --git a/app/Transformers/ScoreTransformer.php b/app/Transformers/ScoreTransformer.php index fcd373fe902..506f4b42340 100644 --- a/app/Transformers/ScoreTransformer.php +++ b/app/Transformers/ScoreTransformer.php @@ -245,7 +245,7 @@ public function includeScoresAround(MultiplayerScoreLink $scoreLink) ->getWithHasMore(); $ret[$type] = [ - 'scores' => json_collection($highScores->pluck('scoreLink.score'), new static(), static::MULTIPLAYER_BASE_INCLUDES), + 'scores' => json_collection($highScores->pluck('scoreLink'), new static(), static::MULTIPLAYER_BASE_INCLUDES), 'params' => ['limit' => $limit, 'sort' => $cursorHelper->getSortName()], ...cursor_for_response($cursorHelper->next($highScores, $hasMore)), ]; From e0998314ffeee9f0a1b1e31a92f6eadd16795e1d Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 21 Aug 2023 19:41:25 +0900 Subject: [PATCH 048/470] Only fetch new high scores (the ones with scoreLink) --- .../Controllers/Multiplayer/Rooms/Playlist/ScoresController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index 1fbbd2ad90d..8a1736d8168 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -51,6 +51,7 @@ public function index($roomId, $playlistId) [$highScores, $hasMore] = $playlist ->highScores() + ->whereHas('scoreLink') ->cursorSort($cursorHelper, cursor_from_params($params)) ->with(ScoreTransformer::MULTIPLAYER_BASE_PRELOAD) ->limit($limit) From 420a4fd0fb46795ac4a26a76d1d15412980e68a2 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 23 Aug 2023 14:26:37 +0900 Subject: [PATCH 049/470] Use correct attribute and transformer --- .../Multiplayer/Rooms/Playlist/ScoresController.php | 4 ++-- app/Transformers/ScoreTransformer.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index 8a1736d8168..5ce1c983ce6 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -71,7 +71,7 @@ public function index($roomId, $playlistId) $userHighScore = $playlist->highScores()->where('user_id', $user->getKey())->first(); if ($userHighScore !== null) { - $userScoreJson = json_item($userHighScore->score, $transformer, ScoreTransformer::BASE_INCLUDES); + $userScoreJson = json_item($userHighScore->scoreLink, $transformer, ScoreTransformer::MULTIPLAYER_BASE_INCLUDES); } } @@ -135,7 +135,7 @@ public function showUser($roomId, $playlistId, $userId) { $room = Room::find($roomId) ?? abort(404, 'Invalid room id'); $playlistItem = $room->playlist()->find($playlistId) ?? abort(404, 'Invalid playlist id'); - $score = $playlistItem->highScores()->where('user_id', $userId)->firstOrFail()->score ?? abort(404); + $score = $playlistItem->highScores()->where('user_id', $userId)->firstOrFail()->scoreLink ?? abort(404); return json_item( $score, diff --git a/app/Transformers/ScoreTransformer.php b/app/Transformers/ScoreTransformer.php index 506f4b42340..8d0dabb0b05 100644 --- a/app/Transformers/ScoreTransformer.php +++ b/app/Transformers/ScoreTransformer.php @@ -245,7 +245,7 @@ public function includeScoresAround(MultiplayerScoreLink $scoreLink) ->getWithHasMore(); $ret[$type] = [ - 'scores' => json_collection($highScores->pluck('scoreLink'), new static(), static::MULTIPLAYER_BASE_INCLUDES), + 'scores' => json_collection($highScores->pluck('scoreLink'), static::newSolo(), static::MULTIPLAYER_BASE_INCLUDES), 'params' => ['limit' => $limit, 'sort' => $cursorHelper->getSortName()], ...cursor_for_response($cursorHelper->next($highScores, $hasMore)), ]; From 10e1152f52445b4dca44d9f82cdb1fe55f497f7e Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 23 Aug 2023 15:25:31 +0900 Subject: [PATCH 050/470] Add test for scores index --- .../Rooms/Playlist/ScoresController.php | 15 +++++-- .../Rooms/Playlist/ScoresControllerTest.php | 43 +++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index 5ce1c983ce6..570f42496b7 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -10,6 +10,7 @@ use App\Models\Multiplayer\PlaylistItem; use App\Models\Multiplayer\PlaylistItemUserHighScore; use App\Models\Multiplayer\Room; +use App\Models\Multiplayer\ScoreLink; use App\Models\Solo\Score; use App\Transformers\ScoreTransformer; @@ -68,10 +69,16 @@ public function index($roomId, $playlistId) $user = auth()->user(); if ($user !== null) { - $userHighScore = $playlist->highScores()->where('user_id', $user->getKey())->first(); - - if ($userHighScore !== null) { - $userScoreJson = json_item($userHighScore->scoreLink, $transformer, ScoreTransformer::MULTIPLAYER_BASE_INCLUDES); + $userHighScoreLink = ScoreLink::whereIn( + 'id', + $playlist + ->highScores() + ->where('user_id', $user->getKey()) + ->select('score_link_id'), + )->first(); + + if ($userHighScoreLink !== null) { + $userScoreJson = json_item($userHighScoreLink, $transformer, ScoreTransformer::MULTIPLAYER_BASE_INCLUDES); } } diff --git a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php index ce254f7eb6d..40283170f0b 100644 --- a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php +++ b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php @@ -8,11 +8,54 @@ use App\Models\Build; use App\Models\Multiplayer\PlaylistItem; use App\Models\Multiplayer\ScoreLink; +use App\Models\Multiplayer\UserScoreAggregate; use App\Models\User; use Tests\TestCase; class ScoresControllerTest extends TestCase { + public function testIndex() + { + $playlist = PlaylistItem::factory()->create(); + $user = User::factory()->create(); + $scores = []; + $scores[] = ScoreLink + ::factory() + ->state(['playlist_item_id' => $playlist]) + ->completed([], ['passed' => true, 'total_score' => 30]) + ->create(); + $scores[] = $userScore = ScoreLink + ::factory() + ->state([ + 'playlist_item_id' => $playlist, + 'user_id' => $user, + ])->completed([], ['passed' => true, 'total_score' => 20]) + ->create(); + $scores[] = ScoreLink + ::factory() + ->state(['playlist_item_id' => $playlist]) + ->completed([], ['passed' => true, 'total_score' => 10]) + ->create(); + + foreach ($scores as $score) { + UserScoreAggregate::lookupOrDefault($score->user, $score->room)->recalculate(); + } + + $this->actAsScopedUser($user, ['*']); + + $resp = $this->json('GET', route('api.rooms.playlist.scores.index', [ + 'room' => $playlist->room_id, + 'playlist' => $playlist->getKey(), + ]))->assertSuccessful(); + + $json = json_decode($resp->getContent(), true); + $this->assertSame(count($scores), count($json['scores'])); + foreach ($json['scores'] as $i => $jsonScore) { + $this->assertSame($scores[$i]->getKey(), $jsonScore['id']); + } + $this->assertSame($json['user_score']['id'], $userScore->getKey()); + } + public function testShow() { $scoreLink = ScoreLink::factory()->create(); From 0755a5908337018ab69a0de164600b2accb50a7a Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 23 Aug 2023 15:42:29 +0900 Subject: [PATCH 051/470] Move scores around generation to model and add tests --- .../Multiplayer/PlaylistItemUserHighScore.php | 29 +++++++++++ app/Transformers/ScoreTransformer.php | 51 +++++++------------ .../Rooms/Playlist/ScoresControllerTest.php | 37 ++++++++++++-- 3 files changed, 80 insertions(+), 37 deletions(-) diff --git a/app/Models/Multiplayer/PlaylistItemUserHighScore.php b/app/Models/Multiplayer/PlaylistItemUserHighScore.php index 1330ab58dbc..0b3f2a290bf 100644 --- a/app/Models/Multiplayer/PlaylistItemUserHighScore.php +++ b/app/Models/Multiplayer/PlaylistItemUserHighScore.php @@ -53,6 +53,35 @@ public static function lookupOrDefault(ScoreLink $scoreLink): static ]); } + public static function scoresAround(ScoreLink $scoreLink): array + { + $placeholder = new static([ + 'score_link_id' => $scoreLink->getKey(), + 'total_score' => $scoreLink->data->totalScore, + ]); + + static $typeOptions = [ + 'higher' => 'score_asc', + 'lower' => 'score_desc', + ]; + + $ret = []; + + foreach ($typeOptions as $type => $sortName) { + $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($sortName); + + $ret[$type] = [ + 'query' => static + ::cursorSort($cursorHelper, $placeholder) + ->where('playlist_item_id', $scoreLink->playlist_item_id) + ->where('user_id', '<>', $scoreLink->user_id), + 'cursorHelper' => $cursorHelper, + ]; + } + + return $ret; + } + public function scoreLink() { return $this->belongsTo(ScoreLink::class); diff --git a/app/Transformers/ScoreTransformer.php b/app/Transformers/ScoreTransformer.php index 8d0dabb0b05..be96db4acce 100644 --- a/app/Transformers/ScoreTransformer.php +++ b/app/Transformers/ScoreTransformer.php @@ -220,38 +220,25 @@ public function includePosition(MultiplayerScoreLink $scoreLink) public function includeScoresAround(MultiplayerScoreLink $scoreLink) { - $limit = 10; - - $highScorePlaceholder = new PlaylistItemUserHighScore([ - 'score_link_id' => $scoreLink->getKey(), - 'total_score' => $scoreLink->data->totalScore, - ]); - - $typeOptions = [ - 'higher' => 'score_asc', - 'lower' => 'score_desc', - ]; - - $ret = []; - - foreach ($typeOptions as $type => $sortName) { - $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($sortName); - [$highScores, $hasMore] = PlaylistItemUserHighScore - ::cursorSort($cursorHelper, $highScorePlaceholder) - ->with(static::MULTIPLAYER_BASE_PRELOAD) - ->where('playlist_item_id', $scoreLink->playlist_item_id) - ->where('user_id', '<>', $scoreLink->user_id) - ->limit($limit) - ->getWithHasMore(); - - $ret[$type] = [ - 'scores' => json_collection($highScores->pluck('scoreLink'), static::newSolo(), static::MULTIPLAYER_BASE_INCLUDES), - 'params' => ['limit' => $limit, 'sort' => $cursorHelper->getSortName()], - ...cursor_for_response($cursorHelper->next($highScores, $hasMore)), - ]; - } - - return $this->primitive($ret); + static $limit = 10; + static $transformer; + $transformer ??= static::newSolo(); + + return $this->primitive(array_map( + function ($item) use ($limit, $transformer) { + [$highScores, $hasMore] = $item['query'] + ->with(static::MULTIPLAYER_BASE_PRELOAD) + ->limit($limit) + ->getWithHasMore(); + + return [ + 'scores' => json_collection($highScores->pluck('scoreLink'), $transformer, static::MULTIPLAYER_BASE_INCLUDES), + 'params' => ['limit' => $limit, 'sort' => $item['cursorHelper']->getSortName()], + ...cursor_for_response($item['cursorHelper']->next($highScores, $hasMore)), + ]; + }, + PlaylistItemUserHighScore::scoresAround($scoreLink), + )); } public function includeRankCountry(ScoreBest|SoloScore $score) diff --git a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php index 40283170f0b..8f8f37888f9 100644 --- a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php +++ b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php @@ -58,16 +58,43 @@ public function testIndex() public function testShow() { - $scoreLink = ScoreLink::factory()->create(); + $playlist = PlaylistItem::factory()->create(); $user = User::factory()->create(); + $scores = []; + $scores[] = ScoreLink + ::factory() + ->state(['playlist_item_id' => $playlist]) + ->completed([], ['passed' => true, 'total_score' => 30]) + ->create(); + $scores[] = $userScore = ScoreLink + ::factory() + ->state([ + 'playlist_item_id' => $playlist, + 'user_id' => $user, + ])->completed([], ['passed' => true, 'total_score' => 20]) + ->create(); + $scores[] = ScoreLink + ::factory() + ->state(['playlist_item_id' => $playlist]) + ->completed([], ['passed' => true, 'total_score' => 10]) + ->create(); + + foreach ($scores as $score) { + UserScoreAggregate::lookupOrDefault($score->user, $score->room)->recalculate(); + } $this->actAsScopedUser($user, ['*']); - $this->json('GET', route('api.rooms.playlist.scores.show', [ - 'room' => $scoreLink->room_id, - 'playlist' => $scoreLink->playlist_item_id, - 'score' => $scoreLink->getKey(), + $resp = $this->json('GET', route('api.rooms.playlist.scores.show', [ + 'room' => $userScore->room_id, + 'playlist' => $userScore->playlist_item_id, + 'score' => $userScore->getKey(), ]))->assertSuccessful(); + + $json = json_decode($resp->getContent(), true); + $this->assertSame($json['id'], $userScore->getKey()); + $this->assertSame($json['scores_around']['higher']['scores'][0]['id'], $scores[0]->getKey()); + $this->assertSame($json['scores_around']['lower']['scores'][0]['id'], $scores[2]->getKey()); } /** From 4e744e1d0522ce184c87faf4bb57a04372b337ab Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 24 Aug 2023 21:58:01 +0900 Subject: [PATCH 052/470] Use static when inside the class itself --- app/Models/Multiplayer/PlaylistItemUserHighScore.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Multiplayer/PlaylistItemUserHighScore.php b/app/Models/Multiplayer/PlaylistItemUserHighScore.php index 0b3f2a290bf..7e4e3bee354 100644 --- a/app/Models/Multiplayer/PlaylistItemUserHighScore.php +++ b/app/Models/Multiplayer/PlaylistItemUserHighScore.php @@ -68,7 +68,7 @@ public static function scoresAround(ScoreLink $scoreLink): array $ret = []; foreach ($typeOptions as $type => $sortName) { - $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($sortName); + $cursorHelper = static::makeDbCursorHelper($sortName); $ret[$type] = [ 'query' => static From 614b63e508f2aea109fdb09dae828e01217983a6 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 24 Aug 2023 22:03:19 +0900 Subject: [PATCH 053/470] Directly use findOrFail --- .../Controllers/Multiplayer/Rooms/Playlist/ScoresController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index 570f42496b7..dbc21f4faf3 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -45,7 +45,7 @@ public function __construct() */ public function index($roomId, $playlistId) { - $playlist = PlaylistItem::where('room_id', $roomId)->where('id', $playlistId)->firstOrFail(); + $playlist = PlaylistItem::where('room_id', $roomId)->findOrFail($playlistId); $params = request()->all(); $limit = clamp(get_int($params['limit'] ?? null) ?? 50, 1, 50); $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($params['sort'] ?? null); From 2f4f88dc40c2c7e9e0b37379360324f466a872a9 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 24 Aug 2023 22:04:47 +0900 Subject: [PATCH 054/470] Use same base query between total and items --- .../Multiplayer/Rooms/Playlist/ScoresController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index dbc21f4faf3..f35717b44d4 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -50,9 +50,10 @@ public function index($roomId, $playlistId) $limit = clamp(get_int($params['limit'] ?? null) ?? 50, 1, 50); $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($params['sort'] ?? null); - [$highScores, $hasMore] = $playlist - ->highScores() - ->whereHas('scoreLink') + $highScoresQuery = $playlist->highScores()->whereHas('scoreLink'); + + [$highScores, $hasMore] = $highScoresQuery + ->clone() ->cursorSort($cursorHelper, cursor_from_params($params)) ->with(ScoreTransformer::MULTIPLAYER_BASE_PRELOAD) ->limit($limit) @@ -64,7 +65,7 @@ public function index($roomId, $playlistId) $transformer, ScoreTransformer::MULTIPLAYER_BASE_INCLUDES ); - $total = $playlist->highScores()->count(); + $total = $highScoresQuery->count(); $user = auth()->user(); From 49295e4249d18eb38cd4b2c3de151980909168d3 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 30 Aug 2023 21:36:37 +0900 Subject: [PATCH 055/470] Add pinning data for score link --- .../Score/CurrentUserAttributesTransformer.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Transformers/Score/CurrentUserAttributesTransformer.php b/app/Transformers/Score/CurrentUserAttributesTransformer.php index ced66eb3dbe..8c94a845dd3 100644 --- a/app/Transformers/Score/CurrentUserAttributesTransformer.php +++ b/app/Transformers/Score/CurrentUserAttributesTransformer.php @@ -17,9 +17,15 @@ class CurrentUserAttributesTransformer extends TransformerAbstract { public function transform(LegacyMatch\Score|ScoreModel|SoloScoreInterface $score): array { - $pinnable = $score instanceof ScoreModel - ? $score->best - : ($score instanceof SoloScore ? $score : null); + if ($score instanceof ScoreModel) { + $pinnable = $score->best; + } elseif ($score instanceof SoloScore) { + $pinnable = $score; + } elseif ($score instanceof MultiplayerScoreLink) { + $pinnable = $score->score; + } else { + $pinnable = null; + } return [ 'pin' => $pinnable !== null && $this->isOwnScore($pinnable) From f746a89aa94d33bb560dfc830dc6f3a5401b5cff Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 30 Aug 2023 21:45:31 +0900 Subject: [PATCH 056/470] Remove old migrations --- ..._103744_create_multiplayer_score_links.php | 45 ------------------- ...ore_link_id_to_multiplayer_scores_high.php | 35 --------------- ...core_link_id_to_multiplayer_rooms_high.php | 33 -------------- 3 files changed, 113 deletions(-) delete mode 100644 database/migrations/2023_07_26_103744_create_multiplayer_score_links.php delete mode 100644 database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php delete mode 100644 database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php diff --git a/database/migrations/2023_07_26_103744_create_multiplayer_score_links.php b/database/migrations/2023_07_26_103744_create_multiplayer_score_links.php deleted file mode 100644 index 56ef5d490cb..00000000000 --- a/database/migrations/2023_07_26_103744_create_multiplayer_score_links.php +++ /dev/null @@ -1,45 +0,0 @@ -. Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -declare(strict_types=1); - -use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; - -return new class extends Migration -{ - /** - * Run the migrations. - */ - public function up(): void - { - Schema::create('multiplayer_score_links', function (Blueprint $table) { - $table->id(); - - $table->unsignedInteger('user_id'); - $table->unsignedBigInteger('room_id'); - $table->unsignedBigInteger('playlist_item_id'); - $table->unsignedMediumInteger('beatmap_id'); - $table->unsignedMediumInteger('build_id')->default(0); - $table->unsignedBigInteger('score_id')->nullable(); - - $table->timestampsTz(); - - $table->index('score_id'); - $table->index(['room_id', 'user_id']); - $table->index('playlist_item_id'); - $table->index('user_id'); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('multiplayer_score_links'); - } -}; diff --git a/database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php b/database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php deleted file mode 100644 index 7718661bd61..00000000000 --- a/database/migrations/2023_08_01_064505_add_score_link_id_to_multiplayer_scores_high.php +++ /dev/null @@ -1,35 +0,0 @@ -. Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -declare(strict_types=1); - -use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; - -return new class extends Migration -{ - /** - * Run the migrations. - */ - public function up(): void - { - Schema::table('multiplayer_scores_high', function (Blueprint $table) { - $table->unsignedBigInteger('score_link_id')->nullable()->after('score_id'); - $table->index(['playlist_item_id', DB::raw('total_score DESC'), 'score_link_id'], 'top_scores_linked'); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::table('multiplayer_scores_high', function (Blueprint $table) { - $table->dropIndex('top_scores_linked'); - $table->dropColumn('score_link_id'); - }); - } -}; diff --git a/database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php b/database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php deleted file mode 100644 index 55819991c91..00000000000 --- a/database/migrations/2023_08_01_101614_add_last_score_link_id_to_multiplayer_rooms_high.php +++ /dev/null @@ -1,33 +0,0 @@ -. Licensed under the GNU Affero General Public License v3.0. -// See the LICENCE file in the repository root for full licence text. - -declare(strict_types=1); - -use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; - -return new class extends Migration -{ - /** - * Run the migrations. - */ - public function up(): void - { - Schema::table('multiplayer_rooms_high', function (Blueprint $table) { - $table->unsignedBigInteger('last_score_link_id')->nullable()->after('last_score_id'); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::table('multiplayer_rooms_high', function (Blueprint $table) { - $table->dropColumn('last_score_link_id'); - }); - } -}; From 49a3ba9b9f7eeeaf3d5b9ae04b51d3cce0d7036a Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 30 Aug 2023 22:30:44 +0900 Subject: [PATCH 057/470] It's not plural --- .../Multiplayer/Rooms/Playlist/ScoresController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index f35717b44d4..974d725152f 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -111,10 +111,10 @@ public function show($roomId, $playlistId, $id) { $room = Room::find($roomId) ?? abort(404, 'Invalid room id'); $playlistItem = $room->playlist()->find($playlistId) ?? abort(404, 'Invalid playlist id'); - $scoreLinks = $playlistItem->scoreLinks()->findOrFail($id); + $scoreLink = $playlistItem->scoreLinks()->findOrFail($id); return json_item( - $scoreLinks, + $scoreLink, ScoreTransformer::newSolo(), [ ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES, From 9e2ff95e8cccdd26b495d8fe9ab528d66b1bdc72 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 30 Aug 2023 22:31:32 +0900 Subject: [PATCH 058/470] It's not (solo) score --- .../Multiplayer/Rooms/Playlist/ScoresController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php index 974d725152f..7ece79641f2 100644 --- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php +++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php @@ -143,10 +143,10 @@ public function showUser($roomId, $playlistId, $userId) { $room = Room::find($roomId) ?? abort(404, 'Invalid room id'); $playlistItem = $room->playlist()->find($playlistId) ?? abort(404, 'Invalid playlist id'); - $score = $playlistItem->highScores()->where('user_id', $userId)->firstOrFail()->scoreLink ?? abort(404); + $scoreLink = $playlistItem->highScores()->where('user_id', $userId)->firstOrFail()->scoreLink ?? abort(404); return json_item( - $score, + $scoreLink, ScoreTransformer::newSolo(), [ ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES, @@ -169,9 +169,9 @@ public function store($roomId, $playlistId) $buildId = ClientCheck::findBuild($user, $params)?->getKey() ?? config('osu.client.default_build_id'); - $score = $room->startPlay($user, $playlistItem, $buildId); + $scoreLink = $room->startPlay($user, $playlistItem, $buildId); - return json_item($score, ScoreTransformer::newSolo()); + return json_item($scoreLink, ScoreTransformer::newSolo()); } /** From e4c9d38c868c24ad63f83efb8d70c02be91d364c Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 30 Aug 2023 22:40:11 +0900 Subject: [PATCH 059/470] Update to use ScoreLink --- .../Multiplayer/UserScoreAggregateTransformer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php b/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php index 3793790ea93..4068555d27f 100644 --- a/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php +++ b/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php @@ -5,7 +5,7 @@ namespace App\Transformers\Multiplayer; -use App\Models\Multiplayer\Score; +use App\Models\Multiplayer\ScoreLink; use App\Models\Multiplayer\UserScoreAggregate; use App\Transformers\TransformerAbstract; use App\Transformers\UserCompactTransformer; @@ -33,7 +33,7 @@ public function transform(UserScoreAggregate $score) public function includePlaylistItemAttempts(UserScoreAggregate $score) { - $scoreAggs = Score::where([ + $scoreAggs = ScoreLink::where([ 'room_id' => $score->room_id, 'user_id' => $score->user_id, ])->groupBy('playlist_item_id') From d8f401d8c05d746705d0a22d821c4c2b010e204e Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 30 Aug 2023 22:55:01 +0900 Subject: [PATCH 060/470] Result from aggregate must be accessed using raw attribute --- app/Transformers/Multiplayer/UserScoreAggregateTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php b/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php index 4068555d27f..37b9acd1a6a 100644 --- a/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php +++ b/app/Transformers/Multiplayer/UserScoreAggregateTransformer.php @@ -44,7 +44,7 @@ public function includePlaylistItemAttempts(UserScoreAggregate $score) foreach ($scoreAggs as $scoreAgg) { $attempts[] = [ - 'attempts' => $scoreAgg->attempts, + 'attempts' => $scoreAgg->getRawAttribute('attempts'), 'id' => $scoreAgg->playlist_item_id, ]; } From 69d00cd2cfcace2a70d150031f1c32fa96899550 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 31 Aug 2023 19:29:12 +0900 Subject: [PATCH 061/470] Add test for rooms.show --- .../Multiplayer/RoomsControllerTest.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/Controllers/Multiplayer/RoomsControllerTest.php b/tests/Controllers/Multiplayer/RoomsControllerTest.php index 1bcfde01f86..9ea14171e18 100644 --- a/tests/Controllers/Multiplayer/RoomsControllerTest.php +++ b/tests/Controllers/Multiplayer/RoomsControllerTest.php @@ -10,6 +10,8 @@ use App\Models\Chat\UserChannel; use App\Models\Multiplayer\PlaylistItem; use App\Models\Multiplayer\Room; +use App\Models\Multiplayer\ScoreLink; +use App\Models\Multiplayer\UserScoreAggregate; use App\Models\OAuth\Token; use App\Models\User; use Tests\TestCase; @@ -26,6 +28,25 @@ public function testIndex() $this->json('GET', route('api.rooms.index'))->assertSuccessful(); } + public function testShow() + { + $room = Room::factory()->create(); + $user = User::factory()->create(); + $playlist = PlaylistItem::factory()->create(['room_id' => $room]); + $scoreLink = ScoreLink + ::factory() + ->state([ + 'playlist_item_id' => $playlist, + 'user_id' => $user, + ])->completed([], ['passed' => true, 'total_score' => 20]) + ->create(); + UserScoreAggregate::lookupOrDefault($scoreLink->user, $scoreLink->room)->recalculate(); + + $this->actAsScopedUser($user, ['*']); + + $this->json('GET', route('api.rooms.show', $room))->assertSuccessful(); + } + public function testStore() { $token = Token::factory()->create(['scopes' => ['*']]); From cc54ca360a35ac480bd68d417f858f307b2f8f22 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 31 Aug 2023 19:31:53 +0900 Subject: [PATCH 062/470] More score link variable name adjustment --- .../Rooms/Playlist/ScoresControllerTest.php | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php index 8f8f37888f9..8f7ea793b10 100644 --- a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php +++ b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php @@ -18,27 +18,27 @@ public function testIndex() { $playlist = PlaylistItem::factory()->create(); $user = User::factory()->create(); - $scores = []; - $scores[] = ScoreLink + $scoreLinks = []; + $scoreLinks[] = ScoreLink ::factory() ->state(['playlist_item_id' => $playlist]) ->completed([], ['passed' => true, 'total_score' => 30]) ->create(); - $scores[] = $userScore = ScoreLink + $scoreLinks[] = $userScoreLink = ScoreLink ::factory() ->state([ 'playlist_item_id' => $playlist, 'user_id' => $user, ])->completed([], ['passed' => true, 'total_score' => 20]) ->create(); - $scores[] = ScoreLink + $scoreLinks[] = ScoreLink ::factory() ->state(['playlist_item_id' => $playlist]) ->completed([], ['passed' => true, 'total_score' => 10]) ->create(); - foreach ($scores as $score) { - UserScoreAggregate::lookupOrDefault($score->user, $score->room)->recalculate(); + foreach ($scoreLinks as $scoreLink) { + UserScoreAggregate::lookupOrDefault($scoreLink->user, $scoreLink->room)->recalculate(); } $this->actAsScopedUser($user, ['*']); @@ -49,52 +49,52 @@ public function testIndex() ]))->assertSuccessful(); $json = json_decode($resp->getContent(), true); - $this->assertSame(count($scores), count($json['scores'])); + $this->assertSame(count($scoreLinks), count($json['scores'])); foreach ($json['scores'] as $i => $jsonScore) { - $this->assertSame($scores[$i]->getKey(), $jsonScore['id']); + $this->assertSame($scoreLinks[$i]->getKey(), $jsonScore['id']); } - $this->assertSame($json['user_score']['id'], $userScore->getKey()); + $this->assertSame($json['user_score']['id'], $userScoreLink->getKey()); } public function testShow() { $playlist = PlaylistItem::factory()->create(); $user = User::factory()->create(); - $scores = []; - $scores[] = ScoreLink + $scoreLinks = []; + $scoreLinks[] = ScoreLink ::factory() ->state(['playlist_item_id' => $playlist]) ->completed([], ['passed' => true, 'total_score' => 30]) ->create(); - $scores[] = $userScore = ScoreLink + $scoreLinks[] = $userScoreLink = ScoreLink ::factory() ->state([ 'playlist_item_id' => $playlist, 'user_id' => $user, ])->completed([], ['passed' => true, 'total_score' => 20]) ->create(); - $scores[] = ScoreLink + $scoreLinks[] = ScoreLink ::factory() ->state(['playlist_item_id' => $playlist]) ->completed([], ['passed' => true, 'total_score' => 10]) ->create(); - foreach ($scores as $score) { - UserScoreAggregate::lookupOrDefault($score->user, $score->room)->recalculate(); + foreach ($scoreLinks as $scoreLink) { + UserScoreAggregate::lookupOrDefault($scoreLink->user, $scoreLink->room)->recalculate(); } $this->actAsScopedUser($user, ['*']); $resp = $this->json('GET', route('api.rooms.playlist.scores.show', [ - 'room' => $userScore->room_id, - 'playlist' => $userScore->playlist_item_id, - 'score' => $userScore->getKey(), + 'room' => $userScoreLink->room_id, + 'playlist' => $userScoreLink->playlist_item_id, + 'score' => $userScoreLink->getKey(), ]))->assertSuccessful(); $json = json_decode($resp->getContent(), true); - $this->assertSame($json['id'], $userScore->getKey()); - $this->assertSame($json['scores_around']['higher']['scores'][0]['id'], $scores[0]->getKey()); - $this->assertSame($json['scores_around']['lower']['scores'][0]['id'], $scores[2]->getKey()); + $this->assertSame($json['id'], $userScoreLink->getKey()); + $this->assertSame($json['scores_around']['higher']['scores'][0]['id'], $scoreLinks[0]->getKey()); + $this->assertSame($json['scores_around']['lower']['scores'][0]['id'], $scoreLinks[2]->getKey()); } /** From 38fd39102e49a184fda493b0416bbb6f11bb61e9 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 5 Sep 2023 17:00:43 +0900 Subject: [PATCH 063/470] Sort --- app/Transformers/ScoreTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Transformers/ScoreTransformer.php b/app/Transformers/ScoreTransformer.php index 3c214a36c27..b5ee622040c 100644 --- a/app/Transformers/ScoreTransformer.php +++ b/app/Transformers/ScoreTransformer.php @@ -106,8 +106,8 @@ public function transformSolo(ScoreModel|SoloScoreInterface $score) if ($score instanceof MultiplayerScoreLink) { $multiplayerAttributes = [ - 'room_id' => $score->room_id, 'playlist_item_id' => $score->playlist_item_id, + 'room_id' => $score->room_id, ]; } } From 829dc7383df7d3e0adc6dfeab97baad727e43870 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 5 Sep 2023 17:00:56 +0900 Subject: [PATCH 064/470] Add solo score id for multiplayer score json --- app/Transformers/ScoreTransformer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Transformers/ScoreTransformer.php b/app/Transformers/ScoreTransformer.php index b5ee622040c..ac2b85955e2 100644 --- a/app/Transformers/ScoreTransformer.php +++ b/app/Transformers/ScoreTransformer.php @@ -108,6 +108,7 @@ public function transformSolo(ScoreModel|SoloScoreInterface $score) $multiplayerAttributes = [ 'playlist_item_id' => $score->playlist_item_id, 'room_id' => $score->room_id, + 'solo_score_id' => $score->score_id, ]; } } From 03f19dc4bc08498a31829c2722e8c309d11620e8 Mon Sep 17 00:00:00 2001 From: clayton Date: Tue, 12 Sep 2023 15:46:49 -0700 Subject: [PATCH 065/470] Fix state issues on navigation --- resources/js/entrypoints/account-edit.tsx | 4 ++-- resources/js/github-user/index.tsx | 14 ++++++++++---- .../views/accounts/_edit_github_user.blade.php | 5 ++++- resources/views/accounts/edit.blade.php | 6 ------ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/js/entrypoints/account-edit.tsx b/resources/js/entrypoints/account-edit.tsx index ab9ded7e745..e134e8825d2 100644 --- a/resources/js/entrypoints/account-edit.tsx +++ b/resources/js/entrypoints/account-edit.tsx @@ -21,8 +21,8 @@ core.reactTurbolinks.register('authorized-clients', () => { return ; }); -core.reactTurbolinks.register('github-user', () => ( - +core.reactTurbolinks.register('github-user', (container: HTMLElement) => ( + )); core.reactTurbolinks.register('legacy-api-key', (container: HTMLElement) => ( diff --git a/resources/js/github-user/index.tsx b/resources/js/github-user/index.tsx index 773cdbc7636..ded9a65dded 100644 --- a/resources/js/github-user/index.tsx +++ b/resources/js/github-user/index.tsx @@ -4,31 +4,37 @@ import BigButton from 'components/big-button'; import GithubUserJson from 'interfaces/github-user-json'; import { route } from 'laroute'; -import { action, makeObservable, observable } from 'mobx'; +import { action, makeObservable, observable, reaction } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; import { onErrorWithCallback } from 'utils/ajax'; import { trans } from 'utils/lang'; interface Props { - user: GithubUserJson | null | undefined; + container: HTMLElement; } @observer export default class GithubUser extends React.Component { @observable private deleting = false; - @observable private user: GithubUserJson | null | undefined; + @observable private user: GithubUserJson | null; + private userDatasetSyncDisposer; private xhr?: JQuery.jqXHR; constructor(props: Props) { super(props); - this.user = props.user; + this.user = JSON.parse(this.props.container.dataset.user ?? '') as GithubUserJson | null; + this.userDatasetSyncDisposer = reaction( + () => JSON.stringify(this.user), + (githubUserJson) => this.props.container.dataset.user = githubUserJson, + ); makeObservable(this); } componentWillUnmount() { + this.userDatasetSyncDisposer(); this.xhr?.abort(); } diff --git a/resources/views/accounts/_edit_github_user.blade.php b/resources/views/accounts/_edit_github_user.blade.php index cfddc4a1bd0..16ab5e4fcdc 100644 --- a/resources/views/accounts/_edit_github_user.blade.php +++ b/resources/views/accounts/_edit_github_user.blade.php @@ -16,7 +16,10 @@ {{ osu_trans('accounts.github_user.account')}} diff --git a/resources/views/accounts/edit.blade.php b/resources/views/accounts/edit.blade.php index 3ce0ec548c8..86b06a1a408 100644 --- a/resources/views/accounts/edit.blade.php +++ b/resources/views/accounts/edit.blade.php @@ -162,12 +162,6 @@ class="js-account-edit-avatar__button fileupload" {!! json_encode($authorizedClients) !!} - @if (\App\Models\GithubUser::canAuthenticate()) - - @endif - From a1464947ae683d29b3c3cc93628561e3737f890e Mon Sep 17 00:00:00 2001 From: clayton Date: Tue, 12 Sep 2023 15:46:49 -0700 Subject: [PATCH 066/470] Continue xhr instead of aborting, remove redundant `deleting` state --- resources/js/github-user/index.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/resources/js/github-user/index.tsx b/resources/js/github-user/index.tsx index ded9a65dded..2ebc7116167 100644 --- a/resources/js/github-user/index.tsx +++ b/resources/js/github-user/index.tsx @@ -16,10 +16,9 @@ interface Props { @observer export default class GithubUser extends React.Component { - @observable private deleting = false; @observable private user: GithubUserJson | null; private userDatasetSyncDisposer; - private xhr?: JQuery.jqXHR; + @observable private xhr: JQuery.jqXHR | null = null; constructor(props: Props) { super(props); @@ -51,7 +50,7 @@ export default class GithubUser extends React.Component { { @action private onDeleteButtonClick = () => { - this.xhr?.abort(); - this.deleting = true; + if (this.xhr != null) return; this.xhr = $.ajax( route('account.github-users.destroy', { github_user: this.user?.id }), @@ -79,6 +77,6 @@ export default class GithubUser extends React.Component { ) .done(() => this.user = null) .fail(onErrorWithCallback(this.onDeleteButtonClick)) - .always(action(() => this.deleting = false)); + .always(action(() => this.xhr = null)); }; } From 179ebed3d12ee14d3a8beac4c924bae202b3024f Mon Sep 17 00:00:00 2001 From: clayton Date: Tue, 12 Sep 2023 15:46:49 -0700 Subject: [PATCH 067/470] Missing action --- resources/js/github-user/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/github-user/index.tsx b/resources/js/github-user/index.tsx index 2ebc7116167..b5b30f52b43 100644 --- a/resources/js/github-user/index.tsx +++ b/resources/js/github-user/index.tsx @@ -75,7 +75,7 @@ export default class GithubUser extends React.Component { route('account.github-users.destroy', { github_user: this.user?.id }), { method: 'DELETE' }, ) - .done(() => this.user = null) + .done(action(() => this.user = null)) .fail(onErrorWithCallback(this.onDeleteButtonClick)) .always(action(() => this.xhr = null)); }; From eeaf389ba1a28a4a78eaccf475ec513d9cebc1da Mon Sep 17 00:00:00 2001 From: clayton Date: Tue, 12 Sep 2023 15:46:49 -0700 Subject: [PATCH 068/470] Fix div id removed by accident --- resources/views/accounts/_edit_github_user.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/accounts/_edit_github_user.blade.php b/resources/views/accounts/_edit_github_user.blade.php index 16ab5e4fcdc..a28b73a9543 100644 --- a/resources/views/accounts/_edit_github_user.blade.php +++ b/resources/views/accounts/_edit_github_user.blade.php @@ -2,7 +2,7 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -
  • - Subtotal + {{ osu_trans('store.order.subtotal') }}
    {{ currency($order->getSubtotal()) }} @@ -62,7 +62,7 @@
  • - Shipping & Handling + {{ osu_trans('store.order.shipping_and_handling') }}
    {{ currency($order->shipping) }} @@ -73,7 +73,7 @@ @if (!$checkout)
  • - Total + {{ osu_trans('store.order.total') }}
    {{ currency($order->getSubtotal()) }} diff --git a/resources/views/store/orders/_details.blade.php b/resources/views/store/orders/_details.blade.php index 1352cb9384e..ae891facac9 100644 --- a/resources/views/store/orders/_details.blade.php +++ b/resources/views/store/orders/_details.blade.php @@ -5,9 +5,9 @@
    -

    Invoice

    +

    {{ osu_trans('store.invoice.title') }}

    - Date: + {{ osu_trans('store.invoice.date') }} @if($order->shipped_at) {{ $order->shipped_at->toDateString() }} @elseif($order->paid_at) @@ -23,7 +23,7 @@ ACN 163 593 413 a.t.f. Dean Herbert Family Trust

    -

    contact: pe@ppy.sh / +81 80 1381 1430

    +

    {{ osu_trans('store.invoice.contact') }} pe@ppy.sh / +81 80 1381 1430

    @@ -48,7 +48,7 @@ @endif
    -

    Order Details

    +

    {{ osu_trans('store.order.details.title') }}

    @include('store.objects.order', [ 'order' => $order, @@ -66,11 +66,11 @@ $showTrackingCode = ($order->isShipped() || $order->isDelivered() || Auth::user()->isAdmin()) && $order->tracking_code; $transactionDetails = [ - 'Salesperson' => 'osu!store', - 'Order #' => "#{$order->order_id}", - 'Shipping Method' => $showTrackingCode ? 'EMS ('.trim($order->tracking_code).')' : 'N/A', - 'Shipping Terms' => 'FOB Japan', - 'Payment Terms' => studly_case($order->getPaymentProvider()).' ('.$order->getPaymentStatusText().')', + osu_trans('store.order.details.salesperson') => 'osu!store', + osu_trans('store.order.details.order_number') => "#{$order->order_id}", + osu_trans('store.order.details.shipping_method') => $showTrackingCode ? 'EMS ('.trim($order->tracking_code).')' : 'N/A', + osu_trans('store.order.details.shipping_terms') => 'FOB Japan', + osu_trans('store.order.details.payment_terms') => studly_case($order->getPaymentProvider()).' ('.$order->getPaymentStatusText().')', ]; @endphp
    diff --git a/resources/views/store/orders/_status.blade.php b/resources/views/store/orders/_status.blade.php index 14dbb449955..d8fe61d2902 100644 --- a/resources/views/store/orders/_status.blade.php +++ b/resources/views/store/orders/_status.blade.php @@ -3,12 +3,14 @@ See the LICENCE file in the repository root for full licence text. --}}
    -

    Order Status

    +

    {{ osu_trans('store.order.status.title') }}

    @if ($order->isDelivered()) -

    Your order has been delivered! We hope you are enjoying it!

    +

    {{ osu_trans('store.invoice.status.delivered.title') }}

    - If you have any issues with your purchase, please contact the osu!store support. + {!! osu_trans('store.invoice.status.delivered.line_1._', [ + 'link' => Html::link('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.delivered.line_1.link_text')), + ]) !!}

    @elseif ($order->isPaymentRequested())

    {{ osu_trans('store.invoice.status.processing.title') }}

    @@ -21,30 +23,35 @@ ]) !!}

    @elseif ($order->isCancelled()) -

    Your order has been cancelled

    +

    {{ osu_trans('store.invoice.status.cancelled.title') }}

    - If you didn't request a cancellation please contact osu!store support quoting your order number (#{{$order->order_id}}). + {!! osu_trans('store.invoice.status.cancelled.line_1._', [ + 'link' => Html::link('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.cancelled.line_1.link_text')), + 'order_number' => $order->order_id, + ]) !!}

    @elseif (($order->isShipped() && ($order->last_tracking_state || count($order->trackingCodes()) === 0)) || $order->isDelivered()) -

    Your order has been shipped!

    +

    {{ osu_trans('store.invoice.status.shipped.title') }}

    @if(count($order->trackingCodes()))

    - Tracking details follow: + {{ osu_trans('store.invoice.status.shipped.tracking_details') }}

    @else

    - We don't have tracking details as we sent your package via Air Mail, but you can expect to receive it within 1-3 weeks. For Europe, sometimes customs can delay the order out of our control. If you have any concerns, please reply to the order confirmation email you received (or send us an email). + {!! osu_trans('store.invoice.status.shipped.no_tracking_details._', [ + 'link' => Html::link('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.shipped.no_tracking_details.link_text')), + ]) !!}

    @endif @else -

    Your order is being prepared!

    +

    {{ osu_trans('store.invoice.status.prepared.title') }}

    @if ($order->requiresShipping())

    - Please wait a bit longer for it to be shipped. Tracking information will appear here once the order has been processed and sent. This can take up to 5 days (but usually less!) depending on how busy we are. + {{ osu_trans('store.invoice.status.prepared.line_1') }}

    - We send all orders from Japan using a variety of shipping services depending on the weight and value. This area will update with specifics once we have shipped the order. + {{ osu_trans('store.invoice.status.prepared.line_2') }}

    @endif diff --git a/resources/views/store/orders/_tracking.blade.php b/resources/views/store/orders/_tracking.blade.php index e9e9807e95e..bb0de820810 100644 --- a/resources/views/store/orders/_tracking.blade.php +++ b/resources/views/store/orders/_tracking.blade.php @@ -3,7 +3,11 @@ See the LICENCE file in the repository root for full licence text. --}}
    -

    Tracking for {{ $code }}

    +

    + osu_trans('store.order.tracking_for', [ + 'code' => $code, + ]) +

    From e5c424597b1bc4805860f56097bb2b477c02e5e1 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 17:30:16 +0900 Subject: [PATCH 393/470] Use facade instead --- app/Libraries/StorageUrl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Libraries/StorageUrl.php b/app/Libraries/StorageUrl.php index 00d784dc20d..2f467a236f8 100644 --- a/app/Libraries/StorageUrl.php +++ b/app/Libraries/StorageUrl.php @@ -11,8 +11,8 @@ class StorageUrl { public static function make(?string $diskName, string $path): string { - $diskName ??= config('filesystems.default'); - $baseUrl = config("filesystems.disks.{$diskName}.base_url"); + $diskName ??= \Config::get('filesystems.default'); + $baseUrl = \Config::get("filesystems.disks.{$diskName}.base_url"); return "{$baseUrl}/{$path}"; } From 6390c282b3ff7ebe0429ba2b6e40e3dc1d8d0526 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Fri, 10 Nov 2023 19:10:50 +0900 Subject: [PATCH 394/470] add strict_types --- app/Libraries/Countries.php | 2 ++ tests/Commands/ModdingRankCommandTest.php | 2 ++ tests/Models/BeatmapsetTest.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/Libraries/Countries.php b/app/Libraries/Countries.php index e40ab85667b..7c98c5d086d 100644 --- a/app/Libraries/Countries.php +++ b/app/Libraries/Countries.php @@ -3,6 +3,8 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. +declare(strict_types=1); + namespace App\Libraries; use App\Models\Country; diff --git a/tests/Commands/ModdingRankCommandTest.php b/tests/Commands/ModdingRankCommandTest.php index 132751b976b..7866b229b01 100644 --- a/tests/Commands/ModdingRankCommandTest.php +++ b/tests/Commands/ModdingRankCommandTest.php @@ -3,6 +3,8 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. +declare(strict_types=1); + namespace Tests\Commands; use App\Console\Commands\ModdingRankCommand; diff --git a/tests/Models/BeatmapsetTest.php b/tests/Models/BeatmapsetTest.php index 2100e92068d..5165eee3749 100644 --- a/tests/Models/BeatmapsetTest.php +++ b/tests/Models/BeatmapsetTest.php @@ -3,6 +3,8 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. +declare(strict_types=1); + namespace Tests\Models; use App\Enums\Ruleset; From e7321f8cef7b28f9a88de2c5a0ddfdbd63400f88 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 19:54:11 +0900 Subject: [PATCH 395/470] More facade --- app/Models/Traits/UserAvatar.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Models/Traits/UserAvatar.php b/app/Models/Traits/UserAvatar.php index 828c84b44bf..252d6411665 100644 --- a/app/Models/Traits/UserAvatar.php +++ b/app/Models/Traits/UserAvatar.php @@ -13,7 +13,7 @@ trait UserAvatar { private static function avatarDisk(): string { - return config('osu.avatar.storage'); + return \Config::get('osu.avatar.storage'); } public function setAvatar($file) @@ -31,17 +31,17 @@ public function setAvatar($file) $entry = $this->user_id.'_'.time().'.'.$processor->ext(); } - if (present(config('osu.avatar.cache_purge_prefix'))) { + if (present(\Config::get('osu.avatar.cache_purge_prefix'))) { try { $ctx = [ 'http' => [ - 'method' => config('osu.avatar.cache_purge_method') ?? 'GET', - 'header' => present(config('osu.avatar.cache_purge_authorization_key')) - ? 'Authorization: '.config('osu.avatar.cache_purge_authorization_key') + 'method' => \Config::get('osu.avatar.cache_purge_method') ?? 'GET', + 'header' => present(\Config::get('osu.avatar.cache_purge_authorization_key')) + ? 'Authorization: '.\Config::get('osu.avatar.cache_purge_authorization_key') : null, ], ]; - $prefix = config('osu.avatar.cache_purge_prefix'); + $prefix = \Config::get('osu.avatar.cache_purge_prefix'); $suffix = $ctx['http']['method'] === 'GET' ? '?'.time() : ''; // Bypass CloudFlare cache if using GET $url = $prefix.$this->user_id.$suffix; file_get_contents($url, false, stream_context_create($ctx)); @@ -62,6 +62,6 @@ protected function getUserAvatar() return present($value) ? StorageUrl::make(static::avatarDisk(), strtr($value, '_', '?')) - : config('osu.avatar.default'); + : \Config::get('osu.avatar.default'); } } From 67843710be86702041e8bd57b8e0625c3620f606 Mon Sep 17 00:00:00 2001 From: Sam Verhaegen Date: Fri, 10 Nov 2023 13:50:13 +0200 Subject: [PATCH 396/470] address review --- resources/lang/en/store.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/store.php b/resources/lang/en/store.php index 4ab8f8b2afe..9973d7f8dc8 100644 --- a/resources/lang/en/store.php +++ b/resources/lang/en/store.php @@ -64,7 +64,7 @@ 'cancelled' => [ 'title' => 'Your order has been cancelled', 'line_1' => [ - '_' => "If you didn't request a cancellation please contact :link quoting your order number :order_number.", + '_' => "If you didn't request a cancellation please contact :link quoting your order number (#:order_number).", 'link_text' => 'osu!store support', ], ], @@ -107,7 +107,7 @@ 'no_orders' => 'No orders to view.', 'paid_on' => 'Order placed :date', 'resume' => 'Resume Checkout', - 'shipping_and_handling' => 'Shipping & Handling', + 'shipping_and_handling' => 'Shipping & Handling', 'shopify_expired' => 'The checkout link for this order has expired.', 'subtotal' => 'Subtotal', 'total' => 'Total', From 5dc7379502dbf405351fbf3ab327964f09a1b46c Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 19:22:48 +0900 Subject: [PATCH 397/470] Remove laravelcollective/html It will stop working on newer laravel. --- app/Libraries/ApidocRouteHelper.php | 6 +- app/helpers.php | 55 +++++++------- composer.json | 1 - composer.lock | 75 +------------------ config/app.php | 4 - resources/js/shared.coffee | 10 --- .../views/accounts/_edit_email.blade.php | 18 +++-- .../views/accounts/_edit_password.blade.php | 18 +++-- .../views/accounts/_edit_signature.blade.php | 16 ++-- resources/views/admin/contests/show.blade.php | 13 ++-- .../admin/forum/forum_covers/index.blade.php | 21 ++++-- .../client_verifications/create.blade.php | 18 ++--- resources/views/forum/posts/edit.blade.php | 16 ++-- .../views/forum/topics/_edit_poll.blade.php | 16 ++-- .../forum/topics/_moderate_move.blade.php | 9 ++- .../views/forum/topics/_poll_form.blade.php | 19 ++--- resources/views/forum/topics/_reply.blade.php | 23 +++--- resources/views/forum/topics/create.blade.php | 14 ++-- resources/views/layout/_popup_login.blade.php | 16 ++-- .../views/password_reset/index.blade.php | 19 ++--- .../views/password_reset/reset.blade.php | 20 ++--- resources/views/sessions/create.blade.php | 14 ++-- resources/views/store/cart/_item.blade.php | 39 ++++++---- resources/views/store/cart/show.blade.php | 8 +- resources/views/store/header.blade.php | 9 +-- resources/views/store/invoice.blade.php | 2 +- .../views/store/orders/_status.blade.php | 13 ++-- resources/views/store/products/show.blade.php | 48 ++++++------ .../store/products/supporter-tag.blade.php | 41 +++++----- .../store/products/username-change.blade.php | 26 ++++--- resources/views/users/_verify_box.blade.php | 5 +- .../views/vendor/passport/authorize.blade.php | 30 ++++---- 32 files changed, 305 insertions(+), 337 deletions(-) diff --git a/app/Libraries/ApidocRouteHelper.php b/app/Libraries/ApidocRouteHelper.php index ba2ed2f1c98..ac0b6ba5ce3 100644 --- a/app/Libraries/ApidocRouteHelper.php +++ b/app/Libraries/ApidocRouteHelper.php @@ -16,7 +16,11 @@ public static function scopeBadge($scope) { $scopeLower = strtolower($scope); - return \Html::link("#scope-{$scopeLower}", $scope, ['class' => "badge badge-scope badge-scope-{$scopeLower}"]); + return blade_safe(link_to( + "#scope-{$scopeLower}", + $scope, + ['class' => "badge badge-scope badge-scope-{$scopeLower}"], + )); } diff --git a/app/helpers.php b/app/helpers.php index 38fb69c1451..400e15973b2 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -613,12 +613,20 @@ function product_quantity_options($product, $selected = null) $opts = []; for ($i = 1; $i <= $max; $i++) { - $opts[$i] = osu_trans_choice('common.count.item', $i); + $opts[] = [ + 'label' => osu_trans_choice('common.count.item', $i), + 'selected' => $i === $selected, + 'value' => $i, + ]; } // include selected value separately if it's out of range. - if ($selected > $max) { - $opts[$selected] = osu_trans_choice('common.count.item', $selected); + if ($selected !== null && $selected > $max) { + $opts[] = [ + 'label' => osu_trans_choice('common.count.item', $selected), + 'selected' => true, + 'value' => $selected, + ]; } return $opts; @@ -655,13 +663,16 @@ function request_country($request = null) : $request->header('CF_IPCOUNTRY'); } -function require_login($text_key, $link_text_key) +function require_login($textKey, $linkTextKey) { - $title = osu_trans('users.anonymous.login_link'); - $link = Html::link('#', osu_trans($link_text_key), ['class' => 'js-user-link', 'title' => $title]); - $text = osu_trans($text_key, ['link' => $link]); - - return $text; + return osu_trans($textKey, ['link' => link_to( + '#', + osu_trans($linkTextKey), + [ + 'class' => 'js-user-link', + 'title' => osu_trans('users.anonymous.login_link'), + ], + )]); } function spinner(?array $modifiers = null) @@ -710,22 +721,6 @@ function obscure_email($email) return mb_substr($email[0], 0, 1).'***'.'@'.$email[1]; } -function countries_array_for_select() -{ - $out = []; - - foreach (App\Models\Country::forStore()->get() as $country) { - if (!isset($lastDisplay)) { - $lastDisplay = $country->display; - } elseif ($lastDisplay !== $country->display) { - $out['_disabled'] = '---'; - } - $out[$country->acronym] = $country->name; - } - - return $out; -} - function currency($price, $precision = 2, $zeroShowFree = true) { $price = round($price, $precision); @@ -924,6 +919,11 @@ function timeago($date) return ""; } +function link_to(string $url, HtmlString|string $text, array $attributes = []): string +{ + return blade_safe(tag('a', [...$attributes, 'href' => $url], make_blade_safe($text))); +} + function link_to_user($id, $username = null, $color = null, $classNames = null) { if ($id instanceof App\Models\User) { @@ -953,6 +953,11 @@ function link_to_user($id, $username = null, $color = null, $classNames = null) } } +function make_blade_safe(HtmlString|string $text): HtmlString +{ + return $text instanceof HtmlString ? $text : blade_safe(e($text)); +} + function issue_icon($issue) { switch ($issue) { diff --git a/composer.json b/composer.json index 90a46f428db..fdad702a921 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,6 @@ "laravel/passport": "*", "laravel/slack-notification-channel": "*", "laravel/tinker": "*", - "laravelcollective/html": "*", "league/commonmark": "^2.0", "league/flysystem-aws-s3-v3": "*", "league/fractal": "*", diff --git a/composer.lock b/composer.lock index dee12cbade4..91ddc6d9a0e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1404957467e52004e2e4de06635e255f", + "content-hash": "cc91b3026bfa983837950f0e96fb7c8a", "packages": [ { "name": "anhskohbo/no-captcha", @@ -3414,79 +3414,6 @@ }, "time": "2023-02-15T16:40:09+00:00" }, - { - "name": "laravelcollective/html", - "version": "v6.4.1", - "source": { - "type": "git", - "url": "https://github.com/LaravelCollective/html.git", - "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/64ddfdcaeeb8d332bd98bef442bef81e39c3910b", - "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b", - "shasum": "" - }, - "require": { - "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0", - "php": ">=7.2.5" - }, - "require-dev": { - "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0", - "mockery/mockery": "~1.0", - "phpunit/phpunit": "~8.5|^9.5.10" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.x-dev" - }, - "laravel": { - "providers": [ - "Collective\\Html\\HtmlServiceProvider" - ], - "aliases": { - "Form": "Collective\\Html\\FormFacade", - "Html": "Collective\\Html\\HtmlFacade" - } - } - }, - "autoload": { - "files": [ - "src/helpers.php" - ], - "psr-4": { - "Collective\\Html\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Adam Engebretson", - "email": "adam@laravelcollective.com" - }, - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - } - ], - "description": "HTML and Form Builders for the Laravel Framework", - "homepage": "https://laravelcollective.com", - "support": { - "issues": "https://github.com/LaravelCollective/html/issues", - "source": "https://github.com/LaravelCollective/html" - }, - "abandoned": "spatie/laravel-html", - "time": "2023-04-25T02:46:11+00:00" - }, { "name": "lcobucci/clock", "version": "3.0.0", diff --git a/config/app.php b/config/app.php index 08bc9f3be30..1c483773537 100644 --- a/config/app.php +++ b/config/app.php @@ -204,7 +204,6 @@ Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, - Collective\Html\HtmlServiceProvider::class, /* * Package Service Providers... */ @@ -253,9 +252,6 @@ // renamed to avoid conflict with PhpRedis 'LaravelRedis' => Illuminate\Support\Facades\Redis::class, - 'Form' => Collective\Html\FormFacade::class, - 'Html' => Collective\Html\HtmlFacade::class, - 'GitHub' => GrahamCampbell\GitHub\Facades\GitHub::class, 'Datadog' => ChaseConey\LaravelDatadogHelper\Datadog::class, diff --git a/resources/js/shared.coffee b/resources/js/shared.coffee index 3d65c428562..e46712fc7c8 100644 --- a/resources/js/shared.coffee +++ b/resources/js/shared.coffee @@ -62,16 +62,6 @@ $(document).on 'click', '#popup-container, #overlay', (e) -> $popup.fadeOut null, -> $popup.remove() -### -# Add `disabled` attribute to form element with value _disabled. -# Currently used to work around Form::select (in store checkout - -# new address form - country selection) since it doesn't support -# adding a disabled value. -### -$(document).on 'turbolinks:load', -> - $('[value=_disabled]').attr 'disabled', true - - ### # Click anywhere on row to click the main link! # Usage: diff --git a/resources/views/accounts/_edit_email.blade.php b/resources/views/accounts/_edit_email.blade.php index 53e00448206..87053f17950 100644 --- a/resources/views/accounts/_edit_email.blade.php +++ b/resources/views/accounts/_edit_email.blade.php @@ -2,13 +2,15 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -{!! Form::open([ - 'route' => 'account.email', - 'method' => 'PUT', - 'data-remote' => true, - 'data-skip-ajax-error-popup' => '1', - 'class' => 'js-form-error js-form-clear js-account-edit account-edit' -]) !!} + + @csrf + @endif
    -{!! Form::close() !!} + diff --git a/resources/views/accounts/_edit_password.blade.php b/resources/views/accounts/_edit_password.blade.php index 88a6d67c855..abc93464eac 100644 --- a/resources/views/accounts/_edit_password.blade.php +++ b/resources/views/accounts/_edit_password.blade.php @@ -2,13 +2,15 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -{!! Form::open([ - 'route' => 'account.password', - 'method' => 'PUT', - 'data-remote' => true, - 'data-skip-ajax-error-popup' => '1', - 'class' => 'js-form-clear js-form-error js-account-edit js-password-update account-edit' -]) !!} +
    -{!! Form::close() !!} + diff --git a/resources/views/accounts/_edit_signature.blade.php b/resources/views/accounts/_edit_signature.blade.php index e5a61d72840..102e505cf11 100644 --- a/resources/views/accounts/_edit_signature.blade.php +++ b/resources/views/accounts/_edit_signature.blade.php @@ -2,12 +2,14 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -{!! Form::open([ - 'route' => 'account.update', - 'method' => 'PUT', - 'data-remote' => true, - 'class' => 'account-edit js-account-edit' -]) !!} +
    -{!! Form::close() !!} + diff --git a/resources/views/admin/contests/show.blade.php b/resources/views/admin/contests/show.blade.php index 0c7990e2781..3a85b3b2618 100644 --- a/resources/views/admin/contests/show.blade.php +++ b/resources/views/admin/contests/show.blade.php @@ -36,16 +36,17 @@
    - {!! Form::open([ - 'data-loading-overlay' => '0', - 'method' => 'POST', - 'route' => ['admin.contests.get-zip', $contest->id], - ]) !!} +
    + @csrf - {!! Form::close() !!} +
    diff --git a/resources/views/admin/forum/forum_covers/index.blade.php b/resources/views/admin/forum/forum_covers/index.blade.php index 63449e9a37c..160d5fa9eea 100644 --- a/resources/views/admin/forum/forum_covers/index.blade.php +++ b/resources/views/admin/forum/forum_covers/index.blade.php @@ -29,10 +29,12 @@ style="background-image:url('{{ $cover['cover']->fileUrl() }}')" > - {!! Form::open([ - 'route' => ['admin.forum.forum-covers.update', $cover['cover']->id], - 'method' => 'POST', 'files' => true - ]) !!} +
    + @csrf @@ -41,16 +43,21 @@ {{ osu_trans('admin.forum.forum-covers.index.delete') }} - {!! Form::close() !!} +
    @else {{ osu_trans('admin.forum.forum-covers.index.no-cover') }} - {!! Form::open(['url' => route('admin.forum.forum-covers.store'), 'method' => 'POST', 'files' => true]) !!} +
    + @csrf - {!! Form::close() !!} +
    @endif @endforeach diff --git a/resources/views/client_verifications/create.blade.php b/resources/views/client_verifications/create.blade.php index 7e84016abfd..109bab20901 100644 --- a/resources/views/client_verifications/create.blade.php +++ b/resources/views/client_verifications/create.blade.php @@ -47,10 +47,9 @@ class="avatar avatar--full-circle"
    {!! osu_trans('common.wrong_user._', [ 'user' => e($user->username), - 'logout_link' => link_to_route( - 'logout', + 'logout_link' => link_to( + route('logout'), osu_trans('common.wrong_user.logout_link'), - [], [ 'class' => 'dialog-form__extra-link', 'data-confirm' => osu_trans('users.logout_confirm'), @@ -63,17 +62,18 @@ class="avatar avatar--full-circle"
    - {!! Form::open([ - 'url' => route('client-verifications.store'), - 'method' => 'POST', - 'data-remote' => 'true', - ]) !!} +
    + @csrf - {!! Form::close() !!} +
    . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -{!! Form::open([ - 'url' => route('forum.posts.update', $post), - 'method' => 'patch', - 'data-remote' => true, - 'class' => 'forum-post-edit-box js-forum-post-edit js-forum-post-input--form', -]) !!} +
    + @csrf + @include('forum.topics._post_edit_form', [ 'content' => $post->bodyRaw, 'inputId' => "post:{$post->getKey()}", 'type' => 'edit', ]) -{!! Form::close() !!} +
    diff --git a/resources/views/forum/topics/_edit_poll.blade.php b/resources/views/forum/topics/_edit_poll.blade.php index a14a53f177a..22a06d5320c 100644 --- a/resources/views/forum/topics/_edit_poll.blade.php +++ b/resources/views/forum/topics/_edit_poll.blade.php @@ -3,12 +3,14 @@ See the LICENCE file in the repository root for full licence text. --}} -{!! Form::open([ - 'url' => route('forum.topics.edit-poll', $topic), - 'data-remote' => true, - 'data-reload-on-success' => '1', - 'class' => 'js-forum-poll-edit-save forum-poll' -]) !!} +
    + @csrf

    {{ osu_trans('forum.topics.show.poll.edit') }} @@ -41,4 +43,4 @@ class="js-forum-poll--switch-edit btn-osu-big btn-osu-big--forum-secondary"

    -{!! Form::close() !!} + diff --git a/resources/views/forum/topics/_moderate_move.blade.php b/resources/views/forum/topics/_moderate_move.blade.php index d2705b2873c..624a24d06b5 100644 --- a/resources/views/forum/topics/_moderate_move.blade.php +++ b/resources/views/forum/topics/_moderate_move.blade.php @@ -21,7 +21,12 @@ class="btn-circle btn-circle--topic-nav btn-circle--yellow"
    - {!! Form::open(['url' => route('forum.topics.move', $topic->topic_id), 'data-remote' => true]) !!} +
    + @csrf

    {{ osu_trans('forum.topics.moderate_move.title') }}

    @@ -45,7 +50,7 @@ class="btn-circle btn-circle--topic-nav btn-circle--yellow"

    - {!! Form::close() !!} +
    diff --git a/resources/views/forum/topics/_poll_form.blade.php b/resources/views/forum/topics/_poll_form.blade.php index f562c49c5ce..cdd65b32b6a 100644 --- a/resources/views/forum/topics/_poll_form.blade.php +++ b/resources/views/forum/topics/_poll_form.blade.php @@ -2,18 +2,19 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -{!! Form::open([ - 'route' => ['forum.topics.vote', $topic->topic_id], - 'method' => 'POST', - 'data-remote' => true, - 'data-checkbox-validation' => json_encode([ +
    + @csrf

    {!! $topic->pollTitleHTML() !!} @@ -75,4 +76,4 @@ class="js-forum-poll--switch-edit btn-osu-big btn-osu-big--forum-secondary" @endif

    @endif -{!! Form::close() !!} +
    diff --git a/resources/views/forum/topics/_reply.blade.php b/resources/views/forum/topics/_reply.blade.php index a2704b4ca37..87c8807d22a 100644 --- a/resources/views/forum/topics/_reply.blade.php +++ b/resources/views/forum/topics/_reply.blade.php @@ -7,10 +7,9 @@ if (!$topic->isActive()) { if (priv_check('ForumTopicStore', $topic->forum)->can()) { $warning = osu_trans('forum.topic.create.necropost.new_topic._', [ - 'create' => link_to_route( - 'forum.topics.create', + 'create' => link_to( + route('forum.topics.create', ['forum_id' => $topic->forum_id]), osu_trans('forum.topic.create.necropost.new_topic.create'), - ['forum_id' => $topic->forum] ), ]); } else { @@ -22,13 +21,15 @@ } @endphp
    - {!! Form::open([ - 'url' => route('forum.topics.reply', $topic->getKey()), - 'class' => 'osu-page osu-page--forum-topic-reply js-forum-post-input--form js-forum-topic-reply js-sync-height--reference js-fixed-element', - 'data-remote' => true, - 'data-sync-height-target' => 'forum-topic-reply', - 'data-force-reload' => Auth::check() ? '0' : '1', - ]) !!} +
    + @csrf @if (isset($warning))
    @@ -46,5 +47,5 @@ 'inputId' => "topic:{$topic->getKey()}", 'type' => 'reply', ]) - {!! Form::close() !!} +
    diff --git a/resources/views/forum/topics/create.blade.php b/resources/views/forum/topics/create.blade.php index 2aff4103443..211f11eef51 100644 --- a/resources/views/forum/topics/create.blade.php +++ b/resources/views/forum/topics/create.blade.php @@ -7,11 +7,13 @@ @section('content') @include('forum._header', compact('forum')) - {!! Form::open([ - 'url' => route('forum.topics.store', ['forum_id' => $forum]), - 'data-remote' => true, - 'class' => 'osu-page osu-page--forum-topic js-forum-post-input--form', - ]) !!} +
    + @csrf
    @@ -78,5 +80,5 @@ class="label-toggle__checkbox js-form-toggle--input" 'inputId' => "forum:{$forum->getKey()}", 'type' => 'create', ]) - {!! Form::close() !!} + @endsection diff --git a/resources/views/layout/_popup_login.blade.php b/resources/views/layout/_popup_login.blade.php index ea292f1df09..e09bcd66984 100644 --- a/resources/views/layout/_popup_login.blade.php +++ b/resources/views/layout/_popup_login.blade.php @@ -14,16 +14,18 @@ class=" data-click-menu-id="nav2-login-box" data-visibility="hidden" > - {!! Form::open([ - 'url' => route('login'), - 'class' => ' +
    - {!! Form::close() !!} +     - {!! Form::close() !!} + @endsection diff --git a/resources/views/store/cart/_item.blade.php b/resources/views/store/cart/_item.blade.php index 73717897fa5..8dc0503dbd9 100644 --- a/resources/views/store/cart/_item.blade.php +++ b/resources/views/store/cart/_item.blade.php @@ -5,13 +5,15 @@ @php $subtext = $item->getSubtext() @endphp -{!! Form::open([ - 'class' => 'store-order-item js-store-order-item', - 'url' => route('store.cart.store'), - 'data-remote' => true, - 'data-shopify-id'=> $item->product->shopify_id, - 'data-quantity'=> $item->quantity, -]) !!} +
    + @csrf @@ -31,12 +33,21 @@ @else
    - {!! Form::select( - "item[quantity]", - product_quantity_options($item->product, $item->quantity), - $item->quantity, - ['class' => 'form-select__input js-auto-submit'] - ) !!} +
    @endif
    @@ -61,4 +72,4 @@ class="btn-osu-big btn-osu-big--store-cart-delete" @endforeach @endif -{!! Form::close() !!} + diff --git a/resources/views/store/cart/show.blade.php b/resources/views/store/cart/show.blade.php index 44545072b45..afe3c1caab7 100644 --- a/resources/views/store/cart/show.blade.php +++ b/resources/views/store/cart/show.blade.php @@ -21,10 +21,10 @@

    {{ osu_trans('store.cart.empty.text') }}

    -

    {!! osu_trans('store.cart.empty.return_link._', [ - 'link' => Html::link(route('store.products.index'), osu_trans('store.cart.empty.return_link.link_text')), - ]) !!} -

    +

    {!! osu_trans('store.cart.empty.return_link._', ['link' => link_to( + route('store.products.index'), + osu_trans('store.cart.empty.return_link.link_text'), + )]) !!}

    @else
    diff --git a/resources/views/store/header.blade.php b/resources/views/store/header.blade.php index a097d22d994..c52bd61b6be 100644 --- a/resources/views/store/header.blade.php +++ b/resources/views/store/header.blade.php @@ -92,14 +92,13 @@ {{-- Show message if there is a pending checkout and not currently on a checkout page --}} @if($showPendingCheckout) @php - $pendingCheckoutLink = Html::link( - route('store.orders.index', ['type' => 'processing']), - osu_trans('store.checkout.has_pending.link_text') - ) @endphp
    - {!! osu_trans('store.checkout.has_pending._', ['link' => $pendingCheckoutLink]) !!} + {!! osu_trans('store.checkout.has_pending._', ['link' => link_to( + route('store.orders.index', ['type' => 'processing']), + osu_trans('store.checkout.has_pending.link_text'), + )]) !!}
    @endif diff --git a/resources/views/store/invoice.blade.php b/resources/views/store/invoice.blade.php index 1a6aaf71b81..dde2990facf 100644 --- a/resources/views/store/invoice.blade.php +++ b/resources/views/store/invoice.blade.php @@ -13,7 +13,7 @@

    {{ osu_trans('store.order.thanks.title') }}

    {!! osu_trans('store.order.thanks.line_1._', [ - 'link' => Html::link('mailto:osustore@ppy.sh', osu_trans('store.order.thanks.line_1.link_text')), + 'link' => link_to('mailto:osustore@ppy.sh', osu_trans('store.order.thanks.line_1.link_text')), ]) !!}

    diff --git a/resources/views/store/orders/_status.blade.php b/resources/views/store/orders/_status.blade.php index d8fe61d2902..b4c543f0270 100644 --- a/resources/views/store/orders/_status.blade.php +++ b/resources/views/store/orders/_status.blade.php @@ -9,7 +9,7 @@

    {{ osu_trans('store.invoice.status.delivered.title') }}

    {!! osu_trans('store.invoice.status.delivered.line_1._', [ - 'link' => Html::link('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.delivered.line_1.link_text')), + 'link' => link_to('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.delivered.line_1.link_text')), ]) !!}

    @elseif ($order->isPaymentRequested()) @@ -18,15 +18,16 @@ {{ osu_trans('store.invoice.status.processing.line_1') }}

    - {!! osu_trans('store.invoice.status.processing.line_2._', [ - 'link' => Html::link(route('store.checkout.show', $order), osu_trans('store.invoice.status.processing.line_2.link_text')), - ]) !!} + {!! osu_trans('store.invoice.status.processing.line_2._', ['link' => link_to( + route('store.checkout.show', $order->getKey()), + osu_trans('store.invoice.status.processing.line_2.link_text'), + )]) !!}

    @elseif ($order->isCancelled())

    {{ osu_trans('store.invoice.status.cancelled.title') }}

    {!! osu_trans('store.invoice.status.cancelled.line_1._', [ - 'link' => Html::link('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.cancelled.line_1.link_text')), + 'link' => link_to('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.cancelled.line_1.link_text')), 'order_number' => $order->order_id, ]) !!}

    @@ -39,7 +40,7 @@ @else

    {!! osu_trans('store.invoice.status.shipped.no_tracking_details._', [ - 'link' => Html::link('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.shipped.no_tracking_details.link_text')), + 'link' => link_to('mailto:osustore@ppy.sh', osu_trans('store.invoice.status.shipped.no_tracking_details.link_text')), ]) !!}

    @endif diff --git a/resources/views/store/products/show.blade.php b/resources/views/store/products/show.blade.php index 66fd1c77696..12b2c1caaf5 100644 --- a/resources/views/store/products/show.blade.php +++ b/resources/views/store/products/show.blade.php @@ -7,12 +7,14 @@ @section('content') @include('store.header') - {!! Form::open([ - 'url' => route('store.cart.store', ['add' => true]), - 'data-remote' => true, - 'id' => 'product-form', - 'class' => 'osu-page osu-page--store', - ]) !!} +
    + @csrf
    header_image) !!}>
    @@ -94,18 +96,21 @@ class=" @if($product->inStock())
    - {!! Form::label( - 'item[quantity]', - osu_trans('store.order.item.quantity'), - ['class' => 'u-uppercase'] - ) !!} +
    - {!! Form::select( - "item[quantity]", - product_quantity_options($product), 1, - ['class' => 'js-store-item-quantity form-select__input'] - ) !!} +
    @elseif ($product->inStock(1, true)) @@ -140,17 +145,16 @@ class="btn-osu-big btn-osu-big--store-action js-login-required--click"

    {!! osu_trans('store.product.notification_success', [ - 'link' => link_to_route( - 'store.notification-request', + 'link' => link_to( + route('store.notification-request', ['product' => $product->product_id]), osu_trans('store.product.notification_remove_text'), - ['product' => $product->product_id], - ['data-remote' => 'true', 'data-method' => 'DELETE'] - ) + ['data-remote' => 'true', 'data-method' => 'DELETE'], + ), ]) !!}

    @endif - {!! Form::close() !!} +
    @endsection diff --git a/resources/views/store/products/supporter-tag.blade.php b/resources/views/store/products/supporter-tag.blade.php index 3a1d55b11a9..ca07d85e8fc 100644 --- a/resources/views/store/products/supporter-tag.blade.php +++ b/resources/views/store/products/supporter-tag.blade.php @@ -16,31 +16,24 @@
    - {!! - Form::text( - 'item[extra_data][username]', - get_string(request('target')), - [ - 'id' => 'username', - 'class' => 'js-username-input store-supporter-tag__input', - 'placeholder' => osu_trans('store.supporter_tag.gift'), - 'autocomplete' => 'off' - ] - ) - !!} +
    - {!! - Form::textarea( - 'item[extra_data][message]', - null, - [ - 'class' => 'store-supporter-tag__input store-supporter-tag__input--message', - 'maxlength' => ExtraDataSupporterTag::MAX_MESSAGE_LENGTH, - 'placeholder' => osu_trans('store.supporter_tag.gift_message', ['length' => ExtraDataSupporterTag::MAX_MESSAGE_LENGTH]), - 'rows' => 3, - ] - ) - !!} +
    diff --git a/resources/views/store/products/username-change.blade.php b/resources/views/store/products/username-change.blade.php index 10c62bda008..18dd0257ab5 100644 --- a/resources/views/store/products/username-change.blade.php +++ b/resources/views/store/products/username-change.blade.php @@ -2,26 +2,30 @@ Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. See the LICENCE file in the repository root for full licence text. --}} -@if(!Auth::user()) +@php + $user = Auth::user(); +@endphp +@if($user === null) {!! require_login('store.username_change.require_login._', 'store.username_change.require_login.link_text') !!} @else
    -
    +
    - + - {!! Form::label('username', 'New Username') !!} - {!! Form::text('item[extra_info]', '', [ - 'id' => 'username', - 'class' => 'js-username-change-input form-text form-text--username-change', - 'placeholder' => 'Requested Username', - 'autocomplete' => 'off', - ]) !!} + +
    {{ osu_trans('store.username_change.check') }}
     -
    Your current username is "{{ Auth::user()->username }}".
    +
    Your current username is "{{ $user->username }}".

    diff --git a/resources/views/users/_verify_box.blade.php b/resources/views/users/_verify_box.blade.php index 73f739520ca..82dae27fd4d 100644 --- a/resources/views/users/_verify_box.blade.php +++ b/resources/views/users/_verify_box.blade.php @@ -42,10 +42,9 @@ class="user-verification__key js-user-verification--input modal-af" ), ]) !!} {!! osu_trans('user_verification.box.info.reissue', [ - 'reissue_link' => link_to_route( - 'account.reissue-code', + 'reissue_link' => link_to( + route('account.reissue-code'), osu_trans('user_verification.box.info.reissue_link'), - [], ['class' => 'js-user-verification--reissue user-verification__link'] ), 'logout_link' => diff --git a/resources/views/vendor/passport/authorize.blade.php b/resources/views/vendor/passport/authorize.blade.php index 83ca3e97d9b..8193d4b2066 100644 --- a/resources/views/vendor/passport/authorize.blade.php +++ b/resources/views/vendor/passport/authorize.blade.php @@ -69,40 +69,42 @@ class="avatar avatar--full-circle"
    {!! osu_trans('common.wrong_user._', [ 'user' => e($user->username), - 'logout_link' => link_to_route( - 'logout', + 'logout_link' => link_to( + route('logout'), osu_trans('common.wrong_user.logout_link'), - [], [ 'class' => 'dialog-form__extra-link', 'data-confirm' => osu_trans('users.logout_confirm'), 'data-method' => 'DELETE', 'data-reload-on-success' => '1', 'data-remote' => '1', - ] + ], ), ]) !!}
    - {!! Form::open([ - 'url' => '/oauth/authorize', - 'method' => 'POST', - ]) !!} +
    + @csrf - {!! Form::close() !!} +
    - {!! Form::open([ - 'url' => '/oauth/authorize', - 'method' => 'DELETE', - ]) !!} +
    + @csrf + - {!! Form::close() !!} +
    From 6817bfa8edf15adf87ad84f37e4780b685c28553 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 22:16:40 +0900 Subject: [PATCH 398/470] Add more translation for username change --- resources/lang/en/store.php | 4 ++++ resources/views/store/products/username-change.blade.php | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/lang/en/store.php b/resources/lang/en/store.php index 8cc1b3b43a4..ee8d5a29c70 100644 --- a/resources/lang/en/store.php +++ b/resources/lang/en/store.php @@ -194,6 +194,10 @@ 'username_change' => [ 'check' => 'Enter a username to check availability!', 'checking' => 'Checking availability of :username...', + 'placeholder' => 'Requested Username', + 'label' => 'New Username', + 'current' => 'Your current username is ":username".', + 'require_login' => [ '_' => 'You need to be :link to change your name!', 'link_text' => 'signed in', diff --git a/resources/views/store/products/username-change.blade.php b/resources/views/store/products/username-change.blade.php index 18dd0257ab5..108b33b1349 100644 --- a/resources/views/store/products/username-change.blade.php +++ b/resources/views/store/products/username-change.blade.php @@ -14,18 +14,18 @@ - +
    {{ osu_trans('store.username_change.check') }}
     -
    Your current username is "{{ $user->username }}".
    +
    {{ osu_trans('store.username_change.current', ['username' => $user->username]) }}

    From 1782d7be785f5db4acc14b3bb6604bc5373275cf Mon Sep 17 00:00:00 2001 From: Sam Verhaegen Date: Fri, 10 Nov 2023 15:50:23 +0200 Subject: [PATCH 399/470] use double quotes --- resources/js/beatmapsets-show/header.tsx | 4 ++-- resources/js/beatmapsets-show/info.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/js/beatmapsets-show/header.tsx b/resources/js/beatmapsets-show/header.tsx index 30ce4f0f366..b3124acbda5 100644 --- a/resources/js/beatmapsets-show/header.tsx +++ b/resources/js/beatmapsets-show/header.tsx @@ -140,7 +140,7 @@ export default class Header extends React.Component { {getTitle(this.controller.beatmapset)} @@ -157,7 +157,7 @@ export default class Header extends React.Component { {getArtist(this.controller.beatmapset)} diff --git a/resources/js/beatmapsets-show/info.tsx b/resources/js/beatmapsets-show/info.tsx index 396183d0ebf..a90cdb9e042 100644 --- a/resources/js/beatmapsets-show/info.tsx +++ b/resources/js/beatmapsets-show/info.tsx @@ -158,7 +158,7 @@ export default class Info extends React.Component { {this.controller.beatmapset.source} From 7c61e798ad82c3efc10293cc511c11abef4598a2 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 23:01:10 +0900 Subject: [PATCH 400/470] Additionally check for isComposing Apparently it's still `Enter` on macos. --- resources/js/beatmaps/search-panel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/beatmaps/search-panel.tsx b/resources/js/beatmaps/search-panel.tsx index 417c643e0a4..3371cb1de23 100644 --- a/resources/js/beatmaps/search-panel.tsx +++ b/resources/js/beatmaps/search-panel.tsx @@ -104,7 +104,7 @@ export class SearchPanel extends React.Component { }; private readonly onKeyDown = (event: React.KeyboardEvent) => { - if (event.key === 'Enter') { + if (!event.nativeEvent.isComposing && event.key === 'Enter') { htmlElementOrNull(event.target)?.blur(); } }; From 4ad681ecd42e7ec7b48d42860f8e3749cd4edef4 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 23:13:18 +0900 Subject: [PATCH 401/470] Move private method --- app/Libraries/Countries.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Libraries/Countries.php b/app/Libraries/Countries.php index 7c98c5d086d..cb4eb19ba83 100644 --- a/app/Libraries/Countries.php +++ b/app/Libraries/Countries.php @@ -15,13 +15,13 @@ class Countries { use Memoizes; - private function allByCode(): Collection + public function byCode(string $code): ?Country { - return $this->memoize(__FUNCTION__, fn () => Country::get(['acronym', 'name'])->keyBy('acronym')); + return $this->allByCode()->get($code); } - public function byCode(string $code): ?Country + private function allByCode(): Collection { - return $this->allByCode()->get($code); + return $this->memoize(__FUNCTION__, fn () => Country::get(['acronym', 'name'])->keyBy('acronym')); } } From 83ed8e2b052e28dc0498e0ad1d57542e49c58d70 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 23:33:09 +0900 Subject: [PATCH 402/470] Use something that seems to also work on safari? --- resources/js/beatmaps/search-panel.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/js/beatmaps/search-panel.tsx b/resources/js/beatmaps/search-panel.tsx index 3371cb1de23..55b3477ac56 100644 --- a/resources/js/beatmaps/search-panel.tsx +++ b/resources/js/beatmaps/search-panel.tsx @@ -103,8 +103,10 @@ export class SearchPanel extends React.Component { this.controller.filters.update('query', this.query); }; - private readonly onKeyDown = (event: React.KeyboardEvent) => { - if (!event.nativeEvent.isComposing && event.key === 'Enter') { + // TODO: deprecated event. Update to onbeforeinput once safari adds it on normal enter + // (or maybe change to form and intercept onsubmit instead) + private readonly onKeyPress = (event: React.KeyboardEvent) => { + if (event.key === 'Enter') { htmlElementOrNull(event.target)?.blur(); } }; @@ -160,7 +162,7 @@ export class SearchPanel extends React.Component { className='beatmapsets-search__input js-beatmapsets-search-input' name='search' onChange={this.onChange} - onKeyDown={this.onKeyDown} + onKeyPress={this.onKeyPress} placeholder={trans('beatmaps.listing.search.prompt')} type='search' value={this.query} @@ -192,7 +194,7 @@ export class SearchPanel extends React.Component { className='beatmapsets-search__input js-beatmapsets-search-input' name='search' onChange={this.onChange} - onKeyDown={this.onKeyDown} + onKeyPress={this.onKeyPress} placeholder={trans('beatmaps.listing.search.prompt')} type='search' value={this.query} From b4cbcb122db321c97e698495c7188096e3025bea Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 10 Nov 2023 23:39:32 +0900 Subject: [PATCH 403/470] More comments --- resources/js/beatmaps/search-panel.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/beatmaps/search-panel.tsx b/resources/js/beatmaps/search-panel.tsx index 55b3477ac56..9ecb058459a 100644 --- a/resources/js/beatmaps/search-panel.tsx +++ b/resources/js/beatmaps/search-panel.tsx @@ -105,6 +105,7 @@ export class SearchPanel extends React.Component { // TODO: deprecated event. Update to onbeforeinput once safari adds it on normal enter // (or maybe change to form and intercept onsubmit instead) + // This shouldn't trigger during ime composition private readonly onKeyPress = (event: React.KeyboardEvent) => { if (event.key === 'Enter') { htmlElementOrNull(event.target)?.blur(); From 0c0ab7e2963f69ad4ebe14c998a0bdb0aba58ef5 Mon Sep 17 00:00:00 2001 From: nanaya Date: Sat, 11 Nov 2023 22:32:01 +0900 Subject: [PATCH 404/470] Fix creating seasonal background url --- .../SeasonalBackgroundTransformer.php | 3 +- .../SeasonalBackgroundTransformerTest.php | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 tests/Transformers/SeasonalBackgroundTransformerTest.php diff --git a/app/Transformers/SeasonalBackgroundTransformer.php b/app/Transformers/SeasonalBackgroundTransformer.php index b3cee658826..a35da6936e7 100644 --- a/app/Transformers/SeasonalBackgroundTransformer.php +++ b/app/Transformers/SeasonalBackgroundTransformer.php @@ -5,6 +5,7 @@ namespace App\Transformers; +use App\Libraries\StorageUrl; use App\Models\UserContestEntry; class SeasonalBackgroundTransformer extends TransformerAbstract @@ -25,7 +26,7 @@ public function transform(UserContestEntry $entry) { return [ // files generated by process separate from osu-web - 'url' => $entry->storage()->url("{$entry->fileDir()}/{$entry->hash}_opt.jpg"), + 'url' => StorageUrl::make(null, "{$entry->fileDir()}/{$entry->hash}_opt.jpg"), ]; } diff --git a/tests/Transformers/SeasonalBackgroundTransformerTest.php b/tests/Transformers/SeasonalBackgroundTransformerTest.php new file mode 100644 index 00000000000..e6d32024020 --- /dev/null +++ b/tests/Transformers/SeasonalBackgroundTransformerTest.php @@ -0,0 +1,28 @@ +. Licensed under the GNU Affero General Public License v3.0. +// See the LICENCE file in the repository root for full licence text. + +declare(strict_types=1); + +namespace Tests\Transformers; + +use App\Models\User; +use App\Models\UserContestEntry; +use App\Transformers\SeasonalBackgroundTransformer; +use Tests\TestCase; + +class SeasonalBackgroundTransformerTest extends TestCase +{ + public function testBasic(): void + { + $entry = UserContestEntry::create([ + 'hash' => hash('sha256', ''), + 'user_id' => User::factory()->create()->getKey(), + ]); + + $json = json_item($entry, new SeasonalBackgroundTransformer()); + + $this->assertNotNull($json['url']); + } +} From 2dd2b02cb5a6d2d0337f0ea3ee734a12bc4d50ff Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 13 Nov 2023 17:32:09 +0900 Subject: [PATCH 405/470] Already marked safe --- app/Libraries/ApidocRouteHelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Libraries/ApidocRouteHelper.php b/app/Libraries/ApidocRouteHelper.php index ac0b6ba5ce3..ab346f9f53d 100644 --- a/app/Libraries/ApidocRouteHelper.php +++ b/app/Libraries/ApidocRouteHelper.php @@ -16,11 +16,11 @@ public static function scopeBadge($scope) { $scopeLower = strtolower($scope); - return blade_safe(link_to( + return link_to( "#scope-{$scopeLower}", $scope, ['class' => "badge badge-scope badge-scope-{$scopeLower}"], - )); + ); } From f2d9ea7976cc06ad045446d880e545fde6fc27d7 Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 13 Nov 2023 17:34:52 +0900 Subject: [PATCH 406/470] Fix return type --- app/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers.php b/app/helpers.php index 400e15973b2..6e22360737c 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -919,7 +919,7 @@ function timeago($date) return ""; } -function link_to(string $url, HtmlString|string $text, array $attributes = []): string +function link_to(string $url, HtmlString|string $text, array $attributes = []): HtmlString { return blade_safe(tag('a', [...$attributes, 'href' => $url], make_blade_safe($text))); } From 14d6facc89d674774b714dfe2d1f576fbd996c60 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 9 Nov 2023 21:25:18 +0900 Subject: [PATCH 407/470] Remove encoding and non-compressed row format --- .../2015_01_01_133337_base_tables.php | 372 ++---------------- .../2015_01_01_133337_chat_base_tables.php | 10 +- ...6_06_21_054206_create_poll_votes_table.php | 5 - ...06_21_055139_create_poll_options_table.php | 5 - ..._06_21_134532_create_banchostats_table.php | 3 - ...2016_07_21_072328_create_artist_tables.php | 9 - ...016_07_29_024320_create_contest_tables.php | 9 - ...016_08_16_101048_create_sessions_table.php | 5 - ...4049_create_user_contest_entries_table.php | 3 - ...2_07_063316_create_artist_albums_table.php | 3 - ...2017_02_21_084403_mb4_forum_last_topic.php | 29 +- ...0_013337_create_osu_beatmappacks_table.php | 3 - ...38_create_osu_beatmappacks_items_table.php | 3 - ...9_01_101541_create_osu_profile_banners.php | 3 - ...7_09_12_065003_fix_logs_table_encoding.php | 5 +- .../2017_10_10_082642_add_ip_bans.php | 8 +- ...017_11_27_064736_fix_user_sig_encoding.php | 5 +- ...2020_09_25_092826_create_phpbb_banlist.php | 7 +- ...eate_osu_user_performance_rank_highest.php | 4 - 19 files changed, 63 insertions(+), 428 deletions(-) diff --git a/database/migrations/2015_01_01_133337_base_tables.php b/database/migrations/2015_01_01_133337_base_tables.php index c4d592df89e..6769a697b86 100644 --- a/database/migrations/2015_01_01_133337_base_tables.php +++ b/database/migrations/2015_01_01_133337_base_tables.php @@ -15,9 +15,6 @@ class BaseTables extends Migration public function up() { Schema::create('osu_achievements', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumIncrements('achievement_id'); $table->string('name', 40); $table->string('image', 50); @@ -30,12 +27,8 @@ public function up() $table->index(['grouping', 'ordering'], 'display_order'); $table->index('quest_ordering', 'quest_ordering'); }); - $this->setRowFormat('osu_achievements', 'DYNAMIC'); Schema::create('osu_apikeys', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('key'); $table->unsignedInteger('user_id'); $table->string('app_name', 100)->default(''); @@ -48,23 +41,16 @@ public function up() $table->unique('api_key', 'api_key'); }); - $this->setRowFormat('osu_apikeys', 'DYNAMIC'); Schema::create('osu_badges', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->unsignedMediumInteger('user_id'); $table->string('image', 255); $table->string('description', 255); $table->timestamp('awarded')->nullable()->useCurrent(); $table->primary(['user_id', 'image']); }); - $this->setRowFormat('osu_badges', 'DYNAMIC'); Schema::create('osu_beatmap_difficulty', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->unsignedInteger('beatmap_id'); $table->tinyInteger('mode')->default(0); $table->unsignedInteger('mods'); @@ -87,18 +73,12 @@ public function up() DB::statement('ALTER TABLE osu_beatmap_difficulty_attribs ADD value float null'); Schema::create('osu_beatmaps', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('beatmap_id'); $table->unsignedMediumInteger('beatmapset_id')->nullable(); $table->unsignedMediumInteger('user_id')->default('0'); - $column = $table->string('filename', 150)->nullable(); - $column->collation = 'utf8_bin'; - $column = $table->string('checksum', 32)->nullable(); - $column->charset = 'utf8'; - $column = $table->string('version', 80)->default(''); - $column->charset = 'latin1'; + $table->string('filename', 150)->nullable(); + $table->string('checksum', 32)->nullable(); + $table->string('version', 80)->default(''); $table->UnsignedMediumInteger('total_length')->default(0); $table->UnsignedMediumInteger('hit_length')->default(0); $table->UnsignedSmallInteger('countTotal')->default(0); @@ -116,21 +96,15 @@ public function up() $table->UnsignedMediumInteger('playcount')->default(0); $table->UnsignedMediumInteger('passcount')->default(0); $table->boolean('orphaned')->default(false); - $column = $table->string('youtube_preview', 50)->nullable(); - $column->collation = 'utf8_bin'; - + $table->string('youtube_preview', 50)->nullable(); $table->index('beatmapset_id', 'beatmapset_id'); $table->index('filename', 'filename'); $table->index('checksum', 'checksum'); $table->index('user_id', 'user_id'); }); - $this->setRowFormat('osu_beatmaps', 'DYNAMIC'); Schema::create('osu_beatmapsets', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumIncrements('beatmapset_id'); $table->mediumInteger('user_id')->unsigned()->default(0); $table->mediumInteger('thread_id')->unsigned()->default(0); @@ -151,9 +125,7 @@ public function up() $table->dateTime('approved_date')->nullable(); $table->dateTime('submit_date')->nullable(); $table->timestamp('last_update')->useCurrent(); - $column = $table->string('filename', 120)->nullable()->index('filename'); - $column->charset = 'utf8'; - $column->collation = 'utf8_bin'; + $table->string('filename', 120)->nullable()->index('filename'); $table->boolean('active')->default(1); $table->float('rating')->unsigned()->default(0); $table->smallInteger('offset')->default(0); @@ -167,9 +139,7 @@ public function up() // $table->binary('header_hash', 16)->nullable(); // $table->binary('osz2_hash', 16)->nullable(); $table->boolean('download_disabled')->unsigned()->default(0); - $column = $table->string('download_disabled_url', 100)->nullable(); - $column->charset = 'utf8'; - $column->collation = 'utf8_bin'; + $table->string('download_disabled_url', 100)->nullable(); $table->dateTime('thread_icon_date')->nullable(); $table->mediumInteger('favourite_count')->unsigned()->default(0); $table->mediumInteger('play_count')->unsigned()->default(0); @@ -185,7 +155,6 @@ public function up() $this->addBinary('osu_beatmapsets', 'body_hash', 16, true, 'filesize_novideo'); $this->addBinary('osu_beatmapsets', 'header_hash', 16, true, 'body_hash'); $this->addBinary('osu_beatmapsets', 'osz2_hash', 16, true, 'header_hash'); - $this->setRowFormat('osu_beatmapsets', 'DYNAMIC'); Schema::create('osu_user_beatmapset_ratings', function (Blueprint $table) { $table->unsignedMediumInteger('user_id'); @@ -199,9 +168,6 @@ public function up() $this->setRowFormat('osu_user_beatmapset_ratings', 'COMPRESSED'); Schema::create('osu_changelog', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumIncrements('changelog_id'); $table->mediumInteger('user_id')->unsigned(); $table->char('prefix', 1)->default('*'); @@ -221,12 +187,8 @@ public function up() $table->index(['build', 'date'], 'major_release'); $table->index(['category', 'changelog_id'], 'category'); }); - $this->setRowFormat('osu_changelog', 'DYNAMIC'); Schema::create('osu_charts', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->unsignedSmallInteger('chart_id', true); $table->string('acronym', 10)->default(''); $table->string('name', 50)->default(''); @@ -240,7 +202,6 @@ public function up() $table->index('end_date', 'enddate'); $table->index(['type', 'chart_month'], 'type'); }); - $this->setRowFormat('osu_charts', 'DYNAMIC'); Schema::create('osu_builds', function ($table) { $table->mediumIncrements('build_id'); @@ -257,9 +218,6 @@ public function up() DB::statement('ALTER TABLE osu_builds ADD last_hash BINARY(16)'); Schema::create('osu_countries', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->char('acronym', 2)->primary(); $table->string('name', 150); $table->bigInteger('rankedscore'); @@ -272,21 +230,13 @@ public function up() $table->index('playcount', 'playcount'); $table->index(['display', 'name'], 'display'); }); - $this->setRowFormat('osu_countries', 'DYNAMIC'); Schema::create('osu_counts', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->string('name', 200)->primary(); $table->bigInteger('count')->unsigned(); }); - $this->setRowFormat('osu_counts', 'DYNAMIC'); Schema::create('osu_downloads', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->unsignedMediumInteger('user_id'); $table->integer('timestamp'); $table->mediumInteger('beatmapset_id'); @@ -295,12 +245,8 @@ public function up() $table->index(['user_id', 'timestamp', 'beatmapset_id'], 'user_id'); }); - $this->setRowFormat('osu_downloads', 'DYNAMIC'); Schema::create('osu_events', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('event_id'); $table->string('text', 1000); $table->string('text_clean', 8000)->nullable(); @@ -318,29 +264,18 @@ public function up() $this->setRowFormat('osu_events', 'COMPRESSED'); Schema::create('osu_favouritemaps', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id')->unsigned(); $table->mediumInteger('beatmapset_id')->unsigned()->index('beatmapset_id'); $table->timestamp('dateadded')->useCurrent(); $table->primary(['user_id', 'beatmapset_id']); }); - $this->setRowFormat('osu_favouritemaps', 'DYNAMIC'); Schema::create('osu_genres', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->smallIncrements('genre_id'); $table->string('name', 200); }); - $this->setRowFormat('osu_genres', 'DYNAMIC'); Schema::create('osu_kudos_exchange', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumIncrements('exchange_id'); $table->mediumInteger('giver_id')->unsigned(); $table->mediumInteger('receiver_id')->unsigned(); @@ -355,63 +290,40 @@ public function up() $this->setRowFormat('osu_kudos_exchange', 'COMPRESSED'); Schema::create('osu_languages', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->integer('language_id', true); $table->string('name', 50); $table->boolean('display_order')->default(0)->index('order'); }); - $this->setRowFormat('osu_languages', 'DYNAMIC'); Schema::create('osu_leaders_fruits', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('beatmap_id')->unsigned()->primary(); $table->mediumInteger('user_id')->unsigned(); $table->integer('score_id')->nullable(); $table->index(['user_id', 'score_id'], 'user_id'); }); - $this->setRowFormat('osu_leaders_fruits', 'DYNAMIC'); Schema::create('osu_leaders_mania', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('beatmap_id')->unsigned()->primary(); $table->mediumInteger('user_id')->unsigned(); $table->integer('score_id')->nullable(); $table->index(['user_id', 'score_id'], 'user_id'); }); - $this->setRowFormat('osu_leaders_mania', 'DYNAMIC'); Schema::create('osu_leaders', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('beatmap_id')->unsigned()->primary(); $table->mediumInteger('user_id')->unsigned(); $table->integer('score_id')->nullable(); $table->index(['user_id', 'score_id'], 'user_id'); }); - $this->setRowFormat('osu_leaders', 'DYNAMIC'); Schema::create('osu_leaders_taiko', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('beatmap_id')->unsigned()->primary(); $table->mediumInteger('user_id')->unsigned(); $table->integer('score_id')->nullable(); $table->index(['user_id', 'score_id'], 'user_id'); }); - $this->setRowFormat('osu_leaders_taiko', 'DYNAMIC'); Schema::create('osu_login_attempts', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->string('ip', 128)->primary(); $table->mediumInteger('failed_attempts')->unsigned()->default(1); $table->smallInteger('total_attempts')->unsigned()->default(1); @@ -420,12 +332,8 @@ public function up() $table->timestamp('last_attempt')->nullable()->useCurrent()->index('last_attempt'); $table->timestamp('created_date')->useCurrent(); }); - $this->setRowFormat('osu_login_attempts', 'DYNAMIC'); Schema::create('osu_scores_fruits', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->unsignedInteger('score_id'); // autoincrement is set! // $table->binary('scorechecksum', 16)->index('scorechecksum'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); @@ -455,9 +363,6 @@ public function up() DB::statement('ALTER TABLE `osu_scores_fruits` MODIFY COLUMN `score_id` INT UNSIGNED AUTO_INCREMENT'); Schema::create('osu_mirrors', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->tinyIncrements('mirror_id'); $table->string('base_url', 255); $table->bigInteger('traffic_used')->default(0); @@ -466,57 +371,37 @@ public function up() $table->integer('provider_user_id'); $table->tinyInteger('enabled')->default(1); $table->decimal('version', 4, 2)->nullable(); - $table->string('pending_purge', 8192)->default(''); + $table->string('pending_purge', 6000)->nullable(true); $table->tinyInteger('pending_updates')->default(1); - $table->string('regions', 8192)->nullable(); + $table->string('regions', 6000)->nullable(true); $table->bigInteger('disk_space_free')->nullable(); }); - $this->setRowFormat('osu_mirrors', 'DYNAMIC'); Schema::create('osu_replays', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->unsignedInteger('score_id')->default(0)->primary(); $table->unsignedInteger('play_count')->default(0); $table->integer('version')->nullable(); }); - $this->setRowFormat('osu_replays', 'DYNAMIC'); Schema::create('osu_replays_fruits', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->unsignedInteger('score_id')->default(0)->primary(); $table->unsignedInteger('play_count')->default(0); $table->integer('version')->nullable(); }); - $this->setRowFormat('osu_replays_fruits', 'DYNAMIC'); Schema::create('osu_replays_mania', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->unsignedInteger('score_id')->default(0)->primary(); $table->unsignedInteger('play_count')->default(0); $table->integer('version')->nullable(); }); - $this->setRowFormat('osu_replays_mania', 'DYNAMIC'); Schema::create('osu_replays_taiko', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->unsignedInteger('score_id')->default(0)->primary(); $table->unsignedInteger('play_count')->default(0); $table->integer('version')->nullable(); }); - $this->setRowFormat('osu_replays_taiko', 'DYNAMIC'); Schema::create('osu_scores_fruits_high', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('score_id'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); $table->mediumInteger('beatmapset_id')->unsigned()->default(0); @@ -538,13 +423,8 @@ public function up() $table->index(['beatmap_id', 'score', 'user_id'], 'beatmap_score_lookup'); $table->index(['user_id', 'beatmap_id', 'rank'], 'user_beatmap_rank'); }); - $this->setRowFormat('osu_scores_fruits_high', 'DYNAMIC'); - $this->setRowFormat('osu_scores_fruits', 'DYNAMIC'); Schema::create('osu_scores_high', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('score_id'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); $table->mediumInteger('beatmapset_id')->unsigned()->default(0); @@ -566,12 +446,8 @@ public function up() $table->index(['beatmap_id', 'score', 'user_id'], 'beatmap_score_lookup'); $table->index(['user_id', 'beatmap_id', 'rank'], 'user_beatmap_rank'); }); - $this->setRowFormat('osu_scores_high', 'DYNAMIC'); Schema::create('osu_scores_mania_high', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('score_id'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); $table->mediumInteger('beatmapset_id')->unsigned()->default(0); @@ -593,12 +469,8 @@ public function up() $table->index(['beatmap_id', 'score', 'user_id'], 'beatmap_score_lookup'); $table->index(['user_id', 'beatmap_id', 'rank'], 'user_beatmap_rank'); }); - $this->setRowFormat('osu_scores_mania_high', 'DYNAMIC'); Schema::create('osu_scores_mania', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->integer('score_id', false, true); // $table->binary('scorechecksum', 16)->index('scorechecksum'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); @@ -625,12 +497,8 @@ public function up() DB::statement('ALTER TABLE `osu_scores_mania` ADD KEY (`scorechecksum`)'); DB::statement('ALTER TABLE `osu_scores_mania` ADD KEY `user_id` (`user_id`, `date`)'); DB::statement('ALTER TABLE `osu_scores_mania` MODIFY COLUMN `score_id` INT UNSIGNED AUTO_INCREMENT'); - $this->setRowFormat('osu_scores_mania', 'DYNAMIC'); Schema::create('osu_scores', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->unsignedInteger('score_id'); // $table->binary('scorechecksum', 16)->index('scorechecksum'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); @@ -658,12 +526,8 @@ public function up() DB::statement('ALTER TABLE `osu_scores` MODIFY COLUMN `score_id` INT UNSIGNED AUTO_INCREMENT'); DB::statement('ALTER TABLE `osu_scores` ADD KEY `user_id` (`user_id`, `date`)'); DB::statement('ALTER TABLE `osu_scores` ADD KEY (`beatmapset_id`)'); - $this->setRowFormat('osu_scores', 'DYNAMIC'); Schema::create('osu_scores_taiko_high', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('score_id'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); $table->mediumInteger('beatmapset_id')->unsigned()->default(0); @@ -685,12 +549,8 @@ public function up() $table->index(['beatmap_id', 'score', 'user_id'], 'beatmap_score_lookup'); $table->index(['user_id', 'beatmap_id', 'rank'], 'user_beatmap_rank'); }); - $this->setRowFormat('osu_scores_taiko_high', 'DYNAMIC'); Schema::create('osu_scores_taiko', function (Blueprint $table) { - $table->charset = 'latin1'; - $table->collation = 'latin1_swedish_ci'; - $table->integer('score_id', false, true); // $table->binary('scorechecksum', 16)->index('scorechecksum'); $table->mediumInteger('beatmap_id')->unsigned()->default(0); @@ -717,12 +577,8 @@ public function up() DB::statement('ALTER TABLE `osu_scores_taiko` ADD KEY (`scorechecksum`)'); DB::statement('ALTER TABLE `osu_scores_taiko` ADD KEY `user_id` (`user_id`, `date`)'); DB::statement('ALTER TABLE `osu_scores_taiko` MODIFY COLUMN `score_id` INT UNSIGNED AUTO_INCREMENT'); - $this->setRowFormat('osu_scores_taiko', 'DYNAMIC'); Schema::create('osu_user_achievements', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id'); $table->mediumInteger('achievement_id'); $table->timestamp('date')->useCurrent(); @@ -730,12 +586,8 @@ public function up() $table->primary(['user_id', 'achievement_id']); $table->index(['user_id', 'date'], 'user_id'); }); - $this->setRowFormat('osu_user_achievements', 'DYNAMIC'); Schema::create('osu_user_banhistory', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('ban_id'); $table->integer('user_id')->unsigned()->nullable(); $table->string('reason', 8000)->nullable()->default('Blanket Cheating Action'); @@ -749,9 +601,6 @@ public function up() $this->setRowFormat('osu_user_banhistory', 'COMPRESSED'); Schema::create('osu_user_beatmap_playcount', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id')->unsigned(); $table->mediumInteger('beatmap_id')->unsigned(); $table->smallInteger('playcount')->unsigned(); @@ -760,9 +609,6 @@ public function up() $this->setRowFormat('osu_user_beatmap_playcount', 'COMPRESSED'); Schema::create('osu_user_donations', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id')->unsigned(); $table->string('transaction_id', 250); $table->mediumInteger('target_user_id')->unsigned()->default(0); @@ -774,7 +620,6 @@ public function up() $table->index('timestamp', 'timestamp'); $table->index('transaction_id', 'transaction_id'); }); - $this->setRowFormat('osu_user_donations', 'DYNAMIC'); Schema::create('osu_username_change_history', function (Blueprint $table) { $table->increments('change_id'); @@ -787,9 +632,6 @@ public function up() $this->comment('osu_username_change_history', 'Stores historical changes to user\'\'s usernames over time.'); Schema::create('osu_user_month_playcount', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->unsignedMediumInteger('user_id'); $table->char('year_month', 4); $table->unsignedSmallInteger('playcount'); @@ -898,12 +740,8 @@ public function up() $partitions .= 'PARTITION p2 VALUES LESS THAN (3),'; $partitions .= 'PARTITION p3 VALUES LESS THAN (4)'; DB::statement("ALTER TABLE `osu_user_performance_rank` PARTITION BY RANGE (mode) ({$partitions});"); - $this->setRowFormat('osu_user_performance_rank', 'DYNAMIC'); Schema::create('osu_user_reports', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('report_id'); $table->integer('user_id'); $table->unsignedInteger('score_id')->default(0); @@ -918,12 +756,8 @@ public function up() $table->index('user_id', 'user_lookup'); }); - $this->setRowFormat('osu_user_reports', 'DYNAMIC'); Schema::create('osu_user_replayswatched', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->unsignedMediumInteger('user_id'); $table->char('year_month', 4); $table->unsignedMediumInteger('count'); @@ -949,9 +783,6 @@ public function up() }); Schema::create('osu_user_stats_fruits', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id')->primary(); $table->integer('count300')->default(0); $table->integer('count100')->default(0); @@ -985,12 +816,8 @@ public function up() $table->index(['country_acronym', 'rank_score'], 'country_acronym'); }); DB::statement('ALTER TABLE `osu_user_stats_fruits` ADD COLUMN `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER `accuracy_new`'); - $this->setRowFormat('osu_user_stats_fruits', 'DYNAMIC'); Schema::create('osu_user_stats_mania', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id')->primary(); $table->integer('count300')->default(0); $table->integer('count100')->default(0); @@ -1024,12 +851,8 @@ public function up() $table->index('playcount', 'playcount'); }); DB::statement('ALTER TABLE `osu_user_stats_mania` ADD COLUMN `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER `accuracy_new`'); - $this->setRowFormat('osu_user_stats_mania', 'DYNAMIC'); Schema::create('osu_user_stats', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id')->primary(); $table->integer('count300')->default(0); $table->integer('count100')->default(0); @@ -1063,12 +886,8 @@ public function up() $table->index('playcount', 'playcount'); }); DB::statement('ALTER TABLE `osu_user_stats` ADD COLUMN `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER `accuracy_new`'); - $this->setRowFormat('osu_user_stats', 'DYNAMIC'); Schema::create('osu_user_stats_taiko', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumInteger('user_id')->primary(); $table->integer('count300')->default(0); $table->integer('count100')->default(0); @@ -1102,41 +921,27 @@ public function up() $table->index(['country_acronym', 'rank_score'], 'country_acronym'); }); DB::statement('ALTER TABLE `osu_user_stats_taiko` ADD COLUMN `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER `accuracy_new`'); - $this->setRowFormat('osu_user_stats_taiko', 'DYNAMIC'); Schema::create('phpbb_acl_groups', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumInteger('group_id')->unsigned()->default(0)->index('group_id'); $table->mediumInteger('forum_id')->unsigned()->default(0); $table->mediumInteger('auth_option_id')->unsigned()->default(0)->index('auth_opt_id'); $table->mediumInteger('auth_role_id')->unsigned()->default(0)->index('auth_role_id'); $table->boolean('auth_setting')->default(0); }); - $this->setRowFormat('phpbb_acl_groups', 'DYNAMIC'); Schema::create('phpbb_acl_options', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('auth_option_id', true); - $column = $table->string('auth_option', 50)->default(''); - $column->collation = 'utf8_bin'; - + $table->string('auth_option', 50)->default(''); $table->unsignedTinyInteger('is_global')->default(0); $table->unsignedTinyInteger('is_local')->default(0); $table->unsignedTinyInteger('founder_only')->default(0); $table->index('auth_option', 'auth_option'); }); - $this->setRowFormat('phpbb_acl_options', 'DYNAMIC'); Schema::create('phpbb_acl_roles_data', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->unsignedMediumInteger('role_id')->default('0'); $table->unsignedMediumInteger('auth_option_id')->default(0); $table->tinyInteger('auth_setting')->default(0); @@ -1145,28 +950,18 @@ public function up() $table->index('auth_option_id', 'ath_op_id'); }); - $this->setRowFormat('phpbb_acl_roles_data', 'DYNAMIC'); Schema::create('phpbb_disallow', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('disallow_id'); - $column = $table->string('disallow_username')->default(''); - $column->collation = 'utf8_bin'; + $table->string('disallow_username')->default(''); }); - $this->setRowFormat('phpbb_disallow', 'DYNAMIC'); Schema::create('phpbb_forums', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('forum_id'); $table->mediumInteger('parent_id')->unsigned()->default(0); $table->mediumInteger('left_id')->unsigned()->default(0); $table->mediumInteger('right_id')->unsigned()->default(0); - $column = $table->mediumText('forum_parents'); - $column->collation = 'utf8_bin'; + $table->mediumText('forum_parents'); $table->string('forum_name')->default(''); $table->text('forum_desc', 65535); $table->string('forum_desc_bitfield')->default(''); @@ -1205,30 +1000,21 @@ public function up() $table->mediumInteger('prune_freq')->unsigned()->default(0); $table->index(['left_id', 'right_id'], 'left_right_id'); }); - $this->setRowFormat('phpbb_forums', 'DYNAMIC'); Schema::create('phpbb_forums_track', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumInteger('user_id')->unsigned()->default(0); $table->mediumInteger('forum_id')->unsigned()->default(0); $table->integer('mark_time')->unsigned()->default(0); $table->primary(['user_id', 'forum_id']); }); - $this->setRowFormat('phpbb_forums_track', 'DYNAMIC'); Schema::create('phpbb_posts', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('post_id'); $table->mediumInteger('topic_id')->unsigned()->default(0); $table->mediumInteger('forum_id')->unsigned()->default(0); $table->mediumInteger('poster_id')->unsigned()->default(0); $table->mediumInteger('icon_id')->unsigned()->default(0); - $column = $table->string('poster_ip', 40)->default(''); - $column->collation = 'utf8_bin'; + $table->string('poster_ip', 40)->default(''); $table->integer('post_time')->unsigned()->default(0); $table->boolean('post_approved')->unsigned()->default(1); $table->boolean('post_reported')->unsigned()->default(0); @@ -1236,14 +1022,9 @@ public function up() $table->boolean('enable_smilies')->unsigned()->default(1); $table->boolean('enable_magic_url')->unsigned()->default(1); $table->boolean('enable_sig')->unsigned()->default(1); - $column = $table->string('post_username')->default(''); - $column->collation = 'utf8_bin'; - $column = $table->string('post_subject', 100)->default(''); - $column->charset = 'utf8mb4'; - $column->collation = 'utf8mb4_unicode_ci'; - $column = $table->mediumText('post_text'); - $column->charset = 'utf8mb4'; - $column->collation = 'utf8mb4_unicode_ci'; + $table->string('post_username')->default(''); + $table->string('post_subject', 100)->default(''); + $table->mediumText('post_text'); $table->boolean('post_attachment')->unsigned()->default(0); $table->string('bbcode_bitfield')->default(''); $table->string('bbcode_uid', 5)->default(''); @@ -1259,52 +1040,34 @@ public function up() $table->index('poster_id', 'poster_id'); $table->index(['topic_id', 'post_time'], 'tid_post_time'); }); - $this->setRowFormat('phpbb_posts', 'DYNAMIC'); Schema::create('phpbb_ranks', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('rank_id'); - $column = $table->string('rank_title')->default(''); - $column->collation = 'utf8_bin'; + $table->string('rank_title')->default(''); $table->mediumInteger('rank_min')->unsigned()->default(0); $table->boolean('rank_special')->unsigned()->default(0); - $column = $table->string('rank_image')->default(''); - $column->collation = 'utf8_bin'; + $table->string('rank_image')->default(''); }); - $this->setRowFormat('phpbb_ranks', 'DYNAMIC'); Schema::create('phpbb_smilies', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('smiley_id'); - $column = $table->string('code', 50)->default(''); - $column->collation = 'utf8_bin'; - $column = $table->string('emotion', 50)->default(''); - $column->collation = 'utf8_bin'; - $column = $table->string('smiley_url', 50)->default(''); - $column->collation = 'utf8_bin'; + $table->string('code', 50)->default(''); + $table->string('emotion', 50)->default(''); + $table->string('smiley_url', 50)->default(''); $table->smallInteger('smiley_width')->unsigned()->default(0); $table->smallInteger('smiley_height')->unsigned()->default(0); $table->mediumInteger('smiley_order')->unsigned()->default(0); $table->boolean('display_on_posting')->unsigned()->default(1)->index('display_on_post'); }); - $this->setRowFormat('phpbb_smilies', 'DYNAMIC'); Schema::create('phpbb_topics', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('topic_id'); $table->mediumInteger('forum_id')->unsigned()->default(0); $table->mediumInteger('icon_id')->unsigned()->default(0); $table->boolean('topic_attachment')->unsigned()->default(0); $table->boolean('topic_approved')->unsigned()->default(1); $table->boolean('topic_reported')->unsigned()->default(0); - $column = $table->string('topic_title', 100)->default(''); - $column->charset = 'utf8mb4'; + $table->string('topic_title', 100)->default(''); $table->mediumInteger('topic_poster')->unsigned()->default(0); $table->integer('topic_time')->unsigned()->default(0); $table->integer('topic_time_limit')->unsigned()->default(0); @@ -1314,18 +1077,13 @@ public function up() $table->boolean('topic_status')->default(0); $table->boolean('topic_type')->default(0); $table->mediumInteger('topic_first_post_id')->unsigned()->default(0); - $column = $table->string('topic_first_poster_name')->default(''); - $column->collation = 'utf8_bin'; - $column = $table->string('topic_first_poster_colour', 6)->default(''); - $column->collation = 'utf8_bin'; + $table->string('topic_first_poster_name')->default(''); + $table->string('topic_first_poster_colour', 6)->default(''); $table->mediumInteger('topic_last_post_id')->unsigned()->default(0); $table->mediumInteger('topic_last_poster_id')->unsigned()->default(0); - $column = $table->string('topic_last_poster_name')->default(''); - $column->collation = 'utf8_bin'; - $column = $table->string('topic_last_poster_colour', 6)->default(''); - $column->collation = 'utf8_bin'; - $column = $table->string('topic_last_post_subject', 100)->default(''); - $column->collation = 'utf8_bin'; + $table->string('topic_last_poster_name')->default(''); + $table->string('topic_last_poster_colour', 6)->default(''); + $table->string('topic_last_post_subject', 100)->default(''); $table->integer('topic_last_post_time')->unsigned()->default(0); $table->integer('topic_last_view_time')->unsigned()->default(0); $table->mediumInteger('topic_moved_id')->unsigned()->default(0); @@ -1346,12 +1104,8 @@ public function up() $table->index(['forum_id', 'topic_type', 'topic_last_post_time'], 'forum_id_type'); $table->index(['forum_id', 'topic_type', 'osu_starpriority', 'topic_last_post_time'], 'star_sort'); }); - $this->setRowFormat('phpbb_topics', 'DYNAMIC'); Schema::create('phpbb_topics_stars', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->mediumIncrements('star_id'); $table->unsignedMediumInteger('topic_id'); $table->unsignedMediumInteger('user_id'); @@ -1361,12 +1115,8 @@ public function up() $table->index(['user_id'], 'user_id'); $table->index(['topic_id', 'user_id'], 'topic_id'); }); - $this->setRowFormat('phpbb_topics_stars', 'DYNAMIC'); Schema::create('phpbb_topics_track', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumInteger('user_id')->unsigned()->default(0); $table->mediumInteger('topic_id')->unsigned()->default(0); $table->mediumInteger('forum_id')->unsigned()->default(0); @@ -1375,34 +1125,24 @@ public function up() $table->index('forum_id', 'forum_id'); $table->index('topic_id', 'topic_id'); }); - $this->setRowFormat('phpbb_topics_track', 'DYNAMIC'); Schema::create('phpbb_user_group', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumInteger('group_id')->unsigned()->default(0); $table->mediumInteger('user_id')->unsigned()->default(0)->index('user_id'); $table->boolean('group_leader')->unsigned()->default(0); $table->boolean('user_pending')->unsigned()->default(1); $table->primary(['group_id', 'user_id']); }); - $this->setRowFormat('phpbb_user_group', 'DYNAMIC'); Schema::create('phpbb_users', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('user_id'); $table->tinyInteger('user_type')->default(0); $table->mediumInteger('group_id')->unsigned()->default(2); - $column = $table->mediumText('user_permissions'); - $column->collation = 'utf8_bin'; + $table->mediumText('user_permissions'); $table->mediumInteger('user_perm_from')->unsigned()->nullable()->default(0); $table->string('user_ip', 50)->default(''); $table->integer('user_regdate')->unsigned()->default(0); - $column = $table->string('username')->default(''); - $column->charset = 'utf8'; + $table->string('username')->default(''); $table->string('username_clean')->default(''); $table->string('user_password', 64)->default(''); $table->integer('user_passchg')->unsigned()->default(0); @@ -1451,8 +1191,7 @@ public function up() $table->boolean('user_avatar_type')->default(0); $table->smallInteger('user_avatar_width')->unsigned()->default(0); $table->smallInteger('user_avatar_height')->unsigned()->default(0); - $column = $table->mediumText('user_sig'); - $column->collation = 'utf8_bin'; + $table->mediumText('user_sig'); $table->string('user_sig_bbcode_uid', 5)->default(''); $table->string('user_sig_bbcode_bitfield')->default(''); $table->string('user_from', 100)->default(''); @@ -1483,43 +1222,24 @@ public function up() $table->unique('username_clean', 'username_clean'); $table->unique(['username', 'user_id'], 'username_id'); }); - $this->setRowFormat('phpbb_users', 'DYNAMIC'); Schema::create('phpbb_groups', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('group_id'); $table->tinyInteger('group_type')->default(1); $table->unsignedTinyInteger('group_founder_manage')->default(0); - $column = $table->string('group_name', 255)->default(''); - $column->collation = 'utf8_bin'; - - $column = $table->text('group_desc'); - $column->collation = 'utf8_bin'; - - $column = $table->string('group_desc_bitfield', 255)->default(''); - $column->collation = 'utf8_bin'; - + $table->string('group_name', 255)->default(''); + $table->text('group_desc'); + $table->string('group_desc_bitfield', 255)->default(''); $table->unsignedInteger('group_desc_options')->default(7); - - $column = $table->string('group_desc_uid', 5)->default(''); - $column->collation = 'utf8_bin'; - + $table->string('group_desc_uid', 5)->default(''); $table->unsignedTinyInteger('group_display')->default(0); - - $column = $table->string('group_avatar', 255)->default(''); - $column->collation = 'utf8_bin'; - + $table->string('group_avatar', 255)->default(''); $table->tinyInteger('group_avatar_type')->default(0); $table->unsignedSmallInteger('group_avatar_width')->default(0); $table->unsignedSmallInteger('group_avatar_height')->default(0); $table->unsignedMediumInteger('group_rank')->default(0); - - $column = $table->string('group_colour', 6)->default(''); - $column->collation = 'utf8_bin'; - + $table->string('group_colour', 6)->default(''); $table->unsignedMediumInteger('group_sig_chars')->default(0); $table->unsignedTinyInteger('group_receive_pm')->default(0); $table->unsignedMediumInteger('group_message_limit')->default(0); @@ -1527,30 +1247,18 @@ public function up() $table->index('group_legend', 'group_legend'); }); - $this->setRowFormat('phpbb_groups', 'DYNAMIC'); Schema::create('phpbb_log', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('log_id'); $table->tinyInteger('log_type')->default(0); $table->unsignedMediumInteger('user_id')->default(0); $table->unsignedMediumInteger('forum_id')->default(0); $table->unsignedMediumInteger('topic_id')->default(0); $table->unsignedMediumInteger('reportee_id')->default(0); - - $column = $table->string('log_ip', 40)->default(''); - $column->collation = 'utf8_bin'; - + $table->string('log_ip', 40)->default(''); $table->unsignedInteger('log_time')->default(0); - - $column = $table->text('log_operation'); - $column->collation = 'utf8_bin'; - - $column = $table->mediumText('log_data'); - $column->collation = 'utf8_bin'; - + $table->text('log_operation'); + $table->mediumText('log_data'); $table->index('log_type', 'log_type'); $table->index('forum_id', 'forum_id'); $table->index('topic_id', 'topic_id'); @@ -1560,9 +1268,6 @@ public function up() $this->setRowFormat('phpbb_log', 'COMPRESSED'); Schema::create('phpbb_topics_watch', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->unsignedMediumInteger('user_id')->default(0); $table->unsignedMediumInteger('topic_id')->default(0); $table->unsignedTinyInteger('notify_status')->default(0); @@ -1576,7 +1281,6 @@ public function up() DB::statement(' CREATE TABLE weak_passwords (hash binary(16) NOT NULL, PRIMARY KEY (hash)) - DEFAULT CHARSET=utf8mb4 '); } diff --git a/database/migrations/2015_01_01_133337_chat_base_tables.php b/database/migrations/2015_01_01_133337_chat_base_tables.php index b950690596c..86031170206 100644 --- a/database/migrations/2015_01_01_133337_chat_base_tables.php +++ b/database/migrations/2015_01_01_133337_chat_base_tables.php @@ -2,6 +2,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; @@ -18,11 +19,8 @@ public function up() $connection = DB::connection('mysql-chat'); $builder->create('channels', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->increments('channel_id'); - $column = $table->string('name', 50); - $column->charset = 'utf8mb4'; + $table->string('name', 50); $table->string('description', 256); $table->timestamp('creation_time')->default(DB::raw('CURRENT_TIMESTAMP')); $table->enum('type', ['Public', 'Private', 'Multiplayer', 'Spectator', 'Temporary'])->default('Temporary'); @@ -34,8 +32,6 @@ public function up() $this->setRowFormat($connection, 'channels', 'DYNAMIC'); $builder->create('messages', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->increments('message_id'); $table->integer('user_id')->unsigned(); $table->integer('channel_id')->unsigned(); @@ -49,8 +45,6 @@ public function up() $this->setRowFormat($connection, 'messages', 'COMPRESSED'); $builder->create('messages_private', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->increments('message_id'); $table->integer('user_id')->unsigned(); $table->integer('target_id')->unsigned(); diff --git a/database/migrations/2016_06_21_054206_create_poll_votes_table.php b/database/migrations/2016_06_21_054206_create_poll_votes_table.php index 84bbd852e4e..2bc02b5987a 100644 --- a/database/migrations/2016_06_21_054206_create_poll_votes_table.php +++ b/database/migrations/2016_06_21_054206_create_poll_votes_table.php @@ -19,9 +19,6 @@ public function up() } Schema::create('phpbb_poll_votes', function ($table) { - $table->collation = 'utf8_bin'; - $table->charset = 'utf8'; - $table->mediumInteger('topic_id')->unsigned()->default(0); $table->tinyInteger('poll_option_id')->default(0); $table->mediumInteger('vote_user_id')->unsigned()->default(0); @@ -31,8 +28,6 @@ public function up() $table->index('vote_user_id', 'vote_user_id'); $table->index('vote_user_ip', 'vote_user_ip'); }); - - DB::statement('ALTER TABLE phpbb_poll_votes ROW_FORMAT=DYNAMIC'); } /** diff --git a/database/migrations/2016_06_21_055139_create_poll_options_table.php b/database/migrations/2016_06_21_055139_create_poll_options_table.php index 336490bf248..acddd126964 100644 --- a/database/migrations/2016_06_21_055139_create_poll_options_table.php +++ b/database/migrations/2016_06_21_055139_create_poll_options_table.php @@ -19,9 +19,6 @@ public function up() } Schema::create('phpbb_poll_options', function ($table) { - $table->collation = 'utf8_bin'; - $table->charset = 'utf8'; - $table->tinyInteger('poll_option_id')->default(0); $table->mediumInteger('topic_id')->unsigned()->default(0); $table->text('poll_option_text'); @@ -30,8 +27,6 @@ public function up() $table->index('poll_option_id', 'poll_opt_id'); $table->index('topic_id', 'topic_id'); }); - - DB::statement('ALTER TABLE phpbb_poll_options ROW_FORMAT=DYNAMIC'); } /** diff --git a/database/migrations/2016_06_21_134532_create_banchostats_table.php b/database/migrations/2016_06_21_134532_create_banchostats_table.php index 5555c7edcaf..cf401d4dd78 100644 --- a/database/migrations/2016_06_21_134532_create_banchostats_table.php +++ b/database/migrations/2016_06_21_134532_create_banchostats_table.php @@ -20,9 +20,6 @@ public function up() } Schema::create('osu_banchostats', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->increments('banchostats_id'); $table->smallInteger('users_irc'); $table->smallInteger('users_osu'); diff --git a/database/migrations/2016_07_21_072328_create_artist_tables.php b/database/migrations/2016_07_21_072328_create_artist_tables.php index 4de22d85dae..4a248218218 100644 --- a/database/migrations/2016_07_21_072328_create_artist_tables.php +++ b/database/migrations/2016_07_21_072328_create_artist_tables.php @@ -16,9 +16,6 @@ class CreateArtistTables extends Migration public function up() { Schema::create('labels', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->string('name'); $table->text('description'); @@ -33,9 +30,6 @@ public function up() }); Schema::create('artists', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->string('name'); $table->text('description'); @@ -57,9 +51,6 @@ public function up() }); Schema::create('artist_tracks', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->integer('artist_id')->unsigned()->nullable(); $table->foreign('artist_id') diff --git a/database/migrations/2016_07_29_024320_create_contest_tables.php b/database/migrations/2016_07_29_024320_create_contest_tables.php index 00d81b91cb1..1449fea831f 100644 --- a/database/migrations/2016_07_29_024320_create_contest_tables.php +++ b/database/migrations/2016_07_29_024320_create_contest_tables.php @@ -16,9 +16,6 @@ class CreateContestTables extends Migration public function up() { Schema::create('contests', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->string('name'); $table->text('description'); @@ -32,9 +29,6 @@ public function up() }); Schema::create('contest_entries', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->string('name'); $table->string('masked_name'); @@ -51,9 +45,6 @@ public function up() }); Schema::create('contest_votes', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->integer('contest_id')->unsigned(); diff --git a/database/migrations/2016_08_16_101048_create_sessions_table.php b/database/migrations/2016_08_16_101048_create_sessions_table.php index bbe43561eac..0c150a2687d 100644 --- a/database/migrations/2016_08_16_101048_create_sessions_table.php +++ b/database/migrations/2016_08_16_101048_create_sessions_table.php @@ -19,9 +19,6 @@ public function up() } Schema::create('phpbb_sessions', function ($table) { - $table->collation = 'utf8_bin'; - $table->charset = 'utf8'; - $table->string('session_id', 32)->default(''); $table->mediumInteger('session_user_id')->unsigned()->default(0); $table->integer('session_last_visit')->unsigned()->default(0); @@ -40,8 +37,6 @@ public function up() $table->index(['session_autologin', 'session_time'], 'autologin_time_purge'); $table->index(['session_user_id', 'session_time'], 'session_user_id_time'); }); - - DB::statement('ALTER TABLE phpbb_sessions ROW_FORMAT=DYNAMIC'); } /** diff --git a/database/migrations/2016_09_30_064049_create_user_contest_entries_table.php b/database/migrations/2016_09_30_064049_create_user_contest_entries_table.php index 4b145d8434b..ae88dcb9121 100644 --- a/database/migrations/2016_09_30_064049_create_user_contest_entries_table.php +++ b/database/migrations/2016_09_30_064049_create_user_contest_entries_table.php @@ -16,9 +16,6 @@ class CreateUserContestEntriesTable extends Migration public function up() { Schema::create('user_contest_entries', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->string('original_filename'); diff --git a/database/migrations/2016_12_07_063316_create_artist_albums_table.php b/database/migrations/2016_12_07_063316_create_artist_albums_table.php index 1456860cb76..9a52e4e3af1 100644 --- a/database/migrations/2016_12_07_063316_create_artist_albums_table.php +++ b/database/migrations/2016_12_07_063316_create_artist_albums_table.php @@ -17,9 +17,6 @@ class CreateArtistAlbumsTable extends Migration public function up() { Schema::create('artist_albums', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->increments('id'); $table->integer('artist_id')->unsigned()->nullable(); $table->foreign('artist_id') diff --git a/database/migrations/2017_02_21_084403_mb4_forum_last_topic.php b/database/migrations/2017_02_21_084403_mb4_forum_last_topic.php index cc2ae95d25d..634aad344a4 100644 --- a/database/migrations/2017_02_21_084403_mb4_forum_last_topic.php +++ b/database/migrations/2017_02_21_084403_mb4_forum_last_topic.php @@ -14,13 +14,14 @@ class Mb4ForumLastTopic extends Migration */ public function up() { - DB::statement(" - ALTER TABLE phpbb_forums MODIFY forum_last_post_subject - VARCHAR(100) - NOT NULL - DEFAULT '' - COLLATE 'utf8mb4_bin' - "); + // Not relevant anymore + // DB::statement(" + // ALTER TABLE phpbb_forums MODIFY forum_last_post_subject + // VARCHAR(100) + // NOT NULL + // DEFAULT '' + // COLLATE 'utf8mb4_bin' + // "); } /** @@ -30,12 +31,12 @@ public function up() */ public function down() { - DB::statement(" - ALTER TABLE phpbb_forums MODIFY forum_last_post_subject - VARCHAR(100) - NOT NULL - DEFAULT '' - COLLATE 'utf8_bin' - "); + // DB::statement(" + // ALTER TABLE phpbb_forums MODIFY forum_last_post_subject + // VARCHAR(100) + // NOT NULL + // DEFAULT '' + // COLLATE 'utf8_bin' + // "); } } diff --git a/database/migrations/2017_07_20_013337_create_osu_beatmappacks_table.php b/database/migrations/2017_07_20_013337_create_osu_beatmappacks_table.php index c352e89462a..573a159dca5 100644 --- a/database/migrations/2017_07_20_013337_create_osu_beatmappacks_table.php +++ b/database/migrations/2017_07_20_013337_create_osu_beatmappacks_table.php @@ -21,9 +21,6 @@ public function up() } Schema::create('osu_beatmappacks', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->smallInteger('pack_id', true); $table->string('url', 1024); $table->string('name', 255); diff --git a/database/migrations/2017_07_20_013338_create_osu_beatmappacks_items_table.php b/database/migrations/2017_07_20_013338_create_osu_beatmappacks_items_table.php index 66c934346f5..c7710f69515 100644 --- a/database/migrations/2017_07_20_013338_create_osu_beatmappacks_items_table.php +++ b/database/migrations/2017_07_20_013338_create_osu_beatmappacks_items_table.php @@ -21,9 +21,6 @@ public function up() } Schema::create('osu_beatmappacks_items', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - $table->unsignedMediumInteger('item_id', true); $table->unsignedSmallInteger('pack_id'); $table->unsignedMediumInteger('beatmapset_id'); diff --git a/database/migrations/2017_09_01_101541_create_osu_profile_banners.php b/database/migrations/2017_09_01_101541_create_osu_profile_banners.php index c12e30e178a..aa14ac8940a 100644 --- a/database/migrations/2017_09_01_101541_create_osu_profile_banners.php +++ b/database/migrations/2017_09_01_101541_create_osu_profile_banners.php @@ -21,9 +21,6 @@ public function up() } Schema::create('osu_profile_banners', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->unsignedMediumInteger('banner_id', true); $table->unsignedInteger('user_id'); $table->integer('tournament_id'); diff --git a/database/migrations/2017_09_12_065003_fix_logs_table_encoding.php b/database/migrations/2017_09_12_065003_fix_logs_table_encoding.php index 0272434b718..3f018b0857e 100644 --- a/database/migrations/2017_09_12_065003_fix_logs_table_encoding.php +++ b/database/migrations/2017_09_12_065003_fix_logs_table_encoding.php @@ -14,7 +14,8 @@ class FixLogsTableEncoding extends Migration */ public function up() { - DB::statement("ALTER TABLE phpbb_log MODIFY log_data MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_bin'"); + // Not relevant anymore + // DB::statement("ALTER TABLE phpbb_log MODIFY log_data MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_bin'"); } /** @@ -24,6 +25,6 @@ public function up() */ public function down() { - DB::statement("ALTER TABLE phpbb_log MODIFY log_data MEDIUMTEXT NOT NULL COLLATE 'utf8_bin'"); + // DB::statement("ALTER TABLE phpbb_log MODIFY log_data MEDIUMTEXT NOT NULL COLLATE 'utf8_bin'"); } } diff --git a/database/migrations/2017_10_10_082642_add_ip_bans.php b/database/migrations/2017_10_10_082642_add_ip_bans.php index 4d6bcdb5547..7cc36c4104c 100644 --- a/database/migrations/2017_10_10_082642_add_ip_bans.php +++ b/database/migrations/2017_10_10_082642_add_ip_bans.php @@ -20,11 +20,7 @@ public function up() } Schema::create('osu_ip_bans', function ($table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_general_ci'; - - $column = $table->string('ip', 40)->primary()->default(''); - $column->collation = 'utf8_bin'; + $table->string('ip', 40)->primary()->default(''); $table->unsignedMediumInteger('user_id')->nullable(); $table->timestamp('timestamp')->default(DB::raw('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')); $table->integer('length')->default(72 * 3600); @@ -33,8 +29,6 @@ public function up() $table->index('user_id', 'user_id'); $table->index(['active', 'timestamp'], 'active'); }); - - DB::statement('ALTER TABLE osu_ip_bans ROW_FORMAT=DYNAMIC'); } /** diff --git a/database/migrations/2017_11_27_064736_fix_user_sig_encoding.php b/database/migrations/2017_11_27_064736_fix_user_sig_encoding.php index 609def28c47..69c43fdf387 100644 --- a/database/migrations/2017_11_27_064736_fix_user_sig_encoding.php +++ b/database/migrations/2017_11_27_064736_fix_user_sig_encoding.php @@ -14,7 +14,8 @@ class FixUserSigEncoding extends Migration */ public function up() { - DB::statement("ALTER TABLE phpbb_users MODIFY user_sig MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_bin'"); + // Not relevant anymore + // DB::statement("ALTER TABLE phpbb_users MODIFY user_sig MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_bin'"); } /** @@ -24,6 +25,6 @@ public function up() */ public function down() { - DB::statement("ALTER TABLE phpbb_users MODIFY user_sig MEDIUMTEXT NOT NULL COLLATE 'utf8_bin'"); + // DB::statement("ALTER TABLE phpbb_users MODIFY user_sig MEDIUMTEXT NOT NULL COLLATE 'utf8_bin'"); } } diff --git a/database/migrations/2020_09_25_092826_create_phpbb_banlist.php b/database/migrations/2020_09_25_092826_create_phpbb_banlist.php index 198ebfe22be..4334e1df1d4 100644 --- a/database/migrations/2020_09_25_092826_create_phpbb_banlist.php +++ b/database/migrations/2020_09_25_092826_create_phpbb_banlist.php @@ -21,9 +21,6 @@ public function up() } Schema::create('phpbb_banlist', function (Blueprint $table) { - $table->charset = 'utf8'; - $table->collation = 'utf8_bin'; - $table->mediumIncrements('ban_id'); $table->unsignedMediumInteger('ban_userid')->default(0); $table->string('ban_ip', 40)->default(''); @@ -39,8 +36,6 @@ public function up() $table->index(['ban_email', 'ban_exclude'], 'ban_email'); $table->index(['ban_ip', 'ban_exclude'], 'ban_ip'); }); - - DB::statement('ALTER TABLE `phpbb_banlist` ROW_FORMAT=DYNAMIC;'); } /** @@ -50,6 +45,6 @@ public function up() */ public function down() { - // no going back =) + Schema::drop('phpbb_banlist'); } } diff --git a/database/migrations/2022_10_18_103120_create_osu_user_performance_rank_highest.php b/database/migrations/2022_10_18_103120_create_osu_user_performance_rank_highest.php index df2b0e91c9b..04c89245202 100644 --- a/database/migrations/2022_10_18_103120_create_osu_user_performance_rank_highest.php +++ b/database/migrations/2022_10_18_103120_create_osu_user_performance_rank_highest.php @@ -18,9 +18,6 @@ class CreateOsuUserPerformanceRankHighest extends Migration public function up() { Schema::create('osu_user_performance_rank_highest', function (Blueprint $table) { - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_general_ci'; - $table->unsignedInteger('user_id'); $table->tinyInteger('mode'); $table->integer('rank')->default(0); @@ -30,7 +27,6 @@ public function up() }); DB::statement(' ALTER TABLE `osu_user_performance_rank_highest` - ROW_FORMAT=DYNAMIC PARTITION BY RANGE (`mode`) ( PARTITION p0 VALUES LESS THAN (1), PARTITION p1 VALUES LESS THAN (2), From 53d4f4f4d7147ee67257f38ba78ce4ab5685535b Mon Sep 17 00:00:00 2001 From: Sam Verhaegen Date: Mon, 13 Nov 2023 12:11:40 +0200 Subject: [PATCH 408/470] blade cleanup --- resources/lang/hu/notifications.php | 2 +- .../views/accounts/_edit_country.blade.php | 13 +++++------ .../views/accounts/_edit_email.blade.php | 7 +++--- resources/views/home/download.blade.php | 23 +++++++++++-------- resources/views/master.blade.php | 7 +++--- .../objects/search/_forum_post.blade.php | 9 +++----- resources/views/packs/raw.blade.php | 2 +- .../views/password_reset/index.blade.php | 13 +++++++---- resources/views/store/checkout/show.blade.php | 2 +- .../views/store/orders/_details.blade.php | 4 ++-- resources/views/users/create.blade.php | 11 ++++----- resources/views/users/disabled.blade.php | 20 ++++++++-------- 12 files changed, 58 insertions(+), 55 deletions(-) diff --git a/resources/lang/hu/notifications.php b/resources/lang/hu/notifications.php index 3c03540338c..84cce9b510c 100644 --- a/resources/lang/hu/notifications.php +++ b/resources/lang/hu/notifications.php @@ -51,7 +51,7 @@ 'beatmapset_discussion_post_new_empty' => 'Új poszt a ":title"-on :username:-tol', 'beatmapset_discussion_post_new_compact' => 'Új hozzászólás :username által: ":content"', 'beatmapset_discussion_post_new_compact_empty' => 'Új poszt :username által', - 'beatmapset_discussion_review_new' => 'Új hozzászolás problémákat tartalmazó tartalomról :username által, ezen a beatmapen: ":title" + 'beatmapset_discussion_review_new' => 'Új hozzászolás problémákat tartalmazó tartalomról :username által, ezen a beatmapen: ":title" :problems, javaslat :suggestions, dícséret: :praises', 'beatmapset_discussion_review_new_compact' => 'Új hozzászolás problémákat tartalmazó tartalomról :username által: :problems, javaslat :suggestions, dícséret: :praises', 'beatmapset_discussion_unlock' => 'A beszélgetést feloldották ezen: ":title"', diff --git a/resources/views/accounts/_edit_country.blade.php b/resources/views/accounts/_edit_country.blade.php index 17557898548..46710411fd7 100644 --- a/resources/views/accounts/_edit_country.blade.php +++ b/resources/views/accounts/_edit_country.blade.php @@ -24,17 +24,16 @@ @if ($countryChangeTarget !== null)

    {!! osu_trans('accounts.edit.profile.country_change._', [ - 'update_link' => tag( - 'a', + 'update_link' => link_to( + route('account.country', ['country_acronym' => $countryChangeTarget]), + osu_trans('accounts.edit.profile.country_change.update_link', [ + 'country' => app('countries')->byCode($code)->name, + ]), [ 'data-confirm' => osu_trans('common.confirmation'), 'data-method' => 'PUT', 'data-remote' => '1', - 'href' => route('account.country', ['country_acronym' => $countryChangeTarget]), - ], - osu_trans('accounts.edit.profile.country_change.update_link', [ - 'country' => Country::find($countryChangeTarget)->name, - ]), + ] ), ]) !!}

    diff --git a/resources/views/accounts/_edit_email.blade.php b/resources/views/accounts/_edit_email.blade.php index 53e00448206..a6efddaeed5 100644 --- a/resources/views/accounts/_edit_email.blade.php +++ b/resources/views/accounts/_edit_email.blade.php @@ -20,9 +20,10 @@ diff --git a/resources/views/home/download.blade.php b/resources/views/home/download.blade.php index 5bf4ce2b985..cc60e7ca405 100644 --- a/resources/views/home/download.blade.php +++ b/resources/views/home/download.blade.php @@ -112,7 +112,7 @@ class="btn-osu-big btn-osu-big--download btn-osu-big--download-lazer"
    {!! osu_trans('home.download.steps.beatmaps.description._', [ - 'browse' => tag( + 'browse' => link_to( 'a', ['href' => route('beatmapsets.index')], osu_trans('home.download.steps.beatmaps.description.browse') @@ -125,14 +125,19 @@ class="btn-osu-big btn-osu-big--download btn-osu-big--download-lazer" @if (config('services.enchant.id') !== null)
    {!! osu_trans('home.download.help._', [ - 'support_button' => tag('a', [ - 'class' => 'js-enchant--show', - 'role' => 'button', - 'href' => '#', - ], osu_trans('home.download.help.support_button')), - 'help_forum_link' => tag('a', [ - 'href' => route('forum.forums.show', ['forum' => config('osu.forum.help_forum_id')]), - ], osu_trans('home.download.help.help_forum_link')), + 'support_button' => link_to( + '#', + osu_trans('home.download.help.support_button'), + [ + 'class' => 'js-enchant--show', + 'role' => 'button', + 'href' => '#', + ], + ), + 'help_forum_link' => link_to( + route('forum.forums.show', ['forum' => config('osu.forum.help_forum_id')]), + osu_trans('home.download.help.help_forum_link') + ) ]) !!}
    diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index b7f4df18910..d27b7e3cd4c 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -70,10 +70,9 @@ class=" 'type' => 'alert', 'title' => osu_trans('users.restricted_banner.title'), 'message' => osu_trans('users.restricted_banner.message', [ - 'link' => tag( - 'a', - ['href' => config('osu.urls.user.restriction')], - osu_trans('users.restricted_banner.message_link'), + 'link' => link_to( + config('osu.urls.user.restriction'), + osu_trans('users.restricted_banner.message_link') ), ]), ]) diff --git a/resources/views/objects/search/_forum_post.blade.php b/resources/views/objects/search/_forum_post.blade.php index 9575f772352..1e43e1ad993 100644 --- a/resources/views/objects/search/_forum_post.blade.php +++ b/resources/views/objects/search/_forum_post.blade.php @@ -33,13 +33,10 @@ 'forum.post.posted_by_in', [ 'username' => link_to_user($user, null, null, ['search-forum-post__sub-link']), - 'forum' => tag( - 'a', - [ - 'href' => route('forum.forums.show', ['forum' => $topic->forum_id]), - 'class' => 'search-forum-post__sub-link', - ], + 'forum' => link_to( + route('forum.forums.show', ['forum' => $topic->forum_id]), $topic->forum->forum_name, + ['class' => 'search-forum-post__sub-link'] ), ], ) !!} diff --git a/resources/views/packs/raw.blade.php b/resources/views/packs/raw.blade.php index 0b0c25acaab..c0112eaad8d 100644 --- a/resources/views/packs/raw.blade.php +++ b/resources/views/packs/raw.blade.php @@ -23,7 +23,7 @@ class="beatmap-pack-download__link" @if ($pack->no_diff_reduction)
    {!! osu_trans('beatmappacks.show.no_diff_reduction._', [ - 'link' => tag('a', ['href' => wiki_url('Game_modifier')], osu_trans('beatmappacks.show.no_diff_reduction.link')), + 'link' => link_to(wiki_url('Game_modifier'), osu_trans('beatmappacks.show.no_diff_reduction.link')), ]) !!}
    @endif diff --git a/resources/views/password_reset/index.blade.php b/resources/views/password_reset/index.blade.php index 12f821a51b0..5aca008596b 100644 --- a/resources/views/password_reset/index.blade.php +++ b/resources/views/password_reset/index.blade.php @@ -33,11 +33,14 @@ @if (config('services.enchant.id') !== null)
    - {!! osu_trans('password_reset.starting.support._', ['button' => tag('a', [ - 'class' => 'js-enchant--show', - 'role' => 'button', - 'href' => '#', - ], osu_trans('password_reset.starting.support.button'))]) !!} + {!! osu_trans('password_reset.starting.support._', ['button' => link_to( + '#', + osu_trans('password_reset.starting.support.button'), + [ + 'class' => 'js-enchant--show', + 'role' => 'button', + ] + )]) !!}
    @include('objects._enchant') diff --git a/resources/views/store/checkout/show.blade.php b/resources/views/store/checkout/show.blade.php index d797be2ca6b..72f7e70f6c4 100644 --- a/resources/views/store/checkout/show.blade.php +++ b/resources/views/store/checkout/show.blade.php @@ -48,7 +48,7 @@

    total

    -

    {{{ currency($order->getTotal()) }}}

    +

    {{ currency($order->getTotal()) }}

    diff --git a/resources/views/store/orders/_details.blade.php b/resources/views/store/orders/_details.blade.php index ae891facac9..2bc32b0d4c4 100644 --- a/resources/views/store/orders/_details.blade.php +++ b/resources/views/store/orders/_details.blade.php @@ -32,7 +32,7 @@ @if($order->address !== null)
    -

    Sent Via:

    +

    {{ osu_trans('store.invoice.sent_via') }}

    osu!store @@ -40,7 +40,7 @@
    -

    Shipping To:

    +

    {{ osu_trans('store.invoice.shipping_to') }}

    @include('store.objects.address', ['data' => $order->address])
    diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index b20d118b389..6bcf2ab16ea 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -123,13 +123,10 @@ class="btn-osu-big btn-osu-big--rounded-thin js-captcha--submit-button"

    {!! osu_trans('users.create.form.tos_notice._', [ - 'link' => tag( - 'a', - [ - 'href' => route('legal', ['locale' => app()->getLocale(), 'path' => 'Terms']), - 'target' => '_blank', - ], - osu_trans('users.create.form.tos_notice.link') + 'link' => link_to( + route('legal', ['locale' => app()->getLocale(), 'path' => 'Terms']), + osu_trans('users.create.form.tos_notice.link'), + ['target' => '_blank'] ), ]) !!}

    diff --git a/resources/views/users/disabled.blade.php b/resources/views/users/disabled.blade.php index 04121246de6..fa29755b226 100644 --- a/resources/views/users/disabled.blade.php +++ b/resources/views/users/disabled.blade.php @@ -17,12 +17,14 @@
    • {!! osu_trans('users.disabled.reasons.tos._', [ - 'community_rules' => tag('a', [ - 'href' => osu_url('user.rules'), - ], osu_trans('users.disabled.reasons.tos.community_rules')), - 'tos' => tag('a', [ - 'href' => route('legal', ['locale' => app()->getLocale(), 'path' => 'terms']), - ], osu_trans('users.disabled.reasons.tos.tos')), + 'community_rules' => link_to( + osu_url('user.rules'), + osu_trans('users.disabled.reasons.tos.community_rules') + ), + 'tos' => link_to( + route('legal', ['locale' => app()->getLocale(), 'path' => 'terms']), + osu_trans('users.disabled.reasons.tos.tos') + ), ]) !!}
    • @@ -36,9 +38,9 @@

      {!! osu_trans('users.disabled.if_mistake._', [ - 'email' => tag('a', [ - 'href' => 'mailto:'.config('osu.emails.account') - ], osu_trans('users.disabled.if_mistake.email')), + 'email' => link_to( + 'mailto:'.config('osu.emails.account'), + osu_trans('users.disabled.if_mistake.email')) ]) !!}

      From 648cd956195ed3c4c9d92eee1ab17092c5b27f95 Mon Sep 17 00:00:00 2001 From: Sam Verhaegen Date: Mon, 13 Nov 2023 12:17:07 +0200 Subject: [PATCH 409/470] fix link --- resources/views/home/download.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/home/download.blade.php b/resources/views/home/download.blade.php index cc60e7ca405..e67ffafbeda 100644 --- a/resources/views/home/download.blade.php +++ b/resources/views/home/download.blade.php @@ -113,8 +113,7 @@ class="btn-osu-big btn-osu-big--download btn-osu-big--download-lazer"
      {!! osu_trans('home.download.steps.beatmaps.description._', [ 'browse' => link_to( - 'a', - ['href' => route('beatmapsets.index')], + route('beatmapsets.index'), osu_trans('home.download.steps.beatmaps.description.browse') ) ]) !!} From 79e492ea54219a784b60998f60789f3025875666 Mon Sep 17 00:00:00 2001 From: Sam Verhaegen Date: Mon, 13 Nov 2023 12:20:29 +0200 Subject: [PATCH 410/470] fix link --- resources/views/home/download.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/home/download.blade.php b/resources/views/home/download.blade.php index e67ffafbeda..af85789c086 100644 --- a/resources/views/home/download.blade.php +++ b/resources/views/home/download.blade.php @@ -130,7 +130,6 @@ class="btn-osu-big btn-osu-big--download btn-osu-big--download-lazer" [ 'class' => 'js-enchant--show', 'role' => 'button', - 'href' => '#', ], ), 'help_forum_link' => link_to( From a3b9d752058d716d827a8d414e0db118037ba487 Mon Sep 17 00:00:00 2001 From: Sam Verhaegen Date: Mon, 13 Nov 2023 12:25:43 +0200 Subject: [PATCH 411/470] fix variable name --- resources/views/accounts/_edit_country.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/accounts/_edit_country.blade.php b/resources/views/accounts/_edit_country.blade.php index 46710411fd7..abd49a392d7 100644 --- a/resources/views/accounts/_edit_country.blade.php +++ b/resources/views/accounts/_edit_country.blade.php @@ -27,7 +27,7 @@ 'update_link' => link_to( route('account.country', ['country_acronym' => $countryChangeTarget]), osu_trans('accounts.edit.profile.country_change.update_link', [ - 'country' => app('countries')->byCode($code)->name, + 'country' => app('countries')->byCode($countryChangeTarget)->name, ]), [ 'data-confirm' => osu_trans('common.confirmation'), From d7d0b6d7ac63c17be23f3759b9e3de0316e0044d Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 13 Nov 2023 20:53:27 +0900 Subject: [PATCH 412/470] Improve wording on review notifications --- resources/js/notification-maps/message.ts | 36 +++++++++++++++++------ resources/lang/en/notifications.php | 10 +++++-- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/resources/js/notification-maps/message.ts b/resources/js/notification-maps/message.ts index 9963f45b039..e3ead587a18 100644 --- a/resources/js/notification-maps/message.ts +++ b/resources/js/notification-maps/message.ts @@ -1,12 +1,34 @@ // Copyright (c) ppy Pty Ltd . Licensed under the GNU Affero General Public License v3.0. // See the LICENCE file in the repository root for full licence text. -import * as _ from 'lodash'; import Notification from 'models/notification'; +import NotificationDetails from 'models/notification-details'; import { isBeatmapOwnerChangeNotification } from 'models/notification/beatmap-owner-change-notification'; -import { trans, transExists } from 'utils/lang'; - -type Replacements = { title: string } & Partial>; +import { trans, transArray, transChoice, transExists } from 'utils/lang'; + +type Replacements = { title: string } & Partial>; + +function formatBeatmapsetReviewCounts(counts: NonNullable, replacements: Replacements) { + const translatedCounts = []; + for (const type of ['praises', 'problems', 'suggestions'] as const) { + const count = counts[type]; + if (count > 0) { + translatedCounts.push(transChoice( + `notifications.item.beatmapset.beatmapset_discussion.review_count.${type}`, + count, + )); + } + // TODO: remove after all translations are updated to use the :review_counts + replacements[type] = count; + } + if (translatedCounts.length === 0) { + translatedCounts.push(transChoice( + 'notifications.item.beatmapset.beatmapset_discussion.review_count.problems', + 0, + )); + } + replacements.review_counts = transArray(translatedCounts); +} export function formatMessage(item: Notification, compact = false) { const replacements: Replacements = { @@ -20,11 +42,7 @@ export function formatMessage(item: Notification, compact = false) { } if (item.name === 'beatmapset_discussion_review_new' && item.details.embeds != null) { - _.merge(replacements, { - praises: item.details.embeds.praises, - problems: item.details.embeds.problems, - suggestions: item.details.embeds.suggestions, - }); + formatBeatmapsetReviewCounts(item.details.embeds, replacements); } let key = `notifications.item.${item.displayType}.${item.category}`; diff --git a/resources/lang/en/notifications.php b/resources/lang/en/notifications.php index 1a77c225616..a99a7646ed9 100644 --- a/resources/lang/en/notifications.php +++ b/resources/lang/en/notifications.php @@ -51,10 +51,16 @@ 'beatmapset_discussion_post_new_empty' => 'New post on ":title" by :username', 'beatmapset_discussion_post_new_compact' => 'New post by :username: ":content"', 'beatmapset_discussion_post_new_compact_empty' => 'New post by :username', - 'beatmapset_discussion_review_new' => 'New review on ":title" by :username containing problems: :problems, suggestions: :suggestions, praises: :praises', - 'beatmapset_discussion_review_new_compact' => 'New review by :username containing problems: :problems, suggestions: :suggestions, praises: :praises', + 'beatmapset_discussion_review_new' => 'New review on ":title" by :username containing :review_counts', + 'beatmapset_discussion_review_new_compact' => 'New review by :username containing :review_counts', 'beatmapset_discussion_unlock' => 'Discussion on ":title" has been unlocked', 'beatmapset_discussion_unlock_compact' => 'Discussion was unlocked', + + 'review_count' => [ + 'praises' => ':count_delimited praise|:count_delimited praises', + 'problems' => ':count_delimited problem|:count_delimited problems', + 'suggestions' => ':count_delimited suggestion|:count_delimited suggestions', + ], ], 'beatmapset_problem' => [ From aa2739b2a970386526c797c606e16f9f9b8a78b2 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Mon, 13 Nov 2023 21:29:08 +0900 Subject: [PATCH 413/470] fix error message position not wrapping --- resources/css/bem/account-edit-entry.less | 8 ++++---- resources/views/accounts/_edit_country.blade.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/css/bem/account-edit-entry.less b/resources/css/bem/account-edit-entry.less index 0767c63d6b7..3260c52791c 100644 --- a/resources/css/bem/account-edit-entry.less +++ b/resources/css/bem/account-edit-entry.less @@ -17,10 +17,6 @@ align-items: center; flex-wrap: wrap; - @media @desktop { - flex-wrap: nowrap; - } - &--block { display: block; @@ -197,6 +193,10 @@ grid-gap: 5px; } + &__group { + flex: 1; + } + &__input { .reset-input(); .default-border-radius(); diff --git a/resources/views/accounts/_edit_country.blade.php b/resources/views/accounts/_edit_country.blade.php index abd49a392d7..f96a50b32ba 100644 --- a/resources/views/accounts/_edit_country.blade.php +++ b/resources/views/accounts/_edit_country.blade.php @@ -12,7 +12,7 @@ -
      +