Skip to content
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

Jump to bottom

Fix discord RPC errors in multiplayer #27728

Merged
merged 4 commits into from Mar 26, 2024
Merged

Fix discord RPC errors in multiplayer #27728

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3db88fb
Use less confusing message format when logging discord errors
bdach Mar 25, 2024
e95f29c
Rename `updatePresence() => schedulePresenceUpdate()`
bdach Mar 25, 2024
a398754
Merge all presence methods into one
bdach Mar 25, 2024
53c3aec
Fix discord RPC errors in multiplayer
bdach Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 18 additions & 21 deletions osu.Desktop/DiscordRichPresence.cs
View file
Open in desktop
Expand Up @@ -75,7 +75,7 @@ private void load(OsuConfigManager config)
};

client.OnReady += onReady;
client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network, LogLevel.Error);
client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Message} ({e.Code})", LoggingTarget.Network, LogLevel.Error);

// A URI scheme is required to support game invitations, as well as informing Discord of the game executable path to support launching the game when a user clicks on join/spectate.
client.RegisterUriScheme();
Expand All @@ -94,10 +94,10 @@ private void load(OsuConfigManager config)
activity.BindTo(u.NewValue.Activity);
}, true);

ruleset.BindValueChanged(_ => updatePresence());
status.BindValueChanged(_ => updatePresence());
activity.BindValueChanged(_ => updatePresence());
privacyMode.BindValueChanged(_ => updatePresence());
ruleset.BindValueChanged(_ => schedulePresenceUpdate());
status.BindValueChanged(_ => schedulePresenceUpdate());
activity.BindValueChanged(_ => schedulePresenceUpdate());
privacyMode.BindValueChanged(_ => schedulePresenceUpdate());
multiplayerClient.RoomUpdated += onRoomUpdated;

client.Initialize();
Expand All @@ -111,14 +111,14 @@ private void onReady(object _, ReadyMessage __)
if (client.CurrentPresence != null)
client.SetPresence(null);

updatePresence();
schedulePresenceUpdate();
}

private void onRoomUpdated() => updatePresence();
private void onRoomUpdated() => schedulePresenceUpdate();

private ScheduledDelegate? presenceUpdateDelegate;

private void updatePresence()
private void schedulePresenceUpdate()
{
presenceUpdateDelegate?.Cancel();
presenceUpdateDelegate = Scheduler.AddDelayed(() =>
Expand All @@ -134,16 +134,14 @@ private void updatePresence()

bool hideIdentifiableInformation = privacyMode.Value == DiscordRichPresenceMode.Limited || status.Value == UserStatus.DoNotDisturb;

updatePresenceStatus(hideIdentifiableInformation);
updatePresenceParty(hideIdentifiableInformation);
updatePresenceAssets();

updatePresence(hideIdentifiableInformation);
client.SetPresence(presence);
}, 200);
}

private void updatePresenceStatus(bool hideIdentifiableInformation)
private void updatePresence(bool hideIdentifiableInformation)
{
// user activity
if (activity.Value != null)
{
presence.State = truncate(activity.Value.GetStatus(hideIdentifiableInformation));
Expand All @@ -170,10 +168,8 @@ private void updatePresenceStatus(bool hideIdentifiableInformation)
presence.State = "Idle";
presence.Details = string.Empty;
}
}

private void updatePresenceParty(bool hideIdentifiableInformation)
{
// user party
if (!hideIdentifiableInformation && multiplayerClient.Room != null)
{
MultiplayerRoom room = multiplayerClient.Room;
Expand All @@ -195,17 +191,18 @@ private void updatePresenceParty(bool hideIdentifiableInformation)
};

presence.Secrets.JoinSecret = JsonConvert.SerializeObject(roomSecret);
// discord cannot handle both secrets and buttons at the same time, so we need to choose something.
// the multiplayer room seems more important.
presence.Buttons = null;
}
else
{
presence.Party = null;
presence.Secrets.JoinSecret = null;
}
}

private void updatePresenceAssets()
{
// update user information
// game images:
// large image tooltip
if (privacyMode.Value == DiscordRichPresenceMode.Limited)
presence.Assets.LargeImageText = string.Empty;
else
Expand All @@ -216,7 +213,7 @@ private void updatePresenceAssets()
presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
}

// update ruleset
// small image
presence.Assets.SmallImageKey = ruleset.Value.IsLegacyRuleset() ? $"mode_{ruleset.Value.OnlineID}" : "mode_custom";
presence.Assets.SmallImageText = ruleset.Value.Name;
}
Expand Down