From 2511bfffc0c190cc2355bf07022cdb42f0d6539a Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 12 Nov 2024 20:27:40 +0900 Subject: [PATCH 01/44] Typescript PostPreview --- .../js/{core-legacy/post-preview.coffee => core/post-preview.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/js/{core-legacy/post-preview.coffee => core/post-preview.ts} (100%) diff --git a/resources/js/core-legacy/post-preview.coffee b/resources/js/core/post-preview.ts similarity index 100% rename from resources/js/core-legacy/post-preview.coffee rename to resources/js/core/post-preview.ts From e72b7ee19890cc1375aff8d756ddaaef57582fcc Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 12 Nov 2024 21:28:59 +0900 Subject: [PATCH 02/44] Typescript PostPreview (actual) --- resources/js/core/post-preview.ts | 97 ++++++++++++++++++------------ resources/js/forum/post-box.coffee | 6 +- resources/js/main.coffee | 2 - resources/js/osu-core.ts | 3 + 4 files changed, 63 insertions(+), 45 deletions(-) diff --git a/resources/js/core/post-preview.ts b/resources/js/core/post-preview.ts index a9fef6e94db..45198399708 100644 --- a/resources/js/core/post-preview.ts +++ b/resources/js/core/post-preview.ts @@ -1,39 +1,58 @@ -# 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 { route } from 'laroute' - -export default class PostPreview - constructor: -> - @debouncedLoadPreview = _.debounce @loadPreview, 500 - - $(document).on 'input', '.js-post-preview--auto', (e) => - # get the target immediately because event object may change later. - @debouncedLoadPreview(e.currentTarget) - - - loadPreview: (target) => - $form = $(target).closest('form') - body = target.value - $preview = $form.find('.js-post-preview--preview') - preview = $preview[0] - $previewBox = $form.find('.js-post-preview--box') - - if !preview? - return - - preview._xhr?.abort() - - if body == '' - $previewBox.addClass 'hidden' - return - - if $preview.attr('data-raw') == body - $previewBox.removeClass 'hidden' - return - - preview._xhr = $.post(route('bbcode-preview'), text: body) - .done (data) => - $preview.html data - $preview.attr 'data-raw', body - $previewBox.removeClass 'hidden' +// 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 { route } from 'laroute'; +import { debounce } from 'lodash'; +import { fail } from 'utils/fail'; +import { htmlElementOrNull } from 'utils/html'; + +export default class PostPreview { + private readonly debouncedLoadPreview; + private readonly xhr = new Map>(); + + constructor() { + this.debouncedLoadPreview = debounce(this.loadPreview, 500); + document.addEventListener('input', this.onInput); + } + + private readonly loadPreview = (target: HTMLTextAreaElement) => { + const form = target.closest('form') ?? fail('form element is missing'); + const body = target.value; + const preview = htmlElementOrNull(form.querySelector('.js-post-preview--preview')); + const previewBox = form.querySelector('.js-post-preview--box'); + + if (preview == null) { + return; + } + + this.xhr.get(preview)?.abort(); + + if (body === '') { + previewBox?.classList.add('hidden'); + preview.innerHTML = ''; + return; + } + + if (preview.dataset.raw === body) { + previewBox?.classList.remove('hidden'); + return; + } + + const xhr = $.post(route('bbcode-preview'), { text: body }) as JQuery.jqXHR; + xhr.done((data) => { + preview.innerHTML = data; + preview.dataset.raw = body; + previewBox?.classList.remove('hidden'); + }).always(() => { + this.xhr.delete(preview); + }); + }; + + private readonly onInput = (e: InputEvent) => { + const target = htmlElementOrNull(e.target)?.closest('.js-post-preview--auto'); + + if (target instanceof HTMLTextAreaElement) { + this.debouncedLoadPreview(target); + } + }; +} diff --git a/resources/js/forum/post-box.coffee b/resources/js/forum/post-box.coffee index 1e22449b25d..78707ae1cf1 100644 --- a/resources/js/forum/post-box.coffee +++ b/resources/js/forum/post-box.coffee @@ -25,10 +25,8 @@ insert = (event, tagOpen, tagClose = '') -> box.selectionStart = startPos box.selectionEnd = texts[0].length + texts[1].length + tagClose.length - $box - .trigger 'bbcode:inserted' # for react - .trigger 'input' # ignored by react - .focus() + box.dispatchEvent(new InputEvent('input', { bubbles: true })) + box.focus() [ ['bold', '[b]', '[/b]'] diff --git a/resources/js/main.coffee b/resources/js/main.coffee index 964ae4ebd66..5e49fc5bb2d 100644 --- a/resources/js/main.coffee +++ b/resources/js/main.coffee @@ -24,7 +24,6 @@ import LandingGraph from 'core-legacy/landing-graph' import Menu from 'core-legacy/menu' import NavButton from 'core-legacy/nav-button' import Nav2 from 'core-legacy/nav2' -import PostPreview from 'core-legacy/post-preview' import Search from 'core-legacy/search' import { StoreCheckout } from 'core-legacy/store-checkout' import TooltipDefault from 'core-legacy/tooltip-default' @@ -60,7 +59,6 @@ window.globalDrag ?= new GlobalDrag window.landingGraph ?= new LandingGraph window.menu ?= new Menu window.navButton ?= new NavButton -window.postPreview ?= new PostPreview window.search ?= new Search window.tooltipDefault ?= new TooltipDefault diff --git a/resources/js/osu-core.ts b/resources/js/osu-core.ts index 3f1329e9fd9..a96a8650df3 100644 --- a/resources/js/osu-core.ts +++ b/resources/js/osu-core.ts @@ -19,6 +19,7 @@ import ForumPostReport from 'core/forum/forum-post-report'; import Localtime from 'core/localtime'; import MobileToggle from 'core/mobile-toggle'; import OsuAudio from 'core/osu-audio/main'; +import PostPreview from 'core/post-preview'; import ReactTurbolinks from 'core/react-turbolinks'; import Spoilerbox from 'core/spoilerbox'; import StickyFooter from 'core/sticky-footer'; @@ -68,6 +69,7 @@ export default class OsuCore { readonly mobileToggle; readonly notificationsWorker; readonly osuAudio; + readonly postPreview; readonly reactTurbolinks; readonly referenceLinkTooltip; readonly scorePins; @@ -114,6 +116,7 @@ export default class OsuCore { this.localtime = new Localtime(); this.mobileToggle = new MobileToggle(); this.browserTitleWithNotificationCount = new BrowserTitleWithNotificationCount(this); + this.postPreview = new PostPreview(); this.referenceLinkTooltip = new ReferenceLinkTooltip(); this.scorePins = new ScorePins(); this.spoilerbox = new Spoilerbox(); From 3dd58f165e79d600ac56223c7703670735bea261 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 12 Nov 2024 21:36:23 +0900 Subject: [PATCH 03/44] Better name --- resources/js/core/{post-preview.ts => bbcode-auto-preview.ts} | 2 +- resources/js/osu-core.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename resources/js/core/{post-preview.ts => bbcode-auto-preview.ts} (97%) diff --git a/resources/js/core/post-preview.ts b/resources/js/core/bbcode-auto-preview.ts similarity index 97% rename from resources/js/core/post-preview.ts rename to resources/js/core/bbcode-auto-preview.ts index 45198399708..b816f7cacf9 100644 --- a/resources/js/core/post-preview.ts +++ b/resources/js/core/bbcode-auto-preview.ts @@ -6,7 +6,7 @@ import { debounce } from 'lodash'; import { fail } from 'utils/fail'; import { htmlElementOrNull } from 'utils/html'; -export default class PostPreview { +export default class BbcodeAutoPreview { private readonly debouncedLoadPreview; private readonly xhr = new Map>(); diff --git a/resources/js/osu-core.ts b/resources/js/osu-core.ts index a96a8650df3..1e81caddd44 100644 --- a/resources/js/osu-core.ts +++ b/resources/js/osu-core.ts @@ -7,6 +7,7 @@ import AccountEdit from 'core/account-edit'; import AccountEditAvatar from 'core/account-edit-avatar'; import AccountEditBlocklist from 'core/account-edit-blocklist'; import AnimateNav from 'core/animate-nav'; +import BbcodeAutoPreview from 'core/bbcode-auto-preview'; import BrowserTitleWithNotificationCount from 'core/browser-title-with-notification-count'; import Captcha from 'core/captcha'; import ClickMenu from 'core/click-menu'; @@ -19,7 +20,6 @@ import ForumPostReport from 'core/forum/forum-post-report'; import Localtime from 'core/localtime'; import MobileToggle from 'core/mobile-toggle'; import OsuAudio from 'core/osu-audio/main'; -import PostPreview from 'core/post-preview'; import ReactTurbolinks from 'core/react-turbolinks'; import Spoilerbox from 'core/spoilerbox'; import StickyFooter from 'core/sticky-footer'; @@ -104,6 +104,7 @@ export default class OsuCore { $.subscribe('user:update', this.onCurrentUserUpdate); this.animateNav = new AnimateNav(); + this.bbcodeAutoPreview = new BbcodeAutoPreview(); this.captcha = new Captcha(); this.chatWorker = new ChatWorker(); this.clickMenu = new ClickMenu(); @@ -116,7 +117,6 @@ export default class OsuCore { this.localtime = new Localtime(); this.mobileToggle = new MobileToggle(); this.browserTitleWithNotificationCount = new BrowserTitleWithNotificationCount(this); - this.postPreview = new PostPreview(); this.referenceLinkTooltip = new ReferenceLinkTooltip(); this.scorePins = new ScorePins(); this.spoilerbox = new Spoilerbox(); From 6493ccdf1529ee38a27421dc6f7766cd959b69b6 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 12 Nov 2024 21:40:20 +0900 Subject: [PATCH 04/44] Also reset raw bbcode cache when emptying --- resources/js/core/bbcode-auto-preview.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/js/core/bbcode-auto-preview.ts b/resources/js/core/bbcode-auto-preview.ts index b816f7cacf9..cf76f73b35a 100644 --- a/resources/js/core/bbcode-auto-preview.ts +++ b/resources/js/core/bbcode-auto-preview.ts @@ -28,8 +28,9 @@ export default class BbcodeAutoPreview { this.xhr.get(preview)?.abort(); if (body === '') { - previewBox?.classList.add('hidden'); + preview.dataset.raw = ''; preview.innerHTML = ''; + previewBox?.classList.add('hidden'); return; } @@ -40,8 +41,8 @@ export default class BbcodeAutoPreview { const xhr = $.post(route('bbcode-preview'), { text: body }) as JQuery.jqXHR; xhr.done((data) => { - preview.innerHTML = data; preview.dataset.raw = body; + preview.innerHTML = data; previewBox?.classList.remove('hidden'); }).always(() => { this.xhr.delete(preview); From 8181fec53900730e477a1d254b24b10362305041 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 12 Nov 2024 21:43:28 +0900 Subject: [PATCH 05/44] More coffee --- resources/js/forum/post-box.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/forum/post-box.coffee b/resources/js/forum/post-box.coffee index 78707ae1cf1..f99d5afffaf 100644 --- a/resources/js/forum/post-box.coffee +++ b/resources/js/forum/post-box.coffee @@ -25,7 +25,7 @@ insert = (event, tagOpen, tagClose = '') -> box.selectionStart = startPos box.selectionEnd = texts[0].length + texts[1].length + tagClose.length - box.dispatchEvent(new InputEvent('input', { bubbles: true })) + box.dispatchEvent(new InputEvent('input', bubbles: true)) box.focus() [ From ffa709bbcedc597e5006d34f37cf42587ee42949 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 12 Nov 2024 21:45:14 +0900 Subject: [PATCH 06/44] Forgot another rename --- resources/js/osu-core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/osu-core.ts b/resources/js/osu-core.ts index 1e81caddd44..fab7aafc277 100644 --- a/resources/js/osu-core.ts +++ b/resources/js/osu-core.ts @@ -50,6 +50,7 @@ export default class OsuCore { readonly accountEditAvatar; readonly accountEditBlocklist; readonly animateNav; + readonly bbcodeAutoPreview; readonly beatmapsetSearchController; readonly browserTitleWithNotificationCount; readonly captcha; @@ -69,7 +70,6 @@ export default class OsuCore { readonly mobileToggle; readonly notificationsWorker; readonly osuAudio; - readonly postPreview; readonly reactTurbolinks; readonly referenceLinkTooltip; readonly scorePins; From 723fde04a1422a3648f185d8b79a0665e1433a54 Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 9 Dec 2024 16:10:05 +0900 Subject: [PATCH 07/44] Exclude restricted user scores from score listing --- app/Models/Solo/Score.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Models/Solo/Score.php b/app/Models/Solo/Score.php index ac3780ea400..b02a6ce54ad 100644 --- a/app/Models/Solo/Score.php +++ b/app/Models/Solo/Score.php @@ -169,9 +169,14 @@ public function scopeDefault(Builder $query): Builder return $query->whereHas('beatmap.beatmapset'); } + /** + * This should only be sorted by primary key(s) + */ public function scopeForListing(Builder $query): Builder { return $query->where('ranked', true) + ->whereHas('user', fn ($q) => $q->default()) + ->from(\DB::raw("{$this->getTable()} FORCE INDEX (PRIMARY)")) ->leftJoinRelation('processHistory') ->select([$query->qualifyColumn('*'), 'processed_version']); } From f509110784960f75433337743962e4351f68816b Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 9 Dec 2024 20:22:41 +0900 Subject: [PATCH 08/44] Fix flag size on team page --- resources/css/bem/profile-info.less | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/css/bem/profile-info.less b/resources/css/bem/profile-info.less index 7cd9658deeb..afb8b40fd43 100644 --- a/resources/css/bem/profile-info.less +++ b/resources/css/bem/profile-info.less @@ -61,6 +61,7 @@ align-self: flex-end; margin-bottom: var(--vertical-padding); background-image: var(--avatar); + background-size: contain; .default-box-shadow(); } From 2b0764df45921554d96c5d534f9b48cbe71c9012 Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 9 Dec 2024 23:02:34 +0900 Subject: [PATCH 09/44] Use relative sizing for icons and flags on profile page cover --- resources/css/bem/profile-info.less | 28 ++++++++++------------------ resources/js/profile-page/cover.tsx | 4 +--- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/resources/css/bem/profile-info.less b/resources/css/bem/profile-info.less index afb8b40fd43..b04f5cb2c15 100644 --- a/resources/css/bem/profile-info.less +++ b/resources/css/bem/profile-info.less @@ -111,10 +111,6 @@ align-items: center; } - &__flag-flag { - font-size: var(--icon-height); // icon size - } - &__flag-text { display: none; @@ -126,23 +122,20 @@ } &__flags { - --icon-font-size: @font-size--small; - --icon-height-desktop: 20px; - --icon-height: 15px; - display: flex; gap: 5px; margin-top: 10px; + font-size: 15px; // icon size @media @desktop { - --icon-height: var(--icon-height-desktop); + font-size: @flag-size-medium; // icon size margin-top: 5px; } } &__icon { - font-size: var(--icon-font-size); // icon size - height: var(--icon-height); + font-size: 0.75em; // icon size + height: (1em * 1em / $font-size); // revert sizing from font-size color: @osu-colour-c1; display: flex; text-shadow: none; @@ -158,19 +151,21 @@ } &__icons { - align-items: baseline; - gap: 2px; - margin-left: 5px; - &--flag-inline { display: contents; + @media @desktop { display: none; } } &--name-inline { + align-items: baseline; + gap: 2px; + margin-left: 5px; + font-size: 15px; // icon size display: none; + @media @desktop { display: flex; } @@ -191,9 +186,6 @@ } &__name { - --icon-height: 15px; - --icon-font-size: @font-size--small; - padding: 0; margin: -5px 0 0; font-weight: normal; diff --git a/resources/js/profile-page/cover.tsx b/resources/js/profile-page/cover.tsx index d342b7ba233..fd74bb3d387 100644 --- a/resources/js/profile-page/cover.tsx +++ b/resources/js/profile-page/cover.tsx @@ -87,9 +87,7 @@ export default class Cover extends React.Component { className='profile-info__flag' href={route('rankings', { country: this.props.user.country.code, mode: this.props.currentMode, type: 'performance' })} > - - - + {this.props.user.country.name} } From e68978428f0bc26823a54af635bc3dc2c51bab7f Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 9 Dec 2024 23:16:26 +0900 Subject: [PATCH 10/44] Move around styling for flag-text --- resources/css/bem/profile-info.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/css/bem/profile-info.less b/resources/css/bem/profile-info.less index b04f5cb2c15..ed0ea1854d2 100644 --- a/resources/css/bem/profile-info.less +++ b/resources/css/bem/profile-info.less @@ -108,16 +108,16 @@ .link-plain(); .link-white(); display: flex; + gap: 4px; align-items: center; } &__flag-text { + font-size: @font-size--title-small; display: none; @media @desktop { display: block; - padding-left: 4px; - font-size: @font-size--title-small; } } From ba6424303f1fb71ac38ea99425a8c622221d6cc6 Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 9 Dec 2024 23:56:32 +0900 Subject: [PATCH 11/44] Fix switching locale doesn't set js locale correctly --- resources/views/layout/metadata.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layout/metadata.blade.php b/resources/views/layout/metadata.blade.php index 64bc5034bd8..9364f456aef 100644 --- a/resources/views/layout/metadata.blade.php +++ b/resources/views/layout/metadata.blade.php @@ -96,9 +96,9 @@ - + @if ($fallbackLocale !== $currentLocale) - + @endif From 33ca70922424caade67f030ac7f83b9093cf362c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:28:34 +0000 Subject: [PATCH 12/44] Bump league/commonmark from 2.5.3 to 2.6.0 Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.5.3 to 2.6.0. - [Release notes](https://github.com/thephpleague/commonmark/releases) - [Changelog](https://github.com/thephpleague/commonmark/blob/2.6/CHANGELOG.md) - [Commits](https://github.com/thephpleague/commonmark/compare/2.5.3...2.6.0) --- updated-dependencies: - dependency-name: league/commonmark dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.lock | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index a2e9c5b6e3c..a5f11026f9f 100644 --- a/composer.lock +++ b/composer.lock @@ -3583,16 +3583,16 @@ }, { "name": "league/commonmark", - "version": "2.5.3", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0" + "reference": "d150f911e0079e90ae3c106734c93137c184f932" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932", + "reference": "d150f911e0079e90ae3c106734c93137c184f932", "shasum": "" }, "require": { @@ -3617,8 +3617,9 @@ "phpstan/phpstan": "^1.8.2", "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0", "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0 || ^7.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0", + "symfony/finder": "^5.3 | ^6.0 | ^7.0", + "symfony/process": "^5.4 | ^6.0 | ^7.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0", "unleashedtech/php-coding-standard": "^3.1.1", "vimeo/psalm": "^4.24.0 || ^5.0.0" }, @@ -3628,7 +3629,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" } }, "autoload": { @@ -3685,7 +3686,7 @@ "type": "tidelift" } ], - "time": "2024-08-16T11:46:16+00:00" + "time": "2024-12-07T15:34:16+00:00" }, { "name": "league/config", @@ -8307,16 +8308,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -8354,7 +8355,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -8370,7 +8371,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/error-handler", @@ -9682,8 +9683,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { From 690bba5970ffa126ddc01c3df62e31f1e2aba88e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 05:00:48 +0000 Subject: [PATCH 13/44] Bump nanoid from 3.3.6 to 3.3.8 Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.6 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.6...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 382762fb08d..9be0db075dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5371,9 +5371,9 @@ ms@^2.1.1: integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + version "3.3.8" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf" + integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w== nanomatch@^1.2.9: version "1.2.13" From 8a104b4a3f5ffe4154401cc9773639acf1cf0839 Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 10 Dec 2024 18:29:39 +0900 Subject: [PATCH 14/44] doesn't return array --- app/Http/Controllers/Chat/ChatController.php | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Chat/ChatController.php b/app/Http/Controllers/Chat/ChatController.php index 1f949f6679e..71351c863a6 100644 --- a/app/Http/Controllers/Chat/ChatController.php +++ b/app/Http/Controllers/Chat/ChatController.php @@ -89,21 +89,19 @@ public function ack() * @bodyParam uuid string client-side message identifier which will be sent back in response and websocket json. Example: some-uuid-string * * @response { - * "channel": [ - * { - * "channel_id": 1234, - * "current_user_attributes": { - * "can_message": true, - * "can_message_error": null, - * "last_read_id": 9150005005 - * }, - * "name": "peppy", - * "description": "", - * "type": "PM", - * "last_read_id": 9150005005, - * "last_message_id": 9150005005 - * } - * ], + * "channel": { + * "channel_id": 1234, + * "current_user_attributes": { + * "can_message": true, + * "can_message_error": null, + * "last_read_id": 9150005005 + * }, + * "name": "peppy", + * "description": "", + * "type": "PM", + * "last_read_id": 9150005005, + * "last_message_id": 9150005005 + * }, * "message": { * "message_id": 9150005005, * "sender_id": 102, From 3af4bd6c0f986a91db84325dd4e3796018afd4aa Mon Sep 17 00:00:00 2001 From: bakaneko Date: Tue, 10 Dec 2024 19:01:22 +0900 Subject: [PATCH 15/44] update response with missing stuff --- app/Http/Controllers/Chat/ChatController.php | 35 ++++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Chat/ChatController.php b/app/Http/Controllers/Chat/ChatController.php index 71351c863a6..27c7d2edf28 100644 --- a/app/Http/Controllers/Chat/ChatController.php +++ b/app/Http/Controllers/Chat/ChatController.php @@ -91,35 +91,42 @@ public function ack() * @response { * "channel": { * "channel_id": 1234, - * "current_user_attributes": { - * "can_message": true, - * "can_message_error": null, - * "last_read_id": 9150005005 - * }, - * "name": "peppy", * "description": "", + * "icon": "https://a.ppy.sh/102?1500537068" + * "message_length_limit": 450, + * "moderated": false, + * "name": "peppy", * "type": "PM", - * "last_read_id": 9150005005, - * "last_message_id": 9150005005 + * "uuid": null, + * "last_message_id": 9150005005, + * "users": [ + * 101, + * 102 + * ] * }, * "message": { - * "message_id": 9150005005, - * "sender_id": 102, * "channel_id": 1234, - * "timestamp": "2018-07-06T06:33:42+00:00", * "content": "i can haz featured artist plz?", * "is_action": false, + * "message_id": 9150005005, + * "sender_id": 102, + * "timestamp": "2024-12-23T01:23:45+00:00", + * "type": "plain", * "uuid": "some-uuid-string", * "sender": { - * "id": 102, - * "username": "nekodex", - * "profile_colour": "#333333", * "avatar_url": "https://a.ppy.sh/102?1500537068", * "country_code": "AU", + * "default_group": "default", + * "id": 102, * "is_active": true, * "is_bot": false, + * "is_deleted": false, * "is_online": true, * "is_supporter": true + * "last_visit": "2024-12-23T01:23:45+00:00", + * "pm_friends_only": false, + * "profile_colour": "#333333", + * "username": "nekodex", * } * }, * "new_channel_id": 1234, From 5522a2df8da7e035f178a740be5b827136f41abc Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 2 Dec 2024 18:10:00 +0900 Subject: [PATCH 16/44] Show team flag on user display --- app/Http/Controllers/BeatmapsController.php | 4 +-- .../Controllers/Forum/TopicsController.php | 1 + app/Http/Controllers/RankingController.php | 3 +- app/Http/Controllers/UsersController.php | 1 + app/Models/DeletedUser.php | 1 + app/Models/Multiplayer/Room.php | 2 +- app/Models/Spotlight.php | 2 +- app/Models/User.php | 16 ++++++--- app/Transformers/CurrentUserTransformer.php | 1 + app/Transformers/TeamTransformer.php | 23 +++++++++++++ app/Transformers/UserCompactTransformer.php | 10 ++++++ resources/css/bem-index.less | 1 + .../css/bem/beatmap-scoreboard-table.less | 14 +++++--- resources/css/bem/flag-team.less | 10 ++++++ resources/css/bem/profile-info.less | 2 +- resources/css/bem/ranking-page-table.less | 6 ++++ .../beatmapsets-show/scoreboard/table-row.tsx | 22 +++++++----- .../beatmapsets-show/scoreboard/top-card.tsx | 10 ++++++ resources/js/components/flag-team.tsx | 15 ++++++++ resources/js/components/user-card.tsx | 10 ++++++ resources/js/interfaces/team-json.ts | 9 +++++ resources/js/interfaces/user-json.ts | 2 ++ resources/js/profile-page/cover.tsx | 10 ++++++ .../views/forum/topics/_post_info.blade.php | 11 ++++++ .../rooms/_rankings_table.blade.php | 14 +++++--- resources/views/objects/_flag_team.blade.php | 9 +++++ .../_spotlight_rankings_table.blade.php | 14 +++++--- resources/views/rankings/kudosu.blade.php | 15 +++++--- .../views/rankings/performance.blade.php | 34 ++++++++++++------- resources/views/rankings/score.blade.php | 18 ++++++---- 30 files changed, 236 insertions(+), 54 deletions(-) create mode 100644 app/Transformers/TeamTransformer.php create mode 100644 resources/css/bem/flag-team.less create mode 100644 resources/js/components/flag-team.tsx create mode 100644 resources/js/interfaces/team-json.ts create mode 100644 resources/views/objects/_flag_team.blade.php diff --git a/app/Http/Controllers/BeatmapsController.php b/app/Http/Controllers/BeatmapsController.php index dca765187d0..be0feca32b1 100644 --- a/app/Http/Controllers/BeatmapsController.php +++ b/app/Http/Controllers/BeatmapsController.php @@ -24,7 +24,7 @@ class BeatmapsController extends Controller { const DEFAULT_API_INCLUDES = ['beatmapset.ratings', 'failtimes', 'max_combo']; - const DEFAULT_SCORE_INCLUDES = ['user', 'user.country', 'user.cover']; + const DEFAULT_SCORE_INCLUDES = ['user', 'user.country', 'user.cover', 'user.team']; public function __construct() { @@ -74,7 +74,7 @@ private static function beatmapScores(string $id, ?string $scoreTransformerType, 'type' => $type, 'user' => $currentUser, ]); - $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country', 'processHistory']); + $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country', 'user.team', 'processHistory']); $userScore = $esFetch->userBest(); $scoreTransformer = new ScoreTransformer($scoreTransformerType); diff --git a/app/Http/Controllers/Forum/TopicsController.php b/app/Http/Controllers/Forum/TopicsController.php index d8c4e34b628..ce704bcfe5c 100644 --- a/app/Http/Controllers/Forum/TopicsController.php +++ b/app/Http/Controllers/Forum/TopicsController.php @@ -396,6 +396,7 @@ public function show($id) 'user.country', 'user.rank', 'user.supporterTagPurchases', + 'user.team', 'user.userGroups', ]); diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php index 51980dc82d8..ad64bb83332 100644 --- a/app/Http/Controllers/RankingController.php +++ b/app/Http/Controllers/RankingController.php @@ -174,7 +174,7 @@ public function index($mode, $type) $table = (new $class())->getTable(); $ppColumn = $class::ppColumn(); $stats = $class - ::with(['user', 'user.country']) + ::with(['user', 'user.country', 'user.team']) ->where($ppColumn, '>', 0) ->whereHas('user', function ($userQuery) { $userQuery->default(); @@ -307,6 +307,7 @@ public function kudosu() $page = min(get_int(request('page')) ?? 1, $maxPage); $scores = User::default() + ->with('team') ->orderBy('osu_kudostotal', 'desc') ->paginate(static::PAGE_SIZE, ['*'], 'page', $page, $maxResults); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index cd72c10642a..b358af1928c 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -931,6 +931,7 @@ private function showUserIncludes() 'statistics.country_rank', 'statistics.rank', 'statistics.variants', + 'team', 'user_achievements', ]; diff --git a/app/Models/DeletedUser.php b/app/Models/DeletedUser.php index 56c14151d46..4e1e3252502 100644 --- a/app/Models/DeletedUser.php +++ b/app/Models/DeletedUser.php @@ -7,6 +7,7 @@ class DeletedUser extends User { + public null $team = null; public $user_avatar = null; public $username = '[deleted user]'; diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php index 8ea4ebc3674..1cf6bd075ec 100644 --- a/app/Models/Multiplayer/Room.php +++ b/app/Models/Multiplayer/Room.php @@ -676,7 +676,7 @@ public function startPlay(User $user, PlaylistItem $playlistItem, int $buildId) public function topScores() { - return $this->userHighScores()->forRanking()->with('user.country'); + return $this->userHighScores()->forRanking()->with(['user.country', 'user.team']); } private function assertHostRoomAllowance() diff --git a/app/Models/Spotlight.php b/app/Models/Spotlight.php index 3fe43f972db..1c470a04442 100644 --- a/app/Models/Spotlight.php +++ b/app/Models/Spotlight.php @@ -96,7 +96,7 @@ public function ranking(string $mode) // These models will not have the correct table name set on them // as they get overriden when Laravel hydrates them. return $this->userStats($mode) - ->with(['user', 'user.country']) + ->with(['user', 'user.country', 'user.team']) ->whereHas('user', function ($userQuery) { $model = new User(); $userQuery diff --git a/app/Models/User.php b/app/Models/User.php index 306f4710502..737b66a56e6 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -37,6 +37,7 @@ use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; +use Illuminate\Database\Eloquent\Relations\HasOneThrough; use Illuminate\Database\QueryException; use Laravel\Passport\HasApiTokens; use League\OAuth2\Server\Exception\OAuthServerException; @@ -127,7 +128,7 @@ * @property-read Collection $storeAddresses * @property-read Collection $supporterTagPurchases * @property-read Collection $supporterTags - * @property-read TeamMember|null $teamMembership + * @property-read Team|null $team * @property-read Collection $tokens * @property-read Collection $topicWatches * @property-read Collection $userAchievements @@ -297,9 +298,16 @@ public function userCountryHistory(): HasMany return $this->hasMany(UserCountryHistory::class); } - public function teamMembership(): HasOne + public function team(): HasOneThrough { - return $this->hasOne(TeamMember::class, 'user_id'); + return $this->hasOneThrough( + Team::class, + TeamMember::class, + 'user_id', + 'id', + 'user_id', + 'team_id', + ); } public function getAuthPassword() @@ -958,7 +966,7 @@ public function getAttribute($key) 'storeAddresses', 'supporterTagPurchases', 'supporterTags', - 'teamMembership', + 'team', 'tokens', 'topicWatches', 'userAchievements', diff --git a/app/Transformers/CurrentUserTransformer.php b/app/Transformers/CurrentUserTransformer.php index 6e89c338df2..beccb8c54b2 100644 --- a/app/Transformers/CurrentUserTransformer.php +++ b/app/Transformers/CurrentUserTransformer.php @@ -16,6 +16,7 @@ public function __construct() 'friends', 'groups', 'is_admin', + 'team', 'unread_pm_count', 'user_preferences', ]; diff --git a/app/Transformers/TeamTransformer.php b/app/Transformers/TeamTransformer.php new file mode 100644 index 00000000000..e2e1bb15055 --- /dev/null +++ b/app/Transformers/TeamTransformer.php @@ -0,0 +1,23 @@ +. 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\Team; + +class TeamTransformer extends TransformerAbstract +{ + public function transform(Team $team): array + { + return [ + 'id' => $team->getKey(), + 'logo' => $team->logo()->url(), + 'name' => $team->name, + 'short_name' => $team->short_name, + ]; + } +} diff --git a/app/Transformers/UserCompactTransformer.php b/app/Transformers/UserCompactTransformer.php index 21df9c260e5..e18c90cf8f3 100644 --- a/app/Transformers/UserCompactTransformer.php +++ b/app/Transformers/UserCompactTransformer.php @@ -19,9 +19,11 @@ class UserCompactTransformer extends TransformerAbstract 'country', 'cover', 'groups', + 'team', ]; const CARD_INCLUDES_PRELOAD = [ + 'team', 'userGroups', ]; @@ -92,6 +94,7 @@ class UserCompactTransformer extends TransformerAbstract 'statistics', 'statistics_rulesets', 'support_level', + 'team', 'unread_pm_count', 'user_achievements', 'user_preferences', @@ -454,6 +457,13 @@ public function includeSupportLevel(User $user) return $this->primitive($user->supportLevel()); } + public function includeTeam(User $user) + { + return ($team = $user->team) === null + ? $this->null() + : $this->item($team, new TeamTransformer()); + } + public function includeUnreadPmCount(User $user) { // legacy pm has been turned off diff --git a/resources/css/bem-index.less b/resources/css/bem-index.less index 6371fa373e9..0228a0d00a2 100644 --- a/resources/css/bem-index.less +++ b/resources/css/bem-index.less @@ -157,6 +157,7 @@ @import "bem/fileupload"; @import "bem/fixed-bar"; @import "bem/flag-country"; +@import "bem/flag-team"; @import "bem/floating-toolbar"; @import "bem/floating-toolbar-button"; @import "bem/follow-mapper"; diff --git a/resources/css/bem/beatmap-scoreboard-table.less b/resources/css/bem/beatmap-scoreboard-table.less index 35711f1da30..75adb4e6dec 100644 --- a/resources/css/bem/beatmap-scoreboard-table.less +++ b/resources/css/bem/beatmap-scoreboard-table.less @@ -184,12 +184,9 @@ } &--user-link { - .link-inverted(); - .link-hover({ - text-decoration: underline; - }); - position: absolute; + display: flex; + gap: 5px; } &--zero { @@ -221,4 +218,11 @@ opacity: 1; } } + + &__user-link { + .link-inverted(); + .link-hover({ + text-decoration: underline; + }); + } } diff --git a/resources/css/bem/flag-team.less b/resources/css/bem/flag-team.less new file mode 100644 index 00000000000..ac8ad25ace0 --- /dev/null +++ b/resources/css/bem/flag-team.less @@ -0,0 +1,10 @@ +// 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. + +.flag-team { + height: 1em; + width: 2em; + display: inline-block; + background-size: contain; + border-radius: min(0.25em, @border-radius-large); +} diff --git a/resources/css/bem/profile-info.less b/resources/css/bem/profile-info.less index ed0ea1854d2..802b81ba63c 100644 --- a/resources/css/bem/profile-info.less +++ b/resources/css/bem/profile-info.less @@ -123,7 +123,7 @@ &__flags { display: flex; - gap: 5px; + gap: 10px; margin-top: 10px; font-size: 15px; // icon size diff --git a/resources/css/bem/ranking-page-table.less b/resources/css/bem/ranking-page-table.less index e27cb807bba..5129952b76e 100644 --- a/resources/css/bem/ranking-page-table.less +++ b/resources/css/bem/ranking-page-table.less @@ -105,6 +105,12 @@ margin-left: 10px; } + &__flags { + display: inline-flex; + gap: 10px; + font-size: @flag-size-medium; // icon size + } + &__user-link { display: flex; align-items: center; diff --git a/resources/js/beatmapsets-show/scoreboard/table-row.tsx b/resources/js/beatmapsets-show/scoreboard/table-row.tsx index a26908235e0..72ada1397b6 100644 --- a/resources/js/beatmapsets-show/scoreboard/table-row.tsx +++ b/resources/js/beatmapsets-show/scoreboard/table-row.tsx @@ -2,10 +2,12 @@ // See the LICENCE file in the repository root for full licence text. import FlagCountry from 'components/flag-country'; +import FlagTeam from 'components/flag-team'; import Mod from 'components/mod'; import { PlayDetailMenu } from 'components/play-detail-menu'; import ScoreValue from 'components/score-value'; import ScoreboardTime from 'components/scoreboard-time'; +import UserLink from 'components/user-link'; import BeatmapJson from 'interfaces/beatmap-json'; import { SoloScoreJsonForBeatmap } from 'interfaces/solo-score-json'; import { route } from 'laroute'; @@ -113,14 +115,18 @@ export default class ScoreboardTableRow extends React.Component { ) : ( - - {score.user.username} - - + + {score.user.team != null && + + + + } + + )} diff --git a/resources/js/beatmapsets-show/scoreboard/top-card.tsx b/resources/js/beatmapsets-show/scoreboard/top-card.tsx index 7a9ea4359fb..6250d4d57e4 100644 --- a/resources/js/beatmapsets-show/scoreboard/top-card.tsx +++ b/resources/js/beatmapsets-show/scoreboard/top-card.tsx @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. import FlagCountry from 'components/flag-country'; +import FlagTeam from 'components/flag-team'; import Mod from 'components/mod'; import ScorePin from 'components/score-pin'; import ScoreValue from 'components/score-value'; @@ -94,6 +95,15 @@ export default class TopCard extends React.PureComponent { modifiers='flat' /> + + {this.props.score.user.team != null && + + + + } diff --git a/resources/js/components/flag-team.tsx b/resources/js/components/flag-team.tsx new file mode 100644 index 00000000000..57f3ff244c8 --- /dev/null +++ b/resources/js/components/flag-team.tsx @@ -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. + +import TeamJson from 'interfaces/team-json'; +import * as React from 'react'; + +export default function FlagTeam({ team }: { team: TeamJson }) { + return ( + + ); +} diff --git a/resources/js/components/user-card.tsx b/resources/js/components/user-card.tsx index 8c5ca1ac5a4..403ef104f45 100644 --- a/resources/js/components/user-card.tsx +++ b/resources/js/components/user-card.tsx @@ -14,6 +14,7 @@ import { trans } from 'utils/lang'; import { present } from 'utils/string'; import { giftSupporterTagUrl } from 'utils/url'; import FlagCountry from './flag-country'; +import FlagTeam from './flag-team'; import FollowUserMappingButton from './follow-user-mapping-button'; import { PopupMenuPersistent } from './popup-menu-persistent'; import { ReportReportable } from './report-reportable'; @@ -226,6 +227,15 @@ export class UserCard extends React.PureComponent { + {this.user.team != null && ( + + + + )} + {this.props.mode === 'card' && ( <> {this.user.is_supporter && ( diff --git a/resources/js/interfaces/team-json.ts b/resources/js/interfaces/team-json.ts new file mode 100644 index 00000000000..16270293c1b --- /dev/null +++ b/resources/js/interfaces/team-json.ts @@ -0,0 +1,9 @@ +// 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 default interface TeamJson { + id: number; + logo: string | null; + name: string; + short_name: string; +} diff --git a/resources/js/interfaces/user-json.ts b/resources/js/interfaces/user-json.ts index 137f8c2d817..75cc94c65c4 100644 --- a/resources/js/interfaces/user-json.ts +++ b/resources/js/interfaces/user-json.ts @@ -6,6 +6,7 @@ import DailyChallengeUserStatsJson from './daily-challenge-user-stats-json'; import ProfileBannerJson from './profile-banner'; import RankHighestJson from './rank-highest-json'; import RankHistoryJson from './rank-history-json'; +import TeamJson from './team-json'; import UserAccountHistoryJson from './user-account-history-json'; import UserAchievementJson from './user-achievement-json'; import UserBadgeJson from './user-badge-json'; @@ -66,6 +67,7 @@ interface UserJsonAvailableIncludes { statistics: UserStatisticsJson; statistics_rulesets: UserStatisticsRulesetsJson; support_level: number; + team: TeamJson; unread_pm_count: number; user_achievements: UserAchievementJson[]; user_preferences: UserPreferencesJson; diff --git a/resources/js/profile-page/cover.tsx b/resources/js/profile-page/cover.tsx index fd74bb3d387..ef2dddff87c 100644 --- a/resources/js/profile-page/cover.tsx +++ b/resources/js/profile-page/cover.tsx @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. import FlagCountry from 'components/flag-country'; +import FlagTeam from 'components/flag-team'; import { Spinner } from 'components/spinner'; import UserAvatar from 'components/user-avatar'; import UserGroupBadges from 'components/user-group-badges'; @@ -91,6 +92,15 @@ export default class Cover extends React.Component { {this.props.user.country.name} } + {this.props.user.team != null && + + + {this.props.user.team.name} + + }
{this.renderIcons()}
diff --git a/resources/views/forum/topics/_post_info.blade.php b/resources/views/forum/topics/_post_info.blade.php index 8e2b5c4c3cc..db4bd562cbd 100644 --- a/resources/views/forum/topics/_post_info.blade.php +++ b/resources/views/forum/topics/_post_info.blade.php @@ -71,6 +71,17 @@ class="forum-post-info__row forum-post-info__row--title" @endif + @if (($team = $user->team) !== null) +
+ logo()->url(), false) !!} + > + +
+ @endif + @if ($user->country !== null)
- @include('objects._flag_country', [ - 'country' => $score->user->country, - 'modifiers' => 'medium', - ]) + + @include('objects._flag_country', [ + 'country' => $score->user->country, + ]) + @if (($team = $score->user->team) !== null) + + @include('objects._flag_team', compact('team')) + + @endif + . Licensed under the GNU Affero General Public License v3.0. + See the LICENCE file in the repository root for full licence text. +--}} +logo()->url(), false) !!} +> diff --git a/resources/views/rankings/_spotlight_rankings_table.blade.php b/resources/views/rankings/_spotlight_rankings_table.blade.php index e36e937eb28..a99fe37fd91 100644 --- a/resources/views/rankings/_spotlight_rankings_table.blade.php +++ b/resources/views/rankings/_spotlight_rankings_table.blade.php @@ -38,10 +38,16 @@
- @include('objects._flag_country', [ - 'country' => $score->user->country, - 'modifiers' => 'medium', - ]) + + @include('objects._flag_country', [ + 'country' => $score->user->country, + ]) + @if (($team = $score->user->team) !== null) + + @include('objects._flag_team', compact('team')) + + @endif +
- @include('objects._flag_country', [ - 'country' => $user->country_acronym, - 'modifiers' => 'medium', - ]) + + @include('objects._flag_country', [ + 'country' => $user->country_acronym, + ]) + + @if (($team = $user->team) !== null) + + @include('objects._flag_team', compact('team')) + + @endif + {!! link_to_user($user, null, '', ['ranking-page-table__user-link-text']) !!}
diff --git a/resources/views/rankings/performance.blade.php b/resources/views/rankings/performance.blade.php index b957f678581..04cd936193a 100644 --- a/resources/views/rankings/performance.blade.php +++ b/resources/views/rankings/performance.blade.php @@ -108,19 +108,27 @@ class="{{ class_with_modifiers('ranking-page-table__column', 'rank-change-icon', @endif
- - @include('objects._flag_country', [ - 'country' => $score->user->country, - 'modifiers' => 'medium', - ]) - + + + @include('objects._flag_country', [ + 'country' => $score->user->country, + ]) + + + @if (($team = $score->user->team) !== null) + + @include('objects._flag_team', compact('team')) + + @endif +
- - @include('objects._flag_country', [ - 'country' => $score->user->country, - 'modifiers' => 'medium', - ]) - + + + @include('objects._flag_country', [ + 'country' => $score->user->country, + ]) + + @if (($team = $score->user->team) !== null) + + @include('objects._flag_team', compact('team')) + + @endif + Date: Tue, 10 Dec 2024 21:53:50 +0900 Subject: [PATCH 17/44] Notify all users on beatmap owner change --- app/Jobs/Notifications/BeatmapOwnerChange.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Jobs/Notifications/BeatmapOwnerChange.php b/app/Jobs/Notifications/BeatmapOwnerChange.php index c72d025e01a..7bd13d744b9 100644 --- a/app/Jobs/Notifications/BeatmapOwnerChange.php +++ b/app/Jobs/Notifications/BeatmapOwnerChange.php @@ -15,7 +15,6 @@ class BeatmapOwnerChange extends BroadcastNotificationBase protected $beatmap; protected $beatmapset; - protected $user; public static function getMailLink(Notification $notification): string { @@ -32,7 +31,6 @@ public function __construct(Beatmap $beatmap, User $source) $this->beatmap = $beatmap; $this->beatmapset = $beatmap->beatmapset; - $this->user = $beatmap->user; } public function getDetails(): array @@ -48,7 +46,7 @@ public function getDetails(): array public function getListeningUserIds(): array { - return [$this->user->getKey()]; + return $this->beatmap->beatmapOwners()->pluck('user_id')->all(); } public function getNotifiable() From 458542de55f23321567c9f72dba39fd94d073ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Wed, 11 Dec 2024 12:35:24 +0900 Subject: [PATCH 18/44] Add capability to filter by room status To address https://osu.ppy.sh/community/forums/topics/2013293. Normally wouldn't detour for this but the second message in that thread pissed me off. I feel like people will start to exploit this now so maybe I shouldn't admit to it. --- app/Models/Multiplayer/Room.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php index 8ea4ebc3674..c54cbcccad8 100644 --- a/app/Models/Multiplayer/Room.php +++ b/app/Models/Multiplayer/Room.php @@ -77,6 +77,7 @@ class Room extends Model const PLAYLIST_QUEUE_MODE = 'host_only'; const REALTIME_DEFAULT_QUEUE_MODE = 'host_only'; const REALTIME_QUEUE_MODES = [ 'host_only', 'all_players', 'all_players_round_robin' ]; + const REALTIME_STATUSES = ['idle', 'playing']; public ?array $preloadedRecentParticipants = null; @@ -149,6 +150,7 @@ public static function search(array $rawParams, ?int $maxLimit = null) 'mode', 'season_id:int', 'sort', + 'status', 'type_group', 'user:any', ], ['null_missing' => true]); @@ -157,6 +159,7 @@ public static function search(array $rawParams, ?int $maxLimit = null) $user = $params['user']; $seasonId = $params['season_id']; $sort = $params['sort']; + $status = $params['status']; $category = $params['category']; $typeGroup = $params['type_group']; @@ -173,6 +176,14 @@ public static function search(array $rawParams, ?int $maxLimit = null) $query = static::whereIn('type', static::TYPE_GROUPS[$typeGroup]); + if (!in_array($status, static::REALTIME_STATUSES)) { + $status = null; + } + + if (isset($status)) { + $query->where('status', $status); + } + if (isset($seasonId)) { $query->whereRelation('seasons', 'seasons.id', $seasonId); } From 8352feabc9f90f690c4b546c9ff2ecfc73052253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Wed, 11 Dec 2024 13:29:51 +0900 Subject: [PATCH 19/44] Appease phpcs --- app/Models/Multiplayer/Room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php index c54cbcccad8..316a73d0ebf 100644 --- a/app/Models/Multiplayer/Room.php +++ b/app/Models/Multiplayer/Room.php @@ -176,7 +176,7 @@ public static function search(array $rawParams, ?int $maxLimit = null) $query = static::whereIn('type', static::TYPE_GROUPS[$typeGroup]); - if (!in_array($status, static::REALTIME_STATUSES)) { + if (!in_array($status, static::REALTIME_STATUSES, true)) { $status = null; } From e0d584126a43c115a409ed88277866195a69c0ed Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 11 Dec 2024 18:22:44 +0900 Subject: [PATCH 20/44] Remove unused helper --- app/helpers.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index 5258929f7f3..bff4c134915 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -594,11 +594,6 @@ function max_offset($page, $limit) return max(0, min($offset, $GLOBALS['cfg']['osu']['pagination']['max_count'] - $limit)); } -function mysql_escape_like($string) -{ - return addcslashes($string, '%_\\'); -} - function oauth_token(): ?App\Models\OAuth\Token { return Request::instance()->attributes->get(App\Http\Middleware\AuthApi::REQUEST_OAUTH_TOKEN_KEY); From 3b57a33cd263e04e75697d9d6d3915fea48889c7 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 11 Dec 2024 19:26:36 +0900 Subject: [PATCH 21/44] Fix default background and use flag-team component for team page --- resources/css/bem/flag-team.less | 10 ++++++++++ resources/css/bem/profile-info.less | 4 ---- resources/js/components/flag-team.tsx | 3 ++- resources/views/objects/_flag_team.blade.php | 2 +- resources/views/teams/show.blade.php | 7 +++---- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/resources/css/bem/flag-team.less b/resources/css/bem/flag-team.less index ac8ad25ace0..74df9529ad8 100644 --- a/resources/css/bem/flag-team.less +++ b/resources/css/bem/flag-team.less @@ -5,6 +5,16 @@ height: 1em; width: 2em; display: inline-block; + background-color: #333; background-size: contain; + background-repeat: no-repeat; + background-position: center; border-radius: min(0.25em, @border-radius-large); + + &--full { + width: 100%; + height: 100%; + box-shadow: none; + border-radius: 0; + } } diff --git a/resources/css/bem/profile-info.less b/resources/css/bem/profile-info.less index 802b81ba63c..1e1af4a4c9a 100644 --- a/resources/css/bem/profile-info.less +++ b/resources/css/bem/profile-info.less @@ -2,7 +2,6 @@ // See the LICENCE file in the repository root for full licence text. .profile-info { - --avatar: none; --avatar-radius-extended-desktop: 40px; --avatar-radius-extended: 20px; --avatar-radius: 20px; @@ -40,7 +39,6 @@ &--team { --avatar-width: calc(var(--avatar-height) * 2); - --avatar: url("~@images/headers/generic.jpg"); --bg: url("~@images/headers/generic.jpg"); background-color: hsl(var(--hsl-b4)); } @@ -60,8 +58,6 @@ overflow: hidden; align-self: flex-end; margin-bottom: var(--vertical-padding); - background-image: var(--avatar); - background-size: contain; .default-box-shadow(); } diff --git a/resources/js/components/flag-team.tsx b/resources/js/components/flag-team.tsx index 57f3ff244c8..e4601680c22 100644 --- a/resources/js/components/flag-team.tsx +++ b/resources/js/components/flag-team.tsx @@ -3,12 +3,13 @@ import TeamJson from 'interfaces/team-json'; import * as React from 'react'; +import { urlPresence } from 'utils/css'; export default function FlagTeam({ team }: { team: TeamJson }) { return ( ); diff --git a/resources/views/objects/_flag_team.blade.php b/resources/views/objects/_flag_team.blade.php index af7db4ed063..a445edd9fb5 100644 --- a/resources/views/objects/_flag_team.blade.php +++ b/resources/views/objects/_flag_team.blade.php @@ -3,7 +3,7 @@ See the LICENCE file in the repository root for full licence text. --}} logo()->url(), false) !!} > diff --git a/resources/views/teams/show.blade.php b/resources/views/teams/show.blade.php index 20b2a54a879..ac8638e0a3a 100644 --- a/resources/views/teams/show.blade.php +++ b/resources/views/teams/show.blade.php @@ -45,10 +45,9 @@ class="btn-circle btn-circle--page-toggle" @endif
-
logo()->url()) !!} - >
+
+ @include('objects._flag_team', ['modifiers' => 'full', 'team' => $team]) +

{{ $team->name }} From 4528afedfc64d8bd2e9028f2eba80ad6ad0b2e62 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 11 Dec 2024 19:47:19 +0900 Subject: [PATCH 22/44] Missing variable --- resources/views/objects/_flag_team.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/objects/_flag_team.blade.php b/resources/views/objects/_flag_team.blade.php index a445edd9fb5..d4b1d8e2640 100644 --- a/resources/views/objects/_flag_team.blade.php +++ b/resources/views/objects/_flag_team.blade.php @@ -3,7 +3,7 @@ See the LICENCE file in the repository root for full licence text. --}} logo()->url(), false) !!} > From 9bf136db82d327c351c821511b6d9c0ef6e53cac Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 9 Dec 2024 20:01:47 +0900 Subject: [PATCH 23/44] Add link to own team from user popup menu --- resources/lang/en/layout.php | 1 + resources/views/layout/_popup_user.blade.php | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/resources/lang/en/layout.php b/resources/lang/en/layout.php index bc588a750e4..a11913b6ab6 100644 --- a/resources/lang/en/layout.php +++ b/resources/lang/en/layout.php @@ -201,6 +201,7 @@ 'profile' => 'My Profile', 'scoring_mode_toggle' => 'Classic scoring', 'scoring_mode_toggle_tooltip' => 'Adjust score values to feel more like classic uncapped scoring', + 'team' => 'My Team', ], ], diff --git a/resources/views/layout/_popup_user.blade.php b/resources/views/layout/_popup_user.blade.php index e6393b8515a..95792d823c1 100644 --- a/resources/views/layout/_popup_user.blade.php +++ b/resources/views/layout/_popup_user.blade.php @@ -31,6 +31,12 @@ class="simple-menu__item" {{ osu_trans('layout.popup_user.links.profile') }} + @if (($team = $currentUser->team) !== null) + + {{ osu_trans('layout.popup_user.links.team') }} + + @endif + {{ osu_trans('layout.popup_user.links.friends') }} From c67c6cea39a9b047d7ae8919a412ffcd46ccf983 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 13 Dec 2024 20:07:55 +0900 Subject: [PATCH 24/44] Require multiplayer api to join multiplayer room --- app/Singletons/OsuAuthorize.php | 10 +++------- tests/Controllers/Chat/ChannelsControllerTest.php | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/Singletons/OsuAuthorize.php b/app/Singletons/OsuAuthorize.php index 92143f27e22..27c14d000e0 100644 --- a/app/Singletons/OsuAuthorize.php +++ b/app/Singletons/OsuAuthorize.php @@ -1027,7 +1027,7 @@ public function checkChatChannelRead(?User $user, Channel $channel): string * @return string * @throws AuthorizationCheckException */ - public function checkChatChannelJoin(?User $user, Channel $channel): string + public function checkChatChannelJoin(?User $user, Channel $channel): ?string { $prefix = 'chat.'; @@ -1039,13 +1039,9 @@ public function checkChatChannelJoin(?User $user, Channel $channel): string $this->ensureCleanRecord($user, $prefix); - // This check is only for when joining the channel directly; joining via the Room - // will always add the user to the channel. + // joining multiplayer room is done through room endpoint if ($channel->isMultiplayer()) { - $room = Room::hasParticipated($user)->find($channel->room_id); - if ($room !== null) { - return 'ok'; - } + return null; } // allow joining of 'tournament' matches (for lazer/tournament client) diff --git a/tests/Controllers/Chat/ChannelsControllerTest.php b/tests/Controllers/Chat/ChannelsControllerTest.php index dac9bbc3b51..6b097bcc1cf 100644 --- a/tests/Controllers/Chat/ChannelsControllerTest.php +++ b/tests/Controllers/Chat/ChannelsControllerTest.php @@ -205,7 +205,7 @@ public function testChannelJoinMultiplayerWhenParticipated() 'user' => $this->user->getKey(), ])); - $request->assertStatus(200)->assertJsonFragment(['channel_id' => $scoreLink->playlistItem->room->channel_id, 'type' => Channel::TYPES['multiplayer']]); + $request->assertStatus(403); } //endregion From efc5c9371c8e9fc52a5668d103ebb224ece8d817 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 12 Dec 2024 15:47:18 +0900 Subject: [PATCH 25/44] Add member management page Currently can only remove. --- .../Controllers/Teams/MembersController.php | 51 ++++++++++ resources/css/bem-index.less | 1 + .../bem/profile-page-cover-editor-button.less | 3 +- resources/css/bem/team-members-manage.less | 41 +++++++++ resources/lang/en/common.php | 1 + resources/lang/en/teams.php | 22 +++++ resources/views/teams/members/index.blade.php | 92 +++++++++++++++++++ resources/views/teams/show.blade.php | 11 +++ routes/web.php | 3 + 9 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 app/Http/Controllers/Teams/MembersController.php create mode 100644 resources/css/bem/team-members-manage.less create mode 100644 resources/views/teams/members/index.blade.php diff --git a/app/Http/Controllers/Teams/MembersController.php b/app/Http/Controllers/Teams/MembersController.php new file mode 100644 index 00000000000..fb64822a2ea --- /dev/null +++ b/app/Http/Controllers/Teams/MembersController.php @@ -0,0 +1,51 @@ +. 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\Teams; + +use App\Http\Controllers\Controller; +use App\Models\Team; +use App\Models\TeamMember; +use Symfony\Component\HttpFoundation\Response; + +class MembersController extends Controller +{ + public function __construct() + { + parent::__construct(); + + $this->middleware('auth'); + } + + public function destroy(string $teamId, string $userId): Response + { + $teamMember = TeamMember::where([ + 'team_id' => $teamId, + 'user_id' => $userId, + ])->firstOrFail(); + + if ($teamMember->user_id === \Auth::user()->getKey()) { + abort(422, 'can not remove self from team'); + } + + priv_check('TeamUpdate', $teamMember->team)->ensureCan(); + + $teamMember->delete(); + \Session::flash('popup', osu_trans('teams.members.destroy.success')); + + return response(null, 204); + } + + public function index(string $teamId): Response + { + $team = Team::findOrFail($teamId); + + priv_check('TeamUpdate', $team)->ensureCan(); + + return ext_view('teams.members.index', compact('team')); + } +} diff --git a/resources/css/bem-index.less b/resources/css/bem-index.less index 0228a0d00a2..20a241d8000 100644 --- a/resources/css/bem-index.less +++ b/resources/css/bem-index.less @@ -386,6 +386,7 @@ @import "bem/team-info-entries"; @import "bem/team-info-entry"; @import "bem/team-members"; +@import "bem/team-members-manage"; @import "bem/team-settings"; @import "bem/team-settings-description-preview"; @import "bem/team-summary"; diff --git a/resources/css/bem/profile-page-cover-editor-button.less b/resources/css/bem/profile-page-cover-editor-button.less index ac68ae3d4b9..a28abb0a1b0 100644 --- a/resources/css/bem/profile-page-cover-editor-button.less +++ b/resources/css/bem/profile-page-cover-editor-button.less @@ -4,7 +4,8 @@ .profile-page-cover-editor-button { position: absolute; bottom: 10px; - display: flex; + display: grid; + gap: 10px; justify-content: center; right: @gutter-v2; diff --git a/resources/css/bem/team-members-manage.less b/resources/css/bem/team-members-manage.less new file mode 100644 index 00000000000..9ddbb0f6544 --- /dev/null +++ b/resources/css/bem/team-members-manage.less @@ -0,0 +1,41 @@ +// 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. + +.team-members-manage { + list-style-type: none; + margin: 0; + padding: 0; + font-size: @font-size--title-small; + display: grid; + gap: 2px 10px; + grid-template-columns: auto 1fr auto auto auto; + + &__avatar { + .default-border-radius(); + overflow: hidden; + width: @user-list-icon-size; + height: $width; + } + + &__item { + --bg: hsl(var(--hsl-b3)); + --bg-hover: hsl(var(--hsl-b2)); + .default-border-radius(); + display: grid; + grid-template-columns: subgrid; + grid-column: 1 / -1; + align-items: center; + padding: 3px 10px; + background: var(--bg); + + &:hover { + background: var(--bg-hover); + } + + &--header { + --bg: none; + --bg-hover: var(--bg); + font-weight: 600; + } + } +} diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 5bb26369a5a..4441277b1e0 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -22,6 +22,7 @@ 'admin' => 'Admin', 'authorise' => 'Authorise', 'authorising' => 'Authorising...', + 'back' => 'Back', 'back_to_previous' => 'Return to previous position', 'back_to_top' => 'Back to top', 'cancel' => 'Cancel', diff --git a/resources/lang/en/teams.php b/resources/lang/en/teams.php index b268cf78172..463c321fd04 100644 --- a/resources/lang/en/teams.php +++ b/resources/lang/en/teams.php @@ -6,6 +6,7 @@ return [ 'edit' => [ 'saved' => 'Settings saved successfully', + 'title' => 'Team Settings', 'description' => [ 'label' => 'Description', @@ -37,6 +38,27 @@ ], ], + 'members' => [ + 'destroy' => [ + 'success' => 'Team member removed', + ], + + 'index' => [ + 'title' => 'Manage Members', + + 'table' => [ + 'status' => 'Status', + 'joined_at' => 'Join Date', + 'remove' => 'Remove', + 'title' => 'Current Members', + ], + + 'status' => [ + 'status_0' => 'Inactive', + 'status_1' => 'Active', + ], + ], + ], 'show' => [ 'bar' => [ 'settings' => 'Settings', diff --git a/resources/views/teams/members/index.blade.php b/resources/views/teams/members/index.blade.php new file mode 100644 index 00000000000..b470ff76f9d --- /dev/null +++ b/resources/views/teams/members/index.blade.php @@ -0,0 +1,92 @@ +{{-- + 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. +--}} +@extends('master') + +@section('content') + @include('layout._page_header_v4', ['params' => [ + 'theme' => 'team', + 'backgroundImage' => $team->header()->url(), + ]]) + +
+ +
+@endsection diff --git a/resources/views/teams/show.blade.php b/resources/views/teams/show.blade.php index ac8638e0a3a..ba1153f329c 100644 --- a/resources/views/teams/show.blade.php +++ b/resources/views/teams/show.blade.php @@ -37,7 +37,18 @@ class="profile-info__bg profile-info__bg--team"
+ + + + diff --git a/routes/web.php b/routes/web.php index c65e4547bc1..aed61b6b50d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -296,6 +296,9 @@ Route::post('user-cover-presets/batch-activate', 'UserCoverPresetsController@batchActivate')->name('user-cover-presets.batch-activate'); Route::resource('user-cover-presets', 'UserCoverPresetsController', ['only' => ['index', 'store', 'update']]); + Route::group(['as' => 'teams.', 'prefix' => 'teams/{team}'], function () { + Route::resource('members', 'Teams\MembersController', ['only' => ['destroy', 'index']]); + }); Route::resource('teams', 'TeamsController', ['only' => ['edit', 'show', 'update']]); Route::post('users/check-username-availability', 'UsersController@checkUsernameAvailability')->name('users.check-username-availability'); From 0f6ec683768925944e50fc62ca23d4256a8c8f6c Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 16 Dec 2024 07:54:34 +0900 Subject: [PATCH 26/44] Fix contest admin download --- resources/views/admin/contests/show.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/admin/contests/show.blade.php b/resources/views/admin/contests/show.blade.php index ab632c9271f..f3948a9feea 100644 --- a/resources/views/admin/contests/show.blade.php +++ b/resources/views/admin/contests/show.blade.php @@ -39,6 +39,7 @@
@csrf From 708e23967dcc4604391ab9223cf2ca205a127db2 Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 16 Dec 2024 19:54:15 +0900 Subject: [PATCH 27/44] Namespace entire group --- routes/web.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes/web.php b/routes/web.php index aed61b6b50d..a94e8853fa3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -296,8 +296,8 @@ Route::post('user-cover-presets/batch-activate', 'UserCoverPresetsController@batchActivate')->name('user-cover-presets.batch-activate'); Route::resource('user-cover-presets', 'UserCoverPresetsController', ['only' => ['index', 'store', 'update']]); - Route::group(['as' => 'teams.', 'prefix' => 'teams/{team}'], function () { - Route::resource('members', 'Teams\MembersController', ['only' => ['destroy', 'index']]); + Route::group(['as' => 'teams.', 'prefix' => 'teams/{team}', 'namespace' => 'Teams'], function () { + Route::resource('members', 'MembersController', ['only' => ['destroy', 'index']]); }); Route::resource('teams', 'TeamsController', ['only' => ['edit', 'show', 'update']]); From 47656979751ed1ffeb1f87214feb8cc607b9460e Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 16 Dec 2024 19:55:50 +0900 Subject: [PATCH 28/44] Preload user --- app/Http/Controllers/Teams/MembersController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/Teams/MembersController.php b/app/Http/Controllers/Teams/MembersController.php index fb64822a2ea..3c262ced4e1 100644 --- a/app/Http/Controllers/Teams/MembersController.php +++ b/app/Http/Controllers/Teams/MembersController.php @@ -46,6 +46,8 @@ public function index(string $teamId): Response priv_check('TeamUpdate', $team)->ensureCan(); + $team->load('members.user'); + return ext_view('teams.members.index', compact('team')); } } From e2faccc3ffe673f25baf3332ca93aeb8caf65cca Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 17 Dec 2024 03:01:49 +0900 Subject: [PATCH 29/44] Fix profile page reorder not working without full reload --- resources/js/profile-page/main.tsx | 62 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/resources/js/profile-page/main.tsx b/resources/js/profile-page/main.tsx index 17123dab521..b891de44fca 100644 --- a/resources/js/profile-page/main.tsx +++ b/resources/js/profile-page/main.tsx @@ -120,37 +120,39 @@ export default class Main extends React.Component { // pageScan does not need to run at 144 fps... $(window).on(scrollEventId, throttle(() => this.pageScan(), 20)); - if (this.pages.current != null) { - $(this.pages.current).sortable({ - cursor: 'move', - handle: '.js-profile-page-extra--sortable-handle', - items: '.js-sortable--page', - revert: 150, - scrollSpeed: 10, - update: this.updateOrder, - }); - } + this.disposers.add(core.reactTurbolinks.runAfterPageLoad(() => { + if (this.pages.current != null) { + $(this.pages.current).sortable({ + cursor: 'move', + handle: '.js-profile-page-extra--sortable-handle', + items: '.js-sortable--page', + revert: 150, + scrollSpeed: 10, + update: this.updateOrder, + }); + } - if (this.tabs.current != null) { - $(this.tabs.current).sortable({ - axis: 'x', - cursor: 'move', - disabled: !this.controller.withEdit, - items: '.js-sortable--tab', - revert: 150, - scrollSpeed: 0, - start: () => { - // Somehow click event still goes through when dragging. - // This prevents triggering onTabClick. - window.clearTimeout(this.timeouts.draggingTab); - this.draggingTab = true; - }, - stop: () => { - this.timeouts.draggingTab = window.setTimeout(() => this.draggingTab = false, 500); - }, - update: this.updateOrder, - }); - } + if (this.tabs.current != null) { + $(this.tabs.current).sortable({ + axis: 'x', + cursor: 'move', + disabled: !this.controller.withEdit, + items: '.js-sortable--tab', + revert: 150, + scrollSpeed: 0, + start: () => { + // Somehow click event still goes through when dragging. + // This prevents triggering onTabClick. + window.clearTimeout(this.timeouts.draggingTab); + this.draggingTab = true; + }, + stop: () => { + this.timeouts.draggingTab = window.setTimeout(() => this.draggingTab = false, 500); + }, + update: this.updateOrder, + }); + } + })); // preserve scroll if existing saved state but force position to reset // on refresh to avoid browser setting scroll position at the bottom on reload. From 5f5cf920ce01f2532610a1a91103b49e37cd0482 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 17 Dec 2024 19:12:25 +0900 Subject: [PATCH 30/44] Use casting class for forum timestamps --- app/Casts/TimestampOrZero.php | 27 +++++++++ .../BroadcastNotificationBase.php | 2 +- app/Models/Forum/Forum.php | 16 +----- app/Models/Forum/Post.php | 27 ++------- app/Models/Forum/Topic.php | 56 ++----------------- app/helpers.php | 21 ------- 6 files changed, 42 insertions(+), 107 deletions(-) create mode 100644 app/Casts/TimestampOrZero.php diff --git a/app/Casts/TimestampOrZero.php b/app/Casts/TimestampOrZero.php new file mode 100644 index 00000000000..7a65fcbf73c --- /dev/null +++ b/app/Casts/TimestampOrZero.php @@ -0,0 +1,27 @@ +. 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\Casts; + +use Carbon\Carbon; +use Illuminate\Contracts\Database\Eloquent\CastsAttributes; + +/** + * For columns which use unix timestamp as its value and repurpose 0 as null. + */ +class TimestampOrZero implements CastsAttributes +{ + public function get($model, string $key, $value, array $attributes) + { + return $value === null || $value === 0 ? null : Carbon::createFromTimestamp($value); + } + + public function set($model, string $key, $value, array $attributes) + { + return $value === null ? 0 : $value->getTimestamp(); + } +} diff --git a/app/Jobs/Notifications/BroadcastNotificationBase.php b/app/Jobs/Notifications/BroadcastNotificationBase.php index ad99dab6269..503b044fcd0 100644 --- a/app/Jobs/Notifications/BroadcastNotificationBase.php +++ b/app/Jobs/Notifications/BroadcastNotificationBase.php @@ -185,7 +185,7 @@ public function handle() $pushReceiverIds = []; $notification->getConnection()->transaction(function () use ($deliverySettings, $notification, &$pushReceiverIds) { - $timestamp = (string) $this->getTimestamp(); + $timestamp = $this->getTimestamp()->format('Y-m-d H:i:s'); $notificationId = $notification->getKey(); $tempUserNotification = new UserNotification(); diff --git a/app/Models/Forum/Forum.php b/app/Models/Forum/Forum.php index d8875ba8ec6..6fe0daed042 100644 --- a/app/Models/Forum/Forum.php +++ b/app/Models/Forum/Forum.php @@ -5,6 +5,7 @@ namespace App\Models\Forum; +use App\Casts\TimestampOrZero; use App\Models\User; use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; @@ -26,7 +27,7 @@ * @property string $forum_image * @property int $forum_last_post_id * @property string $forum_last_post_subject - * @property int $forum_last_post_time + * @property \Carbon\Carbon|null $forum_last_post_time * @property string $forum_last_poster_colour * @property int $forum_last_poster_id * @property string $forum_last_poster_name @@ -67,10 +68,9 @@ class Forum extends Model 'allow_topic_covers' => 'boolean', 'enable_indexing' => 'boolean', 'enable_sigs' => 'boolean', - 'forum_last_post_time' => 'datetime', + 'forum_last_post_time' => TimestampOrZero::class, 'moderator_groups' => 'array', ]; - protected $dateFormat = 'U'; protected $primaryKey = 'forum_id'; protected $table = 'phpbb_forums'; @@ -242,16 +242,6 @@ public function setForumLastPosterColourAttribute($value) $this->attributes['forum_last_poster_colour'] = ltrim($value, '#'); } - public function getForumLastPostTimeAttribute($value) - { - return get_time_or_null($value); - } - - public function setForumLastPostTimeAttribute($value) - { - $this->attributes['forum_last_post_time'] = get_timestamp_or_zero($value); - } - // feature forum shall have extra features like sorting and voting public function isFeatureForum() { diff --git a/app/Models/Forum/Post.php b/app/Models/Forum/Post.php index 3f1c04ee3cc..c133bde4d13 100644 --- a/app/Models/Forum/Post.php +++ b/app/Models/Forum/Post.php @@ -5,6 +5,7 @@ namespace App\Models\Forum; +use App\Casts\TimestampOrZero; use App\Exceptions\ModelNotSavedException; use App\Jobs\EsDocument; use App\Jobs\MarkNotificationsRead; @@ -48,7 +49,7 @@ * @property int $post_reported * @property string $post_subject * @property mixed $post_text - * @property int $post_time + * @property \Carbon\Carbon|null $post_time * @property string $post_username * @property int $poster_id * @property string $poster_ip @@ -81,8 +82,10 @@ class Post extends Model implements AfterCommit, Indexable, Traits\ReportableInt public $timestamps = false; protected $casts = [ - 'post_edit_locked' => 'boolean', 'post_approved' => 'boolean', + 'post_edit_locked' => 'boolean', + 'post_edit_time' => TimestampOrZero::class, + 'post_time' => TimestampOrZero::class, ]; private $normalizedUsers = []; @@ -156,26 +159,6 @@ public function getPostEditUserAttribute($value) } } - public function setPostTimeAttribute($value) - { - $this->attributes['post_time'] = get_timestamp_or_zero($value); - } - - public function getPostTimeAttribute($value) - { - return get_time_or_null($value); - } - - public function setPostEditTimeAttribute($value) - { - $this->attributes['post_edit_time'] = get_timestamp_or_zero($value); - } - - public function getPostEditTimeAttribute($value) - { - return get_time_or_null($value); - } - /** * Gets a preview of the post_text by stripping anything that * looks like bbcode or html. diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php index 2ad4fd54c62..1ba4dfd154c 100644 --- a/app/Models/Forum/Topic.php +++ b/app/Models/Forum/Topic.php @@ -5,6 +5,7 @@ namespace App\Models\Forum; +use App\Casts\TimestampOrZero; use App\Jobs\EsDocument; use App\Jobs\UpdateUserForumCache; use App\Jobs\UpdateUserForumTopicFollows; @@ -112,8 +113,13 @@ class Topic extends Model implements AfterCommit protected $casts = [ 'poll_hide_results' => 'boolean', + 'poll_last_vote' => TimestampOrZero::class, + 'poll_start' => TimestampOrZero::class, 'poll_vote_change' => 'boolean', 'topic_approved' => 'boolean', + 'topic_last_post_time' => TimestampOrZero::class, + 'topic_last_view_time' => TimestampOrZero::class, + 'topic_time' => TimestampOrZero::class, ]; public static function createNew($forum, $params, $poll = null) @@ -225,61 +231,11 @@ public function watches() return $this->hasMany(TopicWatch::class); } - public function getPollLastVoteAttribute($value) - { - return get_time_or_null($value); - } - - public function setPollLastVoteAttribute($value) - { - $this->attributes['poll_last_vote'] = get_timestamp_or_zero($value); - } - public function getPollLengthDaysAttribute() { return $this->attributes['poll_length'] / 86400; } - public function getPollStartAttribute($value) - { - return get_time_or_null($value); - } - - public function setPollStartAttribute($value) - { - $this->attributes['poll_start'] = get_timestamp_or_zero($value); - } - - public function getTopicLastPostTimeAttribute($value) - { - return get_time_or_null($value); - } - - public function setTopicLastPostTimeAttribute($value) - { - $this->attributes['topic_last_post_time'] = get_timestamp_or_zero($value); - } - - public function getTopicLastViewTimeAttribute($value) - { - return get_time_or_null($value); - } - - public function setTopicLastViewTimeAttribute($value) - { - $this->attributes['topic_last_view_time'] = get_timestamp_or_zero($value); - } - - public function getTopicTimeAttribute($value) - { - return get_time_or_null($value); - } - - public function setTopicTimeAttribute($value) - { - $this->attributes['topic_time'] = get_timestamp_or_zero($value); - } - public function getTopicFirstPosterColourAttribute($value) { if (present($value)) { diff --git a/app/helpers.php b/app/helpers.php index bff4c134915..81685d9c2bc 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1684,27 +1684,6 @@ function model_pluck($builder, $key, $class = null) return $result; } -/* - * Returns null if $timestamp is null or 0. - * Used for table which has not null constraints but accepts "empty" value (0). - */ -function get_time_or_null($timestamp) -{ - if ($timestamp !== 0) { - return parse_time_to_carbon($timestamp); - } -} - -/* - * Get unix timestamp of a DateTime (or Carbon\Carbon). - * Returns 0 if $time is null so mysql doesn't explode because of not null - * constraints. - */ -function get_timestamp_or_zero(DateTime $time = null): int -{ - return $time === null ? 0 : $time->getTimestamp(); -} - function null_if_false($value) { return $value === false ? null : $value; From 183967861f4a68dbcd182ae9325aa800d256a323 Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 17 Dec 2024 21:36:32 +0900 Subject: [PATCH 31/44] Adjust team description input area Add toolbar and lock the height. --- resources/css/bem/input-text.less | 12 ++++++++++++ .../css/bem/team-settings-description-preview.less | 2 +- resources/views/teams/edit.blade.php | 11 +++++++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/resources/css/bem/input-text.less b/resources/css/bem/input-text.less index 26555c9fd3d..c809fe8db09 100644 --- a/resources/css/bem/input-text.less +++ b/resources/css/bem/input-text.less @@ -10,4 +10,16 @@ padding: var(--input-padding); box-shadow: inset 0 0 0 2px var(--input-border-colour); border-radius: @border-radius-large; + + &--bbcode { + .fancy-scrollbar(); + display: grid; + grid-template-rows: 1fr auto; + gap: 5px; + } + + &__bbcode-textarea { + .reset-input(); + resize: none; + } } diff --git a/resources/css/bem/team-settings-description-preview.less b/resources/css/bem/team-settings-description-preview.less index f1c0b8481b2..2e78b7b8d33 100644 --- a/resources/css/bem/team-settings-description-preview.less +++ b/resources/css/bem/team-settings-description-preview.less @@ -4,5 +4,5 @@ .team-settings-description-preview { padding: 0 var(--padding); overflow-y: scroll; - max-height: calc(70 * var(--vh)); + height: calc(70 * var(--vh)); } diff --git a/resources/views/teams/edit.blade.php b/resources/views/teams/edit.blade.php index 7dd5a31fdec..91c57089f74 100644 --- a/resources/views/teams/edit.blade.php +++ b/resources/views/teams/edit.blade.php @@ -149,10 +149,13 @@ class="team-settings__image" {{ osu_trans('teams.edit.description.label') }} - +
+ + @include('forum._post_toolbar') +
From 7c2da5ac549edabac5a8c611d601c1fb76441cba Mon Sep 17 00:00:00 2001 From: nanaya Date: Tue, 17 Dec 2024 22:47:54 +0900 Subject: [PATCH 32/44] Trim username in all cases on login --- app/Models/User.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 737b66a56e6..dcee75bbedc 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2128,8 +2128,10 @@ public static function attemptLogin($user, $password, $ip = null) public static function findForLogin($username, $allowEmail = false) { - if (!present($username)) { - return; + $username = trim($username ?? ''); + + if ($username === null) { + return null; } $query = static::where('username', $username); From 65e1fe9b59ea9b8851a1db79fce308c4821613b5 Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 18 Dec 2024 17:50:02 +0900 Subject: [PATCH 33/44] Fix handling of deleted and restricted members --- app/Models/TeamMember.php | 9 +++++++++ resources/views/teams/members/index.blade.php | 13 ++++++++----- resources/views/teams/show.blade.php | 5 ++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/Models/TeamMember.php b/app/Models/TeamMember.php index d2510426fa1..84030ee2257 100644 --- a/app/Models/TeamMember.php +++ b/app/Models/TeamMember.php @@ -24,4 +24,13 @@ public function user(): BelongsTo { return $this->belongsTo(User::class, 'user_id'); } + + public function userOrDeleted(): User + { + $user = $this->user; + + return $user === null || $user->isRestricted() + ? new DeletedUser(['user_id' => $this->user_id]) + : $user; + } } diff --git a/resources/views/teams/members/index.blade.php b/resources/views/teams/members/index.blade.php index b470ff76f9d..cc549d03c58 100644 --- a/resources/views/teams/members/index.blade.php +++ b/resources/views/teams/members/index.blade.php @@ -24,23 +24,26 @@ {{ osu_trans('teams.members.index.table.joined_at') }} @foreach ($team->members as $member) + @php + $user = $member->userOrDeleted(); + @endphp
  • user->user_avatar) !!} + {!! background_image($user->user_avatar) !!} > - {!! link_to_user($member->user, null, '', []) !!} + {!! link_to_user($user, null, '', []) !!} - {{ osu_trans('teams.members.index.status.status_'.(int) $member->user->isActive()) }} - @if ($member->user->isOnline()) + {{ osu_trans('teams.members.index.status.status_'.(int) $user->isActive()) }} + @if ($user->isOnline()) ({!! osu_trans('users.show.lastvisit_online') !!}) - @elseif (($lastvisit = $member->user->displayed_last_visit) !== null) + @elseif (($lastvisit = $user->displayed_last_visit) !== null) ({!! osu_trans('users.show.lastvisit', ['date' => timeago($lastvisit)]) !!}) diff --git a/resources/views/teams/show.blade.php b/resources/views/teams/show.blade.php index ba1153f329c..45b1d84f37d 100644 --- a/resources/views/teams/show.blade.php +++ b/resources/views/teams/show.blade.php @@ -3,16 +3,15 @@ See the LICENCE file in the repository root for full licence text. --}} @php - use App\Models\DeletedUser; use App\Transformers\UserCompactTransformer; $userTransformer = new UserCompactTransformer(); $toJson = fn ($users) => json_collection($users, $userTransformer, UserCompactTransformer::CARD_INCLUDES); $teamMembers = array_map($toJson, $team->members->mapToGroups(fn ($member) => [ - $member->user_id === $team->leader_id ? 'leader' : 'member' => $member->user, + $member->user_id === $team->leader_id ? 'leader' : 'member' => $member->userOrDeleted(), ])->all()); $teamMembers['member'] ??= []; - $teamMembers['leader'] ??= $toJson([$team->leader ?? new DeletedUser(['user_id' => $team->leader_id])]); + $teamMembers['leader'] ??= $toJson([$team->members()->make(['user_id' => $team->leader_id])->userOrDeleted()]); $headerUrl = $team->header()->url(); @endphp From b70e5ccd8a71547eb6d90f6802cc385c9e9dba1e Mon Sep 17 00:00:00 2001 From: nanaya Date: Wed, 18 Dec 2024 19:59:01 +0900 Subject: [PATCH 34/44] Remove redundant container --- resources/views/teams/show.blade.php | 180 +++++++++++++-------------- 1 file changed, 89 insertions(+), 91 deletions(-) diff --git a/resources/views/teams/show.blade.php b/resources/views/teams/show.blade.php index 45b1d84f37d..7e8bd0e786c 100644 --- a/resources/views/teams/show.blade.php +++ b/resources/views/teams/show.blade.php @@ -25,114 +25,112 @@ 'backgroundImage' => $headerUrl, ]]) -
    -
    -
    -
    - @if (priv_check('TeamUpdate', $team)->can()) -
    - - - +
    +
    +
    + @if (priv_check('TeamUpdate', $team)->can()) +
    + + + - - - -
    - @endif -
    -
    -
    - @include('objects._flag_team', ['modifiers' => 'full', 'team' => $team]) + + +
    -
    -

    - {{ $team->name }} -

    -
    -

    - [{{ $team->short_name }}] -

    -
    + @endif +
    +
    +
    + @include('objects._flag_team', ['modifiers' => 'full', 'team' => $team]) +
    +
    +

    + {{ $team->name }} +

    +
    +

    + [{{ $team->short_name }}] +

    -