h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 16:13:34 +08:00
Code Issues Releases Wiki Activity

Refactor room secret handling to use JSON

Browse Source 
Also log room secrets for debugging purposes
This commit is contained in:
jvyden 2024-03-05 18:15:53 -05:00
parent cceb616a18
commit b53777c2a4
No known key found for this signature in database
GPG Key ID: 18BCF2BE0262B278
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Desktop/DiscordRichPresence.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Text;
using DiscordRPC;
using DiscordRPC.Message;
using Newtonsoft.Json;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -147,7 +148,13 @@ namespace osu.Desktop
Size = room.Users.Count,
};
presence.Secrets.JoinSecret = $"{room.RoomID}:{room.Settings.Password}";
RoomSecret roomSecret = new RoomSecret
{
RoomID = room.RoomID,
Password = room.Settings.Password,
};
presence.Secrets.JoinSecret = JsonConvert.SerializeObject(roomSecret);
}
else
{
@ -182,9 +189,13 @@ namespace osu.Desktop
private void onJoin(object sender, JoinMessage args)
{
game.Window?.Raise();
Logger.Log($"Received room secret from Discord RPC Client: {args.Secret}", LoggingTarget.Network, LogLevel.Debug);
if (!tryParseRoomSecret(args.Secret, out long roomId, out string? password))
{
Logger.Log("Could not parse room from Discord RPC Client", LoggingTarget.Network, LogLevel.Important);
return;
}
var request = new GetRoomRequest(roomId);
request.Success += room => Schedule(() =>
@ -216,21 +227,26 @@ namespace osu.Desktop
});
}
private static bool tryParseRoomSecret(ReadOnlySpan<char> secret, out long roomId, out string? password)
private static bool tryParseRoomSecret(string secretJson, out long roomId, out string? password)
{
roomId = 0;
password = null;
int roomSecretSplitIndex = secret.IndexOf(':');
RoomSecret? roomSecret;
if (roomSecretSplitIndex == -1)
try
{
roomSecret = JsonConvert.DeserializeObject<RoomSecret>(secretJson);
}
catch
{
return false;
}
if (!long.TryParse(secret[..roomSecretSplitIndex], out roomId))
return false;
if (roomSecret == null) return false;
password = secret[(roomSecretSplitIndex + 1)..].ToString();
if (password.Length == 0) password = null;
roomId = roomSecret.RoomID;
password = roomSecret.Password;
return true;
}
@ -254,5 +270,14 @@ namespace osu.Desktop
client.Dispose();
base.Dispose(isDisposing);
}
private class RoomSecret
{
[JsonProperty(@"roomId", Required = Required.Always)]
public long RoomID { get; set; }
[JsonProperty(@"password", Required = Required.AllowNull)]
public string? Password { get; set; }
}
}
}