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

Renamed the "on click" method to OnClick() and moved most of the implementation to ChatLink.

Browse Source 
Also fixed the tooltip text up
This commit is contained in:
FreezyLemon
2017-12-07 16:23:43 +01:00
parent ca40db2b97
commit 2129d6cede
2 changed files with 127 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
osu.Game/Graphics/Sprites/OsuLinkSpriteText.cs
View File

@ -25,13 +25,8 @@ namespace osu.Game.Graphics.Sprites
{ {
public class OsuLinkSpriteText : OsuSpriteText public class OsuLinkSpriteText : OsuSpriteText
{ {
private ChatOverlay chat;
private readonly OsuHoverContainer content; private readonly OsuHoverContainer content;
private APIAccess api;
private BeatmapSetOverlay beatmapSetOverlay;
public override bool HandleInput => content.Action != null; public override bool HandleInput => content.Action != null;
protected override Container<Drawable> Content => content ?? (Container<Drawable>)this; protected override Container<Drawable> Content => content ?? (Container<Drawable>)this;
@ -52,11 +47,7 @@ namespace osu.Game.Graphics.Sprites
{ {
url = value; url = value;
content.Action = onClickAction; content.Action = OnClick;
// For inheriting classes
if (Content is OsuHoverContainer hover)
hover.Action = onClickAction;
} }
} }
} }
@ -75,118 +66,6 @@ namespace osu.Game.Graphics.Sprites
set { Content.Colour = value; } set { Content.Colour = value; }
} }
[BackgroundDependencyLoader] protected virtual void OnClick() => Process.Start(Url);
private void load(APIAccess api, BeatmapSetOverlay beatmapSetOverlay, ChatOverlay chat)
{
this.api = api;
this.beatmapSetOverlay = beatmapSetOverlay;
this.chat = chat;
}
private void onClickAction()
{
var url = Url;
if (url.StartsWith("osu://"))
{
url = url.Substring(6);
var args = url.Split('/');
switch (args[0])
{
case "chan":
var foundChannel = chat.AvailableChannels.Find(channel => channel.Name == args[1]);
if (foundChannel == null)
TextColour = Color4.White;
else
chat.OpenChannel(foundChannel);
break;
case "edit":
chat.Game?.LoadEditorTimestamp();
break;
case "b":
if (args.Length > 1 && int.TryParse(args[1], out int mapId))
beatmapSetOverlay.ShowBeatmap(mapId);
break;
case "s":
case "dl":
if (args.Length > 1 && int.TryParse(args[1], out int mapSetId))
beatmapSetOverlay.ShowBeatmapSet(mapSetId);
break;
case "spectate":
GetUserRequest req;
if (int.TryParse(args[1], out int userId))
req = new GetUserRequest(userId);
else
// Get by username instead
req = new GetUserRequest(args[1]);
req.Success += user =>
{
chat.Game?.LoadSpectatorScreen();
};
api.Queue(req);
break;
default:
throw new ArgumentException($"Unknown osu:// link at {nameof(OsuLinkSpriteText)} (https://osu.ppy.sh/{args[0]}).");
}
}
else if (url.StartsWith("osump://"))
{
url = url.Substring(8);
if (!int.TryParse(url.Split('/').ElementAtOrDefault(1), out int multiId))
return;
chat.Game?.LoadMultiplayerLobby();
}
else if (url.StartsWith("http://") || url.StartsWith("https://"))
{
var osuUrlIndex = url.IndexOf("osu.ppy.sh/");
if (osuUrlIndex == -1)
{
Process.Start(url);
return;
}
url = url.Substring(osuUrlIndex + 11);
if (url.StartsWith("s/") || url.StartsWith("beatmapsets/") || url.StartsWith("d/"))
{
var id = getIdFromUrl(url);
beatmapSetOverlay.ShowBeatmapSet(id);
}
else if (url.StartsWith("b/") || url.StartsWith("beatmaps/"))
{
var id = getIdFromUrl(url);
beatmapSetOverlay.ShowBeatmap(id);
}
else
Process.Start($"https://osu.ppy.sh/{url}");
}
else
Process.Start(url);
}
private int getIdFromUrl(string url)
{
var lastSlashIndex = url.LastIndexOf('/');
// Remove possible trailing slash
if (lastSlashIndex == url.Length)
{
url = url.Remove(url.Length - 1);
lastSlashIndex = url.LastIndexOf('/');
}
var lastQuestionMarkIndex = url.LastIndexOf('?');
// Filter out possible queries like mode specifications (e.g. /b/252238?m=0)
if (lastQuestionMarkIndex > lastSlashIndex)
url = url.Remove(lastQuestionMarkIndex);
return int.Parse(url.Substring(lastSlashIndex + 1));
}
} }
} }

130
osu.Game/Online/Chat/ChatLink.cs
View File

@ -11,9 +11,13 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Overlays;
using osu.Game.Overlays.Chat; using osu.Game.Overlays.Chat;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
namespace osu.Game.Online.Chat namespace osu.Game.Online.Chat
@ -22,6 +26,10 @@ namespace osu.Game.Online.Chat
{ {
public int LinkId = -1; public int LinkId = -1;
private APIAccess api;
private BeatmapSetOverlay beatmapSetOverlay;
private ChatOverlay chat;
private Color4 hoverColour; private Color4 hoverColour;
private Color4 urlColour; private Color4 urlColour;
@ -34,6 +42,107 @@ namespace osu.Game.Online.Chat
protected override Container<Drawable> Content => content ?? base.Content; protected override Container<Drawable> Content => content ?? base.Content;
protected override void OnClick()
{
var url = Url;
if (url.StartsWith("osu://"))
{
url = url.Substring(6);
var args = url.Split('/');
switch (args[0])
{
case "chan":
var foundChannel = chat.AvailableChannels.Find(channel => channel.Name == args[1]);
if (foundChannel == null)
throw new ArgumentException($"Unknown channel name ({args[1]}).");
else
chat.OpenChannel(foundChannel);
break;
case "edit":
chat.Game?.LoadEditorTimestamp();
break;
case "b":
if (args.Length > 1 && int.TryParse(args[1], out int mapId))
beatmapSetOverlay.ShowBeatmap(mapId);
break;
case "s":
case "dl":
if (args.Length > 1 && int.TryParse(args[1], out int mapSetId))
beatmapSetOverlay.ShowBeatmapSet(mapSetId);
break;
case "spectate":
GetUserRequest req;
if (int.TryParse(args[1], out int userId))
req = new GetUserRequest(userId);
else
// Get by username instead
req = new GetUserRequest(args[1]);
req.Success += user =>
{
chat.Game?.LoadSpectatorScreen();
};
api.Queue(req);
break;
default:
throw new ArgumentException($"Unknown osu:// link at {nameof(OsuLinkSpriteText)} (https://osu.ppy.sh/{args[0]}).");
}
}
else if (url.StartsWith("osump://"))
{
url = url.Substring(8);
if (!int.TryParse(url.Split('/').ElementAtOrDefault(1), out int multiId))
return;
chat.Game?.LoadMultiplayerLobby();
}
else if (url.StartsWith("http://") || url.StartsWith("https://") && url.IndexOf("osu.ppy.sh/") != -1)
{
var osuUrlIndex = url.IndexOf("osu.ppy.sh/");
url = url.Substring(osuUrlIndex + 11);
if (url.StartsWith("s/") || url.StartsWith("beatmapsets/") || url.StartsWith("d/"))
{
var id = getIdFromUrl(url);
beatmapSetOverlay.ShowBeatmapSet(id);
}
else if (url.StartsWith("b/") || url.StartsWith("beatmaps/"))
{
var id = getIdFromUrl(url);
beatmapSetOverlay.ShowBeatmap(id);
}
else
base.OnClick();
}
else
base.OnClick();
}
private int getIdFromUrl(string url)
{
var lastSlashIndex = url.LastIndexOf('/');
// Remove possible trailing slash
if (lastSlashIndex == url.Length)
{
url = url.Remove(url.Length - 1);
lastSlashIndex = url.LastIndexOf('/');
}
var lastQuestionMarkIndex = url.LastIndexOf('?');
// Filter out possible queries like mode specifications (e.g. /b/252238?m=0)
if (lastQuestionMarkIndex > lastSlashIndex)
url = url.Remove(lastQuestionMarkIndex);
return int.Parse(url.Substring(lastSlashIndex + 1));
}
public string TooltipText public string TooltipText
{ {
get get
@ -41,11 +150,18 @@ namespace osu.Game.Online.Chat
if (LinkId == -1 || Url == Text) if (LinkId == -1 || Url == Text)
return null; return null;
if (Url.StartsWith("osu://chan/")) if (Url.StartsWith("osu://"))
return "Switch to channel " + Url.Substring(11); {
var args = Url.Substring(6).Split('/');
if (Url.StartsWith("osu://edit/") && TimeSpan.TryParse(Url.Substring(11).Split(' ')[0], out TimeSpan editorTimeStamp)) if (args.Length < 2)
return "Go to " + editorTimeStamp.ToString(); return Url;
if (args[0] == "chan")
return "Switch to channel " + args[1];
if (args[0] == "edit")
return "Go to " + args[1].Remove(9).TrimEnd();
}
return Url; return Url;
} }
@ -96,8 +212,12 @@ namespace osu.Game.Online.Chat
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(APIAccess api, BeatmapSetOverlay beatmapSetOverlay, ChatOverlay chat, OsuColour colours)
{ {
this.api = api;
this.beatmapSetOverlay = beatmapSetOverlay;
this.chat = chat;
hoverColour = colours.Yellow; hoverColour = colours.Yellow;
urlColour = colours.Blue; urlColour = colours.Blue;
if (LinkId != -1) if (LinkId != -1)