RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-27 16:22:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add fallback stable sort to avoid any change of misordered local messages

Browse Source
This commit is contained in:
Dean Herbert 2022-11-30 16:55:39 +09:00
parent 2d8854cbac
commit b1ce93e7bf
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Online/Chat/Message.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
@ -59,9 +60,14 @@ namespace osu.Game.Online.Chat
/// <remarks>The <see cref="Link"/>s' <see cref="Link.Index"/> and <see cref="Link.Length"/>s are according to <see cref="DisplayContent"/></remarks> /// <remarks>The <see cref="Link"/>s' <see cref="Link.Index"/> and <see cref="Link.Length"/>s are according to <see cref="DisplayContent"/></remarks>
public List<Link> Links; public List<Link> Links;
private static long constructionOrderStatic;
private readonly long constructionOrder;
public Message(long? id) public Message(long? id)
{ {
Id = id; Id = id;
constructionOrder = Interlocked.Increment(ref constructionOrderStatic);
} }
public int CompareTo(Message other) public int CompareTo(Message other)
@ -69,7 +75,13 @@ namespace osu.Game.Online.Chat
if (Id.HasValue && other.Id.HasValue) if (Id.HasValue && other.Id.HasValue)
return Id.Value.CompareTo(other.Id.Value); return Id.Value.CompareTo(other.Id.Value);
return Timestamp.CompareTo(other.Timestamp); int timestampComparison = Timestamp.CompareTo(other.Timestamp);
if (timestampComparison != 0)
return timestampComparison;
// Timestamp might not be accurate enough to make a stable sorting decision.
return constructionOrder.CompareTo(other.constructionOrder);
} }
public virtual bool Equals(Message other) public virtual bool Equals(Message other)