liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(bot): make pk;import handle <> wrapped URLs

Browse Source
This commit is contained in:
Iris System 2023-01-09 04:32:41 +13:00
parent 10287d0146
commit 683b616a1b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PluralKit.Bot/Commands/ImportExport.cs
View File

@ -33,10 +33,10 @@ public class ImportExport
public async Task Import(Context ctx) public async Task Import(Context ctx)
{ {
var url = ctx.RemainderOrNull() ?? ctx.Message.Attachments.FirstOrDefault()?.Url; var inputUrl = ctx.RemainderOrNull() ?? ctx.Message.Attachments.FirstOrDefault()?.Url;
if (url == null) throw Errors.NoImportFilePassed; if (inputUrl == null) throw Errors.NoImportFilePassed;
if (!Core.MiscUtils.TryMatchUri(url, out var _)) if (!Core.MiscUtils.TryMatchUri(inputUrl, out var url))
throw Errors.InvalidUrl; throw Errors.InvalidUrl;
await ctx.BusyIndicator(async () => await ctx.BusyIndicator(async () =>

3
PluralKit.Core/Utils/MiscUtils.cs
View File

@ -13,6 +13,9 @@ public static class MiscUtils
public static bool TryMatchUri(string input, out Uri uri) public static bool TryMatchUri(string input, out Uri uri)
{ {
if (input.StartsWith('<') && input.EndsWith('>'))
input = input[1..^1];
try try
{ {
uri = new Uri(input); uri = new Uri(input);