h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 02:23:10 +08:00
Code Issues Releases Wiki Activity

Update ack code after incorrect merge

Browse Source
This commit is contained in:
Dean Herbert 2022-11-12 21:41:10 +09:00
parent dde09d409b
commit ace4099079
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Online/Chat/ChannelManager.cs
View File

@ -116,20 +116,7 @@ namespace osu.Game.Online.Chat
if (apiState.Value != APIState.Online) if (apiState.Value != APIState.Online)
return; return;
scheduledAck?.Cancel(); SendAck();
var req = new ChatAckRequest();
req.Success += _ => scheduleNextRequest();
req.Failure += _ => scheduleNextRequest();
api.Queue(req);
// Todo: Handle silences.
void scheduleNextRequest()
{
scheduledAck?.Cancel();
scheduledAck = Scheduler.AddDelayed(performChatAckRequest, 60000);
}
} }
/// <summary> /// <summary>
@ -416,6 +403,7 @@ namespace osu.Game.Online.Chat
SinceSilenceId = lastSilenceId SinceSilenceId = lastSilenceId
}; };
req.Failure += _ => scheduleNextRequest();
req.Success += ack => req.Success += ack =>
{ {
foreach (var silence in ack.Silences) foreach (var silence in ack.Silences)
@ -424,9 +412,17 @@ namespace osu.Game.Online.Chat
channel.RemoveMessagesFromUser(silence.UserId); channel.RemoveMessagesFromUser(silence.UserId);
lastSilenceId = Math.Max(lastSilenceId ?? 0, silence.Id); lastSilenceId = Math.Max(lastSilenceId ?? 0, silence.Id);
} }
scheduleNextRequest();
}; };
api.Queue(req); api.Queue(req);
void scheduleNextRequest()
{
scheduledAck?.Cancel();
scheduledAck = Scheduler.AddDelayed(performChatAckRequest, 60000);
}
} }
/// <summary> /// <summary>