h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 19:27:24 +08:00
Code Issues Releases Wiki Activity

Merge pull request #27440 from peppy/hide-beatmap-details

Browse Source 
When discord is set to privacy mode, don't show beatmap being edited
This commit is contained in:
Salman Ahmed 2024-03-01 16:48:33 +03:00 committed by GitHub
commit b5ee8cc323
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
View File

@ -14,7 +14,6 @@ using osu.Game.Beatmaps;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Tests.Beatmaps; using osu.Game.Tests.Beatmaps;
using osu.Game.Users; using osu.Game.Users;
@ -142,7 +141,7 @@ namespace osu.Game.Tests.Visual.Online
AddStep("choosing", () => activity.Value = new UserActivity.ChoosingBeatmap()); AddStep("choosing", () => activity.Value = new UserActivity.ChoosingBeatmap());
AddStep("editing beatmap", () => activity.Value = new UserActivity.EditingBeatmap(new BeatmapInfo())); AddStep("editing beatmap", () => activity.Value = new UserActivity.EditingBeatmap(new BeatmapInfo()));
AddStep("modding beatmap", () => activity.Value = new UserActivity.ModdingBeatmap(new BeatmapInfo())); AddStep("modding beatmap", () => activity.Value = new UserActivity.ModdingBeatmap(new BeatmapInfo()));
AddStep("testing beatmap", () => activity.Value = new UserActivity.TestingBeatmap(new BeatmapInfo(), new OsuRuleset().RulesetInfo)); AddStep("testing beatmap", () => activity.Value = new UserActivity.TestingBeatmap(new BeatmapInfo()));
} }
[Test] [Test]

2
osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.Edit.GameplayTest
private readonly Editor editor; private readonly Editor editor;
private readonly EditorState editorState; private readonly EditorState editorState;
protected override UserActivity InitialActivity => new UserActivity.TestingBeatmap(Beatmap.Value.BeatmapInfo, Ruleset.Value); protected override UserActivity InitialActivity => new UserActivity.TestingBeatmap(Beatmap.Value.BeatmapInfo);
[Resolved] [Resolved]
private MusicController musicController { get; set; } = null!; private MusicController musicController { get; set; } = null!;

12
osu.Game/Users/UserActivity.cs
View File

@ -119,10 +119,10 @@ namespace osu.Game.Users
} }
[MessagePackObject] [MessagePackObject]
public class TestingBeatmap : InGame public class TestingBeatmap : EditingBeatmap
{ {
public TestingBeatmap(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset) public TestingBeatmap(IBeatmapInfo beatmapInfo)
: base(beatmapInfo, ruleset) : base(beatmapInfo)
{ {
} }
@ -151,7 +151,11 @@ namespace osu.Game.Users
public EditingBeatmap() { } public EditingBeatmap() { }
public override string GetStatus(bool hideIdentifiableInformation = false) => @"Editing a beatmap"; public override string GetStatus(bool hideIdentifiableInformation = false) => @"Editing a beatmap";
public override string GetDetails(bool hideIdentifiableInformation = false) => BeatmapDisplayTitle;
public override string GetDetails(bool hideIdentifiableInformation = false) => hideIdentifiableInformation
// For now let's assume that showing the beatmap a user is editing could reveal unwanted information.
? string.Empty
: BeatmapDisplayTitle;
} }
[MessagePackObject] [MessagePackObject]