From 22d8a1160e28bae031040fa5376dcfaa0caf219b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 12 Nov 2022 23:32:05 +0900
Subject: [PATCH] Fix last silence ID being updated too often, causing most
 silences to be missed

---
 osu.Game/Online/API/Requests/ChatAckRequest.cs | 5 +++--
 osu.Game/Online/Chat/ChannelManager.cs         | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/API/Requests/ChatAckRequest.cs b/osu.Game/Online/API/Requests/ChatAckRequest.cs
index 78f51e21c0..01b0c142dc 100644
--- a/osu.Game/Online/API/Requests/ChatAckRequest.cs
+++ b/osu.Game/Online/API/Requests/ChatAckRequest.cs
@@ -9,14 +9,15 @@ namespace osu.Game.Online.API.Requests
 {
     public class ChatAckRequest : APIRequest<ChatAckResponse>
     {
-        public long SinceMessageId;
+        public long? SinceMessageId;
         public uint? SinceSilenceId;
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
             req.Method = HttpMethod.Post;
-            req.AddParameter(@"since", SinceMessageId.ToString());
+            if (SinceMessageId != null)
+                req.AddParameter(@"since", SinceMessageId.ToString());
             if (SinceSilenceId != null)
                 req.AddParameter(@"history_since", SinceSilenceId.Value.ToString());
             return req;
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 8f1d2db36c..25a53360f0 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Online.Chat
         private bool channelsInitialised;
         private ScheduledDelegate scheduledAck;
 
-        private long lastMessageId;
+        private long? lastSilenceMessageId;
         private uint? lastSilenceId;
 
         public ChannelManager(IAPIProvider api)
@@ -332,7 +332,7 @@ namespace osu.Game.Online.Chat
             foreach (var group in messages.GroupBy(m => m.ChannelId))
                 channels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray());
 
-            lastMessageId = messages.LastOrDefault()?.Id ?? lastMessageId;
+            lastSilenceMessageId ??= messages.LastOrDefault()?.Id;
         }
 
         private void initializeChannels()
@@ -394,7 +394,7 @@ namespace osu.Game.Online.Chat
 
             var req = new ChatAckRequest
             {
-                SinceMessageId = lastMessageId,
+                SinceMessageId = lastSilenceMessageId,
                 SinceSilenceId = lastSilenceId
             };