sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix chat day separator not being added on pending message resolution

Browse Source 
Closes #21316.
This commit is contained in:
Dean Herbert
2022-11-21 13:51:49 +09:00
parent dfa92b3de9
commit fa7b45dfb1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -134,8 +134,7 @@ namespace osu.Game.Overlays.Chat
foreach (var message in displayMessages) foreach (var message in displayMessages)
{ {
if (lastMessage == null || lastMessage.Timestamp.ToLocalTime().Date != message.Timestamp.ToLocalTime().Date) addDaySeparatorIfRequired(lastMessage, message);
ChatLineFlow.Add(CreateDaySeparator(message.Timestamp));
ChatLineFlow.Add(CreateChatLine(message)); ChatLineFlow.Add(CreateChatLine(message));
lastMessage = message; lastMessage = message;
@ -183,10 +182,18 @@ namespace osu.Game.Overlays.Chat
ChatLineFlow.Remove(found, false); ChatLineFlow.Remove(found, false);
found.Message = updated; found.Message = updated;
addDaySeparatorIfRequired(chatLines.LastOrDefault()?.Message, updated);
ChatLineFlow.Add(found); ChatLineFlow.Add(found);
} }
}); });
private void addDaySeparatorIfRequired(Message lastMessage, Message message)
{
if (lastMessage == null || lastMessage.Timestamp.ToLocalTime().Date != message.Timestamp.ToLocalTime().Date)
ChatLineFlow.Add(CreateDaySeparator(message.Timestamp));
}
private void messageRemoved(Message removed) => Schedule(() => private void messageRemoved(Message removed) => Schedule(() =>
{ {
chatLines.FirstOrDefault(c => c.Message == removed)?.FadeColour(Color4.Red, 400).FadeOut(600).Expire(); chatLines.FirstOrDefault(c => c.Message == removed)?.FadeColour(Color4.Red, 400).FadeOut(600).Expire();