RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-30 01:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle chat == null gracefully and remove link from message if channel not found

Browse Source
This commit is contained in:
FreezyLemon 2017-12-27 21:06:48 +01:00
parent d21ef14f75
commit 4681a0c47b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ using osu.Game.Users;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics.UserInterface;
using System.Collections.Generic;
namespace osu.Game.Overlays.Chat
{
@ -227,6 +228,8 @@ namespace osu.Game.Overlays.Chat
else
{
int prevIndex = 0;
List<MessageFormatter.Link> linksToRemove = new List<MessageFormatter.Link>();
foreach (var link in message.Links)
{
contentFlow.AddText(message.Content.Substring(prevIndex, link.Index - prevIndex));
@ -236,8 +239,9 @@ namespace osu.Game.Overlays.Chat
if (link.Url.StartsWith("osu://chan/"))
{
var channelName = link.Url.Substring(11).Split('/')[0];
if (chat.AvailableChannels.TrueForAll(c => c.Name != channelName))
if (chat?.AvailableChannels.TrueForAll(c => c.Name != channelName) != false)
{
linksToRemove.Add(link);
contentFlow.AddText(message.Content.Substring(link.Index, link.Length));
continue;
}
@ -245,10 +249,13 @@ namespace osu.Game.Overlays.Chat
contentFlow.AddLink(message.Content.Substring(link.Index, link.Length), link.Url, sprite =>
{
((OsuLinkSpriteText)sprite).TextColour = urlColour;
((ChatLink)sprite).TextColour = urlColour;
});
}
foreach (var link in linksToRemove)
message.Links.Remove(link);
var lastLink = message.Links[message.Links.Count - 1];
contentFlow.AddText(message.Content.Substring(lastLink.Index + lastLink.Length));
}