Skip to content

add !mp invite command #85

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
ILW8 merged 1 commit into from
May 18, 2025
Merged

add !mp invite command #85

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
71 changes: 71 additions & 0 deletions osu.Game/Online/Chat/StandAloneChatDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
using osu.Game.Online.Broadcasts;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Metadata;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms;
using osu.Game.Overlays.Chat;
Expand Down Expand Up @@ -62,6 +63,9 @@ public partial class StandAloneChatDisplay : CompositeDrawable
[Resolved]
protected IAPIProvider API { get; private set; } = null!;

[Resolved]
private MetadataClient metadataClient { get; set; } = null!;

[Resolved]
protected RulesetStore RulesetStore { get; private set; } = null!;

Expand All @@ -85,6 +89,8 @@ public partial class StandAloneChatDisplay : CompositeDrawable
[Resolved]
private OngoingOperationTracker operationTracker { get; set; } = null!;

// private GetUserRequest? userReq;

protected readonly ChatTextBox? TextBox;

private ChannelManager? channelManager;
Expand All @@ -106,6 +112,8 @@ public partial class StandAloneChatDisplay : CompositeDrawable
Value = 1250
};

private IDisposable? userWatchToken;

[Resolved(CanBeNull = true)] // not sure if it actually can be null
private ChatTimerHandler? chatTimerHandler { get; set; }

Expand Down Expand Up @@ -167,6 +175,13 @@ private void load(ChannelManager manager, BeatmapModelDownloader beatmaps, Beatm
Scheduler.Add(processMessageQueue);
}

protected override void LoadComplete()
{
base.LoadComplete();

userWatchToken = metadataClient.BeginWatchingUserPresence();
}

private void processMessageQueue()
{
lock (messageQueue)
Expand Down Expand Up @@ -305,6 +320,7 @@ protected override void Dispose(bool isDisposing)
return;

Scheduler.Add(() => broadcastServer.Remove(chatBroadcaster));
userWatchToken?.Dispose();
base.Dispose(isDisposing);
}

Expand Down Expand Up @@ -420,6 +436,11 @@ private void postMessage(TextBox sender, bool newText)
break;
}
}
// special-case player invites
else if (parts[2].StartsWith('#') && int.TryParse(parts[2].AsSpan(1), out numericParam) && parts[1] == @"invite")
{
inviteUserToRoom(numericParam);
}
else
{
switch (parts[1])
Expand All @@ -436,6 +457,38 @@ private void postMessage(TextBox sender, bool newText)

break;

case @"invite":
// // parameter is a username since it didn't start with `#`
// if (string.IsNullOrEmpty(parts[2]))
// {
// EnqueueBotMessage(@"Invalid username provided");
// break;
// }
//
// string username = parts[2].Replace('_', ' ');
//
// // check if user is already in the lobby
// var matchingUser = Client.Room?.Users.FirstOrDefault(u => string.Equals(u.User?.Username, username, StringComparison.OrdinalIgnoreCase));
//
// if (matchingUser != null)
// {
// EnqueueBotMessage($@"User {matchingUser.User?.Username ?? ""} is already in the room!");
// break;
// }
//
// // try to resolve the username
// userReq?.Cancel();
// userReq = new GetUserRequest(username);
// userReq.Success += u => inviteUserToRoom(u.Id);
// userReq.Failure += e =>
// {
// EnqueueBotMessage($@"Couldn't find user {username}: {e.InnerException?.Message}");
// };
//
// API.Queue(userReq);
EnqueueBotMessage("use their user IDs from the sheets please kthx");
break;

case @"mods":
var itemToEdit = Client.Room?.Playlist.SingleOrDefault(i => i.ID == Client.Room?.Settings.PlaylistItemId);

Expand Down Expand Up @@ -616,6 +669,24 @@ private void postMessage(TextBox sender, bool newText)
TextBox.Text = string.Empty;
}

private void inviteUserToRoom(int userId)
{
var matchingUser = Client.Room?.Users.FirstOrDefault(u => u.UserID == userId);

if (matchingUser != null)
{
EnqueueBotMessage($@"User {matchingUser.User?.Username ?? $@"ID {matchingUser.UserID}"} is already in the room!");
return;
}

// It's possible the user isn't truly offline, so send the invite anyway. Warn the user in chat though.
EnqueueBotMessage(metadataClient.GetPresence(userId) == null
? $@"User ID {userId} may be offline, attempting to send an invite anyway."
: $@"Sent an invite to user ID {userId}");

Client.InvitePlayer(userId);
}

private async Task postLatestResults(long roomID, PlaylistItem? playlistItem)
{
if (playlistItem == null) return;
Expand Down