h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 18:03:11 +08:00
Code Issues Releases Wiki Activity

Merge pull request #29363 from peppy/fix-daily-challenge-notification-spam

Browse Source 
Fix daily challenge notification spam
This commit is contained in:
Bartłomiej Dach 2024-08-12 12:18:38 +02:00 committed by GitHub
commit 92bd123ebc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
View File

@ -48,6 +48,7 @@ namespace osu.Game.Tests.Visual.Menus
{ {
new PlaylistItem(beatmap) new PlaylistItem(beatmap)
}, },
StartDate = { Value = DateTimeOffset.Now.AddMinutes(-30) },
EndDate = { Value = DateTimeOffset.Now.AddSeconds(60) } EndDate = { Value = DateTimeOffset.Now.AddSeconds(60) }
}); });
return true; return true;

10
osu.Game.Tests/Visual/UserInterface/TestSceneMainMenuButton.cs
View File

@ -58,6 +58,7 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
new PlaylistItem(beatmap) new PlaylistItem(beatmap)
}, },
StartDate = { Value = DateTimeOffset.Now.AddMinutes(-5) },
EndDate = { Value = DateTimeOffset.Now.AddSeconds(30) } EndDate = { Value = DateTimeOffset.Now.AddSeconds(30) }
}); });
return true; return true;
@ -95,8 +96,13 @@ namespace osu.Game.Tests.Visual.UserInterface
}, },
}; };
}); });
AddAssert("no notification posted", () => notificationOverlay.AllNotifications.Count(), () => Is.Zero); AddAssert("notification posted", () => notificationOverlay.AllNotifications.Count(), () => Is.EqualTo(1));
AddStep("clear notifications", () =>
{
foreach (var notification in notificationOverlay.AllNotifications)
notification.Close(runFlingAnimation: false);
});
AddStep("beatmap of the day not active", () => metadataClient.DailyChallengeUpdated(null)); AddStep("beatmap of the day not active", () => metadataClient.DailyChallengeUpdated(null));
AddAssert("no notification posted", () => notificationOverlay.AllNotifications.Count(), () => Is.Zero); AddAssert("no notification posted", () => notificationOverlay.AllNotifications.Count(), () => Is.Zero);
@ -105,7 +111,7 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
RoomID = 1234, RoomID = 1234,
})); }));
AddAssert("notification posted", () => notificationOverlay.AllNotifications.Count(), () => Is.EqualTo(1)); AddAssert("no notification posted", () => notificationOverlay.AllNotifications.Count(), () => Is.Zero);
} }
} }
} }

15
osu.Game/Screens/Menu/DailyChallengeButton.cs
View File

@ -104,8 +104,7 @@ namespace osu.Game.Screens.Menu
{ {
base.LoadComplete(); base.LoadComplete();
info.BindValueChanged(_ => dailyChallengeChanged(postNotification: true)); info.BindValueChanged(dailyChallengeChanged, true);
dailyChallengeChanged(postNotification: false);
} }
protected override void Update() protected override void Update()
@ -131,7 +130,9 @@ namespace osu.Game.Screens.Menu
} }
} }
private void dailyChallengeChanged(bool postNotification) private long? lastNotifiedDailyChallengeRoomId;
private void dailyChallengeChanged(ValueChangedEvent<DailyChallengeInfo?> _)
{ {
UpdateState(); UpdateState();
@ -152,8 +153,14 @@ namespace osu.Game.Screens.Menu
Room = room; Room = room;
cover.OnlineInfo = TooltipContent = room.Playlist.FirstOrDefault()?.Beatmap.BeatmapSet as APIBeatmapSet; cover.OnlineInfo = TooltipContent = room.Playlist.FirstOrDefault()?.Beatmap.BeatmapSet as APIBeatmapSet;
if (postNotification) // We only want to notify the user if a new challenge recently went live.
if (room.StartDate.Value != null
&& Math.Abs((DateTimeOffset.Now - room.StartDate.Value!.Value).TotalSeconds) < 1800
&& room.RoomID.Value != lastNotifiedDailyChallengeRoomId)
{
lastNotifiedDailyChallengeRoomId = room.RoomID.Value;
notificationOverlay?.Post(new NewDailyChallengeNotification(room)); notificationOverlay?.Post(new NewDailyChallengeNotification(room));
}
updateCountdown(); updateCountdown();
Scheduler.AddDelayed(updateCountdown, 1000, true); Scheduler.AddDelayed(updateCountdown, 1000, true);