Support multiple mappers on beatmap difficulties #11377

notbakaneko · 2024-07-30T16:08:24Z

Also refactors out the username input/search thing a separate component

fix some display consistency things.
missing users should still be in response.
preserve existing guest mapper even if missing or restricted when updating.
user profile page 🤔
Refactor username input lookup component #11451

notbakaneko · 2024-08-08T00:26:25Z

I'm thinking all the *Owner should be renamed *Mapper to be consistent, but then there's the existing beatmap events which uses *owner...

nanaya · 2024-08-08T13:14:54Z

can try renaming the events...

nanaya

decide on either mapper or owner name; not both
split the user lookup change to its own pr (and combine with checkUsernameExists while at it)

nanaya · 2024-09-02T13:08:12Z

can use a merge conflict fix

notbakaneko · 2024-09-06T06:56:19Z

Not sure renaming to mappers is a great idea now that I've gotten to the event itself, but using mapper for the display text at least seems to make more sense than owner...

…ename

notbakaneko · 2024-09-13T11:33:32Z

Should be no new introduction of mapper instead of owner now, I think (I left the existing ones alone) 🤔

nanaya

part 1?

nanaya · 2024-09-30T11:54:37Z

app/Libraries/Beatmapset/ChangeBeatmapOwners.php

+
+            // TODO: use select instead (needs newer laravel)
+            $newUsers = $this->beatmap->owners->map(
+                fn ($user) => ['id' => $user->user_id, 'username' => ($user ?? new DeletedUser())->username],


wouldn't the ->user_id (->getKey()?) fail if $user is null?

nanaya · 2024-09-30T11:57:29Z

app/Libraries/Beatmapset/ChangeBeatmapOwners.php

+
+            $this->beatmap->refresh();
+
+            // TODO: use select instead (needs newer laravel)


how would the deleted user username fallback work with select though?

nanaya · 2024-09-30T12:02:52Z

app/Libraries/Beatmapset/ChangeBeatmapOwners.php

+        }
+
+        $this->beatmap->getConnection()->transaction(function () {
+            $userIds = $this->userIds->toArray();


why not iterate over the set itself? (or even straight out map)

nanaya · 2024-09-30T12:08:40Z

app/Models/Beatmap.php

-
-        $this->fill(['user_id' => $newUserId])->saveOrExplode();
-        $this->beatmapset->update(['eligible_main_rulesets' => null]);
+        (new ChangeBeatmapOwners($this, $newUserIds, $source))->handle();


is it all that useful over just using the class directly

nanaya · 2024-10-01T06:08:13Z

app/Models/User.php

@@ -2247,7 +2248,9 @@ public function profileBeatmapsetsGuest()
        return Beatmapset
            ::where('user_id', '<>', $this->getKey())
            ->whereHas('beatmaps', function (Builder $query) {
-                $query->scoreable()->where('user_id', $this->getKey());
+                $query->scoreable()->whereHas('beatmapOwners', function (Builder $ownerQuery) {


use fn (...) => ?

nanaya · 2024-10-01T06:58:35Z

resources/js/beatmap-discussions/beatmap-owner.tsx

+  render() {
+    return (
+      <div className='beatmap-owner'>
+        <UserLink className='beatmap-owner__user' user={this.props.user}>


misclicking this when trying to remove a user and losing all unsaved changes is rather annoying

also the card popup occasionally gets in the way

nanaya · 2024-10-01T08:33:00Z

resources/js/utils/beatmap-helper.ts

@@ -99,6 +100,10 @@ export function group<T extends BeatmapJson>(beatmaps?: T[] | null, includeEmpty
  return ret;
 }

+export function hasGuestOwners(beatmap: BeatmapJson, beatmapset: BeatmapsetJson) {
+  return beatmap.owners?.some((owner) => owner.id !== beatmapset.user_id);


is it not weird to return undefined if the field isn't included?

nanaya · 2024-10-01T09:37:29Z

resources/css/bem/input-container.less

+    --input-bg: hsl(var(--hsl-b6));
+
+    flex-direction: row;
+    padding: 0;


not sure if this one but some padding would be nice

nanaya · 2024-10-01T09:39:46Z

app/Libraries/Beatmapset/ChangeBeatmapOwners.php

+    {
+        priv_check_user($source, 'BeatmapUpdateOwner', $beatmap->beatmapset)->ensureCan();
+
+        $this->userIds = new Set($newUserIds);


some kind of limit would be useful

nanaya · 2024-10-01T10:19:07Z

resources/css/bem/beatmap-owner.less

+
+    border-radius: 50%;
+    display: flex;
+    aspect-ratio: 1;


this doesn't seem to be doing anything. the box needs to be a bit wider first

nanaya · 2024-10-02T05:32:50Z

resources/css/bem/beatmap-owner-editor.less

-    padding: 1px 3px;
-    width: auto;
-    border: 2px solid transparent;
+  &__owners {


can use some wrapping and more gap between avatar and previous user

notbakaneko added 30 commits July 29, 2024 17:58

support multiple owners on beatmap

55dbc21

update phpdoc

c3ee82a

allow array param

72b80d7

extract username input with lookup into component

5c697f4

xhr error doesn't contain responseText when aborted

c93753a

initialize directly

1195c44

add option to ignore current user

43d9dbc

support updating to multiple beatmap owners

79adc14

show in events

825a01a

only prepend for compatiblity if not already there.

498e3c7

wrong condition

2da23ff

show multiple mappers

5655d38

add mappers to beatmap for score

716957d

filtering mappers

f9706cf

should be id

e371792

show multiple users on owner editor

0042a94

include avatar, also correct fields

93a51de

component for multiple UserLink

fdaede5

add hasGuestMapper helper, remove unused imports

696a102

update typings

50b8c6d

handle enter key

fdbd894

styling

926ee77

custom render for valid usernames

eb4e738

handle removing users from list

ad768a5

move key

6b9ab68

define minimum user properties

5bb4a44

use own block style

86dfd22

separate mapper name component

581259a

initialize with users without looking up

6ec895d

just use UserJson so we don't have to handle UserCardBrick differently

187306d

notbakaneko added 2 commits August 2, 2024 18:28

fix indentation

384d0b2

also create BeatmapOwner

de8de24

peppy requested a review from nanaya August 7, 2024 02:13

notbakaneko added 2 commits August 8, 2024 09:28

unused relation

198e59a

Merge branch 'master' into feature/beatmaps-multiple-mappers

1f31a9d

nanaya requested changes Aug 13, 2024

View reviewed changes

notbakaneko mentioned this pull request Aug 26, 2024

Refactor username input lookup component #11451

Merged

notbakaneko added 2 commits September 12, 2024 15:42

fix reset button disabled state

620c1f7

Merge branch 'master' into feature/beatmaps-multiple-mappers-revert-r…

100f320

…ename

notbakaneko force-pushed the feature/beatmaps-multiple-mappers branch from d8cdf20 to 1f31a9d Compare September 12, 2024 08:17

notbakaneko added 4 commits September 13, 2024 18:05

rename to owners

de0841e

rename setOwner to setOwners

a24d80b

rename includes and json property to owners

2a475b3

rename to beatmap-owner

d587edb

notbakaneko force-pushed the feature/beatmaps-multiple-mappers branch from 9e11108 to d587edb Compare September 13, 2024 11:07

notbakaneko added 6 commits September 13, 2024 20:11

rename to hasGuestOwners

2afa074

rename css elass

c7d6d02

more renames

9a63743

forgot to rename the other elements...

ef1721a

rename handler

0de28c1

Merge branch 'master' into feature/beatmaps-multiple-mappers

0e306c3

lint fix

0601e19

peppy requested a review from nanaya September 27, 2024 08:44

nanaya requested changes Oct 1, 2024

View reviewed changes

nanaya reviewed Oct 2, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support multiple mappers on beatmap difficulties #11377

Support multiple mappers on beatmap difficulties #11377

notbakaneko commented Jul 30, 2024 •

edited by peppy

Loading

notbakaneko commented Aug 8, 2024

nanaya commented Aug 8, 2024

nanaya left a comment •

edited

Loading

nanaya commented Sep 2, 2024

notbakaneko commented Sep 6, 2024

notbakaneko commented Sep 13, 2024 •

edited

Loading

nanaya left a comment

nanaya Sep 30, 2024

nanaya Sep 30, 2024

nanaya Sep 30, 2024

nanaya Sep 30, 2024

nanaya Oct 1, 2024

nanaya Oct 1, 2024

nanaya Oct 1, 2024

nanaya Oct 1, 2024

nanaya Oct 1, 2024

nanaya Oct 1, 2024

nanaya Oct 2, 2024


		$this->beatmap->refresh();

		// TODO: use select instead (needs newer laravel)

Support multiple mappers on beatmap difficulties #11377

Are you sure you want to change the base?

Support multiple mappers on beatmap difficulties #11377

Conversation

notbakaneko commented Jul 30, 2024 • edited by peppy Loading

notbakaneko commented Aug 8, 2024

nanaya commented Aug 8, 2024

nanaya left a comment • edited Loading

Choose a reason for hiding this comment

nanaya commented Sep 2, 2024

notbakaneko commented Sep 6, 2024

notbakaneko commented Sep 13, 2024 • edited Loading

nanaya left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

notbakaneko commented Jul 30, 2024 •

edited by peppy

Loading

nanaya left a comment •

edited

Loading

notbakaneko commented Sep 13, 2024 •

edited

Loading