Notify a user when their highscore is beaten

ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs

@@ -1,10 +1,11 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Database;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
 using LBPUnion.ProjectLighthouse.StorableLists.Stores;
 using LBPUnion.ProjectLighthouse.Types.Entities.Level;
+using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
 using LBPUnion.ProjectLighthouse.Types.Entities.Token;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using LBPUnion.ProjectLighthouse.Types.Logging;
@@ -24,7 +25,7 @@
 {
     private readonly DatabaseContext database;
 
     public ScoreController(DatabaseContext database)
     {
         this.database = database;
     }
@@ -33,7 +34,7 @@
     {
         UserFriendData? store = UserFriendStore.GetUserFriendData(userId);
         List<int>? friendIds = store?.FriendIds;
         friendIds ??= new List<int>();
         friendIds.Add(userId);
 
         return friendIds.Distinct().ToArray();
@@ -63,7 +64,7 @@
         // Workaround for parsing player ids of versus levels
         if (score.PlayerIds.Length == 1)
         {
             char[] delimiters = { ':', ',', };
             score.PlayerIds = score.PlayerIds[0].Split(delimiters).Distinct().ToArray();
         }
 
@@ -159,7 +160,7 @@
 
         await this.database.SaveChangesAsync();
 
-        return this.Ok(await this.GetScores(new LeaderboardOptions
+        ScoreboardResponse scores = await this.GetScores(new LeaderboardOptions
         {
             RootName = "scoreboardSegment",
             PageSize = 5,
@@ -169,7 +170,17 @@
             ScoreType = score.Type,
             TargetUser = token.UserId,
             TargetPlayerIds = null,
-        })); 
+        });
+
+        if (score.Type == 1 && scores.YourRank == 1 && scores.Total > 1)
+        {
+            GameScore? second = scores.Scores[1];
+            UserEntity? user = await this.database.UserFromGameToken(token);
+
+            await this.database.SendNotification(second.UserId, $"{user?.InfoXml} beat your highscore (<em>{second.Points}</em>) on {slot.InfoXml} with a score of <em>{score.Points}</em>.", true);
+        }
+
+        return this.Ok(scores); 
     }
 
     [HttpGet("scoreboard/{slotType}/{id:int}")]
@@ -191,7 +202,7 @@
         };
         if (!HttpMethods.IsPost(this.Request.Method))
         {
             List<PlayerScoreboardResponse> scoreboardResponses = new();
             for (int i = 1; i <= 4; i++)
             {
                 options.ScoreType = i;

ProjectLighthouse/Database/DatabaseContext.Notifications.cs

@@ -15,9 +15,10 @@ public partial class DatabaseContext
     /// </summary>
     /// <param name="userId">The user ID of the target user.</param>
     /// <param name="text">The message to send.</param>
+    /// <param name="prefix">Prepend server name/timestamp.</param>
     /// <param name="type">The <see cref="NotificationType"/> for the notification. Defaults to <c>ModerationNotification</c>.</param>
     public async Task SendNotification
-        (int userId, string text, NotificationType type = NotificationType.ModerationNotification)
+        (int userId, string text, bool prefix = true, NotificationType type = NotificationType.ModerationNotification)
     {
         if (!await this.Users.AnyAsync(u => u.UserId == userId))
         {
@@ -31,15 +32,19 @@ public async Task SendNotification
 
         StringBuilder builder = new(text);
 
-        // Prepend server name to notification text if enabled
-        if (ServerConfiguration.Instance.NotificationConfiguration.ShowServerNameInText)
+        if (prefix)
         {
-            builder.Insert(0, $"[{ServerConfiguration.Instance.Customization.ServerName}] ");
-        }
-        // Prepend timestamp to notification text if enabled
-        if (ServerConfiguration.Instance.NotificationConfiguration.ShowTimestampInText)
-        {
-            builder.Insert(0, $"[{DateTime.Now:g}] ");
+            // Prepend server name to notification text if enabled
+            if (ServerConfiguration.Instance.NotificationConfiguration.ShowServerNameInText)
+            {
+                builder.Insert(0, $"[{ServerConfiguration.Instance.Customization.ServerName}] ");
+            }
+
+            // Prepend timestamp to notification text if enabled
+            if (ServerConfiguration.Instance.NotificationConfiguration.ShowTimestampInText)
+            {
+                builder.Insert(0, $"[{DateTime.Now:g}] ");
+            }
         }
 
         NotificationEntity notification = new()

ProjectLighthouse/Types/Entities/Level/SlotEntity.cs

@@ -17,28 +17,31 @@
 public class SlotEntity
 {
     [Key]
     public int SlotId { get; set; }
 
     public int InternalSlotId { get; set; }
 
     public SlotType Type { get; set; } = SlotType.User;
 
     public string Name { get; set; } = "";
 
     public string Description { get; set; } = "";
 
     public string IconHash { get; set; } = "";
 
+    [NotMapped]
+    public string InfoXml => $"<slot type=\"{this.Type}\" id=\"{this.SlotId}\" icon=\"{this.IconHash}\">{this.Name}</slot>";
+
     public bool IsAdventurePlanet { get; set; }
 
     public string RootLevel { get; set; } = "";
 
     public string ResourceCollection { get; set; } = "";
 
     [NotMapped]
     public string[]? Resources {
         get => this.ResourceCollection.Split(",", StringSplitOptions.RemoveEmptyEntries);
         set => this.ResourceCollection = string.Join(',', value ?? Array.Empty<string>());
     }
 
     /// <summary>
@@ -63,13 +66,13 @@
     public int CreatorId { get; set; }
 
     [ForeignKey(nameof(CreatorId))]
     public UserEntity? Creator { get; set; }
 
     public bool InitiallyLocked { get; set; }
 
     public bool LockedByModerator { get; set; }
 
     public string LockedReason { get; set; } = "";
 
     public bool SubLevel { get; set; }
 
@@ -77,7 +80,7 @@
 
     public int Shareable { get; set; }
 
     public string AuthorLabels { get; set; } = "";
 
     public string[] LevelTags(DatabaseContext database)
     {
@@ -90,7 +93,7 @@
             .ToArray();
     }
 
     public string BackgroundHash { get; set; } = "";
 
     public int MinimumPlayers { get; set; }
 
@@ -106,13 +109,13 @@
 
     public GameVersion GameVersion { get; set; }
 
     public string LevelType { get; set; } = "";
 
     public bool CrossControllerRequired { get; set; }
 
     public bool Hidden { get; set; }
 
     public string HiddenReason { get; set; } = "";
 
     public int PlaysLBP1 { get; set; }
 

ProjectLighthouse/Types/Entities/Profile/UserEntity.cs

@@ -14,24 +14,27 @@
 
     #nullable enable
     [Key]
     public int UserId { get; set; }
 
     public string Username { get; set; } = "";
 
     #nullable enable
     public string? EmailAddress { get; set; }
     #nullable disable
 
     public bool EmailAddressVerified { get; set; }
 
     public string Password { get; set; }
 
     public string IconHash { get; set; }
 
+    [NotMapped]
+    public string InfoXml => $"<player icon=\"{this.IconHash}\">{this.Username}</user>";
+
     /// <summary>
     ///     A user-customizable biography shown on the profile card
     /// </summary>
     public string Biography { get; set; }
 
     [NotMapped]
     public string WebsiteAvatarHash {
@@ -68,22 +71,22 @@
         set => this.LocationPacked = (ulong)value.X << 32 | (uint)value.Y;
     }
 
     public string Pins { get; set; } = "";
 
     public string PlanetHashLBP2 { get; set; } = "";
 
     // ReSharper disable once InconsistentNaming
     public string PlanetHashLBP2CC { get; set; } = "";
 
     public string PlanetHashLBP3 { get; set; } = "";
 
     public string PlanetHashLBPVita { get; set; } = "";
 
     public bool PasswordResetRequired { get; set; }
 
     public string YayHash { get; set; } = "";
     public string BooHash { get; set; } = "";
     public string MehHash { get; set; } = "";
 
     public long LastLogin { get; set; }
     public long LastLogout { get; set; }
@@ -101,12 +104,12 @@
     public PermissionLevel PermissionLevel { get; set; } = PermissionLevel.Default;
 
     #nullable enable
     public string? BannedReason { get; set; }
     #nullable disable
 
     public string Language { get; set; } = "en";
 
     public string TimeZone { get; set; } = TimeZoneInfo.Local.Id;
 
     public PrivacyType LevelVisibility { get; set; } = PrivacyType.All;
 
@@ -117,9 +120,9 @@
 
     public bool IsTwoFactorSetup => this.TwoFactorBackup?.Length > 0 && this.TwoFactorSecret?.Length > 0;
 
     public string TwoFactorSecret { get; set; } = "";
 
     public string TwoFactorBackup { get; set; } = "";
 
     public ulong LinkedRpcnId { get; set; }
 
@@ -132,7 +135,7 @@
     // should not be adjustable by user
     public bool CommentsEnabled { get; set; } = true;
 
     public string ProfileTag { get; set; } = "";
 
     #nullable enable
     public override bool Equals(object? obj)
@@ -154,4 +157,4 @@
 
     [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
     public override int GetHashCode() => this.UserId;
     #nullable disable