Skip to content

Adjust vote-to-skip messaging flow to be explicit about states #35909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdach merged 1 commit into from
Dec 9, 2025
Merged

Adjust vote-to-skip messaging flow to be explicit about states #35909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu.Game/Online/Multiplayer/IMultiplayerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public interface IMultiplayerClient : IStatefulUserHubClient
/// <summary>
/// Signals that a user has requested to skip the beatmap intro.
/// </summary>
Task UserVotedToSkipIntro(int userId);
Task UserVotedToSkipIntro(int userId, bool voted);

/// <summary>
/// Signals that the vote to skip the beatmap intro has passed.
Expand Down
13 changes: 4 additions & 9 deletions osu.Game/Online/Multiplayer/MultiplayerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public abstract partial class MultiplayerClient : Component, IMultiplayerClient,
public event Action<int, long>? MatchmakingItemDeselected;
public event Action<MatchRoomState>? MatchRoomStateChanged;

public event Action<int>? UserVotedToSkipIntro;
public event Action<int, bool>? UserVotedToSkipIntro;
public event Action? VoteToSkipIntroPassed;

public event Action<MultiplayerRoomUser, BeatmapAvailability>? BeatmapAvailabilityChanged;
Expand Down Expand Up @@ -854,10 +854,6 @@ Task IMultiplayerClient.GameplayStarted()
handleRoomRequest(() =>
{
Debug.Assert(Room != null);

foreach (var user in Room.Users)
user.VotedToSkipIntro = false;

GameplayStarted?.Invoke();
});

Expand Down Expand Up @@ -928,7 +924,7 @@ public Task PlaylistItemChanged(MultiplayerPlaylistItem item)
return Task.CompletedTask;
}

Task IMultiplayerClient.UserVotedToSkipIntro(int userId)
Task IMultiplayerClient.UserVotedToSkipIntro(int userId, bool voted)
{
handleRoomRequest(() =>
{
Expand All @@ -940,9 +936,8 @@ Task IMultiplayerClient.UserVotedToSkipIntro(int userId)
if (user == null)
return;

user.VotedToSkipIntro = true;

UserVotedToSkipIntro?.Invoke(userId);
user.VotedToSkipIntro = voted;
UserVotedToSkipIntro?.Invoke(userId, voted);
});

return Task.CompletedTask;
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void load(IAPIProvider api)
connection.On<MultiplayerPlaylistItem>(nameof(IMultiplayerClient.PlaylistItemAdded), ((IMultiplayerClient)this).PlaylistItemAdded);
connection.On<long>(nameof(IMultiplayerClient.PlaylistItemRemoved), ((IMultiplayerClient)this).PlaylistItemRemoved);
connection.On<MultiplayerPlaylistItem>(nameof(IMultiplayerClient.PlaylistItemChanged), ((IMultiplayerClient)this).PlaylistItemChanged);
connection.On<int>(nameof(IMultiplayerClient.UserVotedToSkipIntro), ((IMultiplayerClient)this).UserVotedToSkipIntro);
connection.On<int, bool>(nameof(IMultiplayerClient.UserVotedToSkipIntro), ((IMultiplayerClient)this).UserVotedToSkipIntro);
connection.On(nameof(IMultiplayerClient.VoteToSkipIntroPassed), ((IMultiplayerClient)this).VoteToSkipIntroPassed);

connection.On(nameof(IMatchmakingClient.MatchmakingQueueJoined), ((IMatchmakingClient)this).MatchmakingQueueJoined);
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerSkipOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected override void LoadComplete()

private void onUserStateChanged(MultiplayerRoomUser user, MultiplayerUserState state) => Schedule(updateCount);

private void onUserVotedToSkipIntro(int userId) => Schedule(() =>
private void onUserVotedToSkipIntro(int userId, bool voted) => Schedule(() =>
{
FadingContent.TriggerShow();
updateCount();
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ public override Task VoteToSkipIntro()

public async Task UserVoteToSkipIntro(int userId)
{
await ((IMultiplayerClient)this).UserVotedToSkipIntro(userId).ConfigureAwait(false);
await ((IMultiplayerClient)this).UserVotedToSkipIntro(userId, true).ConfigureAwait(false);
}

protected override Task<MultiplayerRoom> CreateRoomInternal(MultiplayerRoom room)
Expand Down
Loading