h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 10:02:59 +08:00
Code Issues Releases Wiki Activity

Added basic "on click" actions to the in-chat links

Browse Source
This commit is contained in:
FreezyLemon 2017-12-06 10:27:30 +01:00
parent 63a6a8b669
commit b04ddba2a0
2 changed files with 82 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,13 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Screens;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Screens.Edit;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
@ -25,6 +29,7 @@ namespace osu.Game.Graphics.Sprites
private readonly OsuHoverContainer content; private readonly OsuHoverContainer content;
private APIAccess api;
private BeatmapSetOverlay beatmapSetOverlay; private BeatmapSetOverlay beatmapSetOverlay;
public override bool HandleInput => content.Action != null; public override bool HandleInput => content.Action != null;
@ -43,10 +48,10 @@ namespace osu.Game.Graphics.Sprites
} }
set set
{ {
if (value != null) if (!string.IsNullOrEmpty(value))
{ {
url = value; url = value;
loadAction(); content.Action = onClickAction;
} }
} }
} }
@ -66,63 +71,100 @@ namespace osu.Game.Graphics.Sprites
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(BeatmapSetOverlay beatmapSetOverlay, ChatOverlay chat) private void load(APIAccess api, BeatmapSetOverlay beatmapSetOverlay, ChatOverlay chat)
{ {
this.api = api;
this.beatmapSetOverlay = beatmapSetOverlay; this.beatmapSetOverlay = beatmapSetOverlay;
this.chat = chat; this.chat = chat;
} }
private void loadAction() private void onClickAction()
{ {
if (Url == null || String.IsNullOrEmpty(Url))
return;
var url = Url; var url = Url;
// Client-internal stuff
if (url.StartsWith("osu://")) if (url.StartsWith("osu://"))
{ {
var firstPath = url.Substring(6, 5); url = url.Substring(6);
url = url.Substring(11); var args = url.Split('/');
if (firstPath == "chan/") switch (args[0])
{ {
var nextSlashIndex = url.IndexOf('/'); case "chan":
var channelName = nextSlashIndex != -1 ? url.Remove(nextSlashIndex) : url; var foundChannel = chat.AvailableChannels.Find(channel => channel.Name == args[1]);
var foundChannel = chat.AvailableChannels.Find(channel => channel.Name == channelName); if (foundChannel == null)
TextColour = Color4.White;
else
chat.OpenChannel(foundChannel);
if (foundChannel != null) break;
content.Action = () => chat.OpenChannel(foundChannel); case "edit":
} // TODO: Change screen to editor
else if (firstPath == "edit/") break;
{ case "b":
// Open editor here, then goto specified time if (args.Length > 1 && int.TryParse(args[1], out int mapId))
// how to push new screen from here? we'll see beatmapSetOverlay.ShowBeatmap(mapId);
content.Action = () => new Framework.Screens.Screen().Push(new Screens.Edit.Editor());
} break;
else case "s":
throw new ArgumentException($"Unknown osu:// link at {nameof(OsuLinkSpriteText)} ({firstPath})."); 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 =>
{
// TODO: Open spectator screen and start spectating
};
// 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;
// TODO: Join the specified multiplayer lobby here with multiId
} }
else if (url.StartsWith("http://") || url.StartsWith("https://")) else if (url.StartsWith("http://") || url.StartsWith("https://"))
{ {
var osuUrlIndex = url.IndexOf("osu.ppy.sh/"); var osuUrlIndex = url.IndexOf("osu.ppy.sh/");
if (osuUrlIndex == -1) if (osuUrlIndex == -1)
{ {
content.Action = () => Process.Start(url); Process.Start(url);
return; return;
} }
url = url.Substring(osuUrlIndex + 11); url = url.Substring(osuUrlIndex + 11);
if (url.StartsWith("s/") || url.StartsWith("beatmapsets/") || url.StartsWith("d/")) if (url.StartsWith("s/") || url.StartsWith("beatmapsets/") || url.StartsWith("d/"))
content.Action = () => beatmapSetOverlay.ShowBeatmapSet(getIdFromUrl(url)); {
var id = getIdFromUrl(url);
beatmapSetOverlay.ShowBeatmapSet(id);
}
else if (url.StartsWith("b/") || url.StartsWith("beatmaps/")) else if (url.StartsWith("b/") || url.StartsWith("beatmaps/"))
content.Action = () => beatmapSetOverlay.ShowBeatmap(getIdFromUrl(url)); {
var id = getIdFromUrl(url);
beatmapSetOverlay.ShowBeatmap(id);
}
else else
content.Action = () => Process.Start($"https://osu.ppy.sh/{url}"); Process.Start($"https://osu.ppy.sh/{url}");
} }
else else
content.Action = () => Process.Start(url); Process.Start(url);
} }
private int getIdFromUrl(string url) private int getIdFromUrl(string url)

11
osu.Game/Online/API/Requests/GetUserRequest.cs
View File

@ -8,12 +8,21 @@ namespace osu.Game.Online.API.Requests
public class GetUserRequest : APIRequest<User> public class GetUserRequest : APIRequest<User>
{ {
private long? userId; private long? userId;
private string userName;
/// <param name="userId">The user's ID.</param>
public GetUserRequest(long? userId = null) public GetUserRequest(long? userId = null)
{ {
this.userId = userId; this.userId = userId;
} }
protected override string Target => userId.HasValue ? $@"users/{userId}" : @"me"; /// <param name="userName">The user's username.</param>
public GetUserRequest(string userName)
{
this.userName = userName;
}
// Prefer ID over name
protected override string Target => userId.HasValue ? $@"users/{userId}" : ((!string.IsNullOrEmpty(userName)) ? $@"users/{userName}" : @"me");
} }
} }