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

Fixed bugs and added tests

Browse Source
This commit is contained in:
FreezyLemon
2018-01-09 16:11:45 +01:00
parent 72624aea18
commit 3bf9901dd2
6 changed files with 96 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -225,42 +225,17 @@ namespace osu.Game.Overlays.Chat
timestamp.Text = $@"{message.Timestamp.LocalDateTime:HH:mm:ss}";
username.Text = $@"{message.Sender.Username}" + (senderHasBackground || message.IsAction ? "" : ":");
// remove any non-existent channels from the link list
var linksToRemove = new List<Link>();
foreach (var link in message.Links)
if (link.Action == LinkAction.OpenChannel && chat?.AvailableChannels.TrueForAll(c => c.Name != link.Argument) != false)
linksToRemove.Add(link);
foreach (var link in linksToRemove)
message.Links.Remove(link);
contentFlow.Clear();
if (message.Links == null || message.Links.Count == 0)
contentFlow.AddText(message.Content);
else
{
int lastLinkEndIndex = 0;
List<Link> linksToRemove = new List<Link>();
foreach (var link in message.Links)
{
contentFlow.AddText(message.Content.Substring(lastLinkEndIndex, link.Index - lastLinkEndIndex));
lastLinkEndIndex = link.Index + link.Length;
const string channel_link_prefix = "osu://chan/";
// If a channel doesn't exist, add it as normal text instead
if (link.Url.StartsWith(channel_link_prefix))
{
var channelName = link.Url.Substring(channel_link_prefix.Length).Split('/')[0];
if (chat?.AvailableChannels.TrueForAll(c => c.Name != channelName) != false)
{
linksToRemove.Add(link);
contentFlow.AddText(message.Content.Substring(link.Index, link.Length));
continue;
}
}
contentFlow.AddLink(message.Content.Substring(link.Index, link.Length), link.Url);
}
var lastLink = message.Links[message.Links.Count - 1];
contentFlow.AddText(message.Content.Substring(lastLink.Index + lastLink.Length));
foreach (var link in linksToRemove)
message.Links.Remove(link);
}
contentFlow.AddLinks(message.DisplayContent, message.Links);
}
private class MessageSender : OsuClickableContainer, IHasContextMenu